Skip to content

Commit 4d78205

Browse files
committed
feat: add salmon size data
Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>
1 parent 30a5fb5 commit 4d78205

File tree

7 files changed

+51
-6
lines changed

7 files changed

+51
-6
lines changed

src/main/java/org/spongepowered/api/data/Keys.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import org.spongepowered.api.data.type.PushReaction;
8484
import org.spongepowered.api.data.type.RabbitType;
8585
import org.spongepowered.api.data.type.RailDirection;
86+
import org.spongepowered.api.data.type.SalmonSize;
8687
import org.spongepowered.api.data.type.SculkSensorState;
8788
import org.spongepowered.api.data.type.SkinPart;
8889
import org.spongepowered.api.data.type.SlabPortion;
@@ -161,6 +162,7 @@
161162
import org.spongepowered.api.entity.living.animal.horse.llama.Llama;
162163
import org.spongepowered.api.entity.living.animal.horse.llama.TraderLlama;
163164
import org.spongepowered.api.entity.living.aquatic.Dolphin;
165+
import org.spongepowered.api.entity.living.aquatic.fish.school.Salmon;
164166
import org.spongepowered.api.entity.living.aquatic.fish.school.TropicalFish;
165167
import org.spongepowered.api.entity.living.golem.IronGolem;
166168
import org.spongepowered.api.entity.living.golem.Shulker;
@@ -2827,6 +2829,11 @@ public final class Keys {
28272829
*/
28282830
public static final Key<Value<Ticks>> ROARING_TIME = Keys.key(ResourceKey.sponge("roaring_time"), Ticks.class);
28292831

2832+
/**
2833+
* The {@link SalmonSize} of a {@link Salmon} entity.
2834+
*/
2835+
public static final Key<Value<SalmonSize>> SALMON_SIZE = Keys.key(ResourceKey.sponge("salmon_size"), SalmonSize.class);
2836+
28302837
/**
28312838
* The current saturation of a {@link Player}.
28322839
*
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.spongepowered.api.data.type;
2+
3+
import org.spongepowered.api.registry.DefaultedRegistryValue;
4+
import org.spongepowered.api.util.annotation.CatalogedBy;
5+
6+
@CatalogedBy(SalmonSizes.class)
7+
public interface SalmonSize extends DefaultedRegistryValue, StringRepresentable {
8+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package org.spongepowered.api.data.type;
2+
3+
import org.spongepowered.api.ResourceKey;
4+
import org.spongepowered.api.Sponge;
5+
import org.spongepowered.api.registry.DefaultedRegistryReference;
6+
import org.spongepowered.api.registry.RegistryKey;
7+
import org.spongepowered.api.registry.RegistryTypes;
8+
9+
public final class SalmonSizes {
10+
11+
public static final DefaultedRegistryReference<SalmonSize> LARGE = SalmonSizes.key(ResourceKey.sponge("large"));
12+
13+
public static final DefaultedRegistryReference<SalmonSize> MEDIUM = SalmonSizes.key(ResourceKey.sponge("medium"));
14+
15+
public static final DefaultedRegistryReference<SalmonSize> SMALL = SalmonSizes.key(ResourceKey.sponge("small"));
16+
17+
private static DefaultedRegistryReference<SalmonSize> key(ResourceKey key) {
18+
return RegistryKey.of(RegistryTypes.SALMON_SIZE, key).asDefaultedReference(Sponge::game);
19+
}
20+
}

src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/Salmon.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,14 @@
2424
*/
2525
package org.spongepowered.api.entity.living.aquatic.fish.school;
2626

27+
import org.spongepowered.api.data.Keys;
28+
import org.spongepowered.api.data.type.SalmonSize;
29+
import org.spongepowered.api.data.value.Value;
30+
2731
public interface Salmon extends SchoolingFish {
32+
33+
default Value.Mutable<SalmonSize> size() {
34+
return this.requireValue(Keys.SALMON_SIZE).asMutable();
35+
}
36+
2837
}

src/main/java/org/spongepowered/api/registry/RegistryTypes.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@
8282
import org.spongepowered.api.data.type.RabbitType;
8383
import org.spongepowered.api.data.type.RaidStatus;
8484
import org.spongepowered.api.data.type.RailDirection;
85+
import org.spongepowered.api.data.type.SalmonSize;
86+
import org.spongepowered.api.data.type.SalmonSizes;
8587
import org.spongepowered.api.data.type.SculkSensorState;
8688
import org.spongepowered.api.data.type.SkinPart;
8789
import org.spongepowered.api.data.type.SlabPortion;
@@ -469,6 +471,8 @@ public final class RegistryTypes {
469471

470472
public static final DefaultedRegistryType<Rotation> ROTATION = RegistryTypes.spongeKeyInGame("rotation");
471473

474+
public static final DefaultedRegistryType<SalmonSize> SALMON_SIZE = RegistryTypes.spongeKeyInGame("salmon_size");
475+
472476
public static final DefaultedRegistryType<SculkSensorState> SCULK_SENSOR_STATE = RegistryTypes.spongeKeyInGame("sculk_sensor_state");
473477

474478
public static final DefaultedRegistryType<SelectorSortAlgorithm> SELECTOR_SORT_ALGORITHM = RegistryTypes.spongeKeyInGame("selector_sort_algorithm");

src/main/java/org/spongepowered/api/world/biome/Biomes.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,13 @@
2424
*/
2525
package org.spongepowered.api.world.biome;
2626

27-
import org.jetbrains.annotations.ApiStatus;
2827
import org.spongepowered.api.ResourceKey;
2928
import org.spongepowered.api.registry.Registry;
3029
import org.spongepowered.api.registry.RegistryKey;
3130
import org.spongepowered.api.registry.RegistryReference;
3231
import org.spongepowered.api.registry.RegistryScope;
3332
import org.spongepowered.api.registry.RegistryScopes;
3433
import org.spongepowered.api.registry.RegistryTypes;
35-
import org.spongepowered.api.util.annotation.Experimental;
3634
import org.spongepowered.api.world.server.ServerWorld;
3735

3836
/**
@@ -120,10 +118,6 @@ public final class Biomes {
120118

121119
public static final RegistryReference<Biome> OLD_GROWTH_SPRUCE_TAIGA = Biomes.key(ResourceKey.minecraft("old_growth_spruce_taiga"));
122120

123-
@Experimental("winter_drop")
124-
@ApiStatus.Experimental
125-
public static final RegistryReference<Biome> PALE_GARDEN = Biomes.key(ResourceKey.minecraft("pale_garden"));
126-
127121
public static final RegistryReference<Biome> PLAINS = Biomes.key(ResourceKey.minecraft("plains"));
128122

129123
public static final RegistryReference<Biome> RIVER = Biomes.key(ResourceKey.minecraft("river"));

src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteractions.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
import org.spongepowered.api.registry.RegistryKey;
3232
import org.spongepowered.api.registry.RegistryTypes;
3333

34+
/**
35+
* <!-- This file is automatically generated. Any manual changes will be overwritten. -->
36+
*/
3437
public final class ExplosionBlockInteractions {
3538

3639
public static final DefaultedRegistryReference<ExplosionBlockInteraction> DESTROY = ExplosionBlockInteractions.key(ResourceKey.sponge("destroy"));

0 commit comments

Comments
 (0)