chore: merge api-13 into api-14

gabizou · gabizou · commit f98dbbbc9859 · 2025-03-08T01:05:27.000-08:00
Signed-off-by: Gabriel Harris-Rouquette &lt;gabizou@me.com&gt;
diff --git a/src/main/java/org/spongepowered/api/block/entity/CreakingHeart.java b/src/main/java/org/spongepowered/api/block/entity/CreakingHeart.java
@@ -24,16 +24,11 @@
  */
 package org.spongepowered.api.block.entity;
 
-import org.jetbrains.annotations.ApiStatus;
-import org.spongepowered.api.util.annotation.Experimental;
-
 /**
  * Represents a CreakingHeart block entity.
  *
  * @see <a href="https://minecraft.wiki/Creaking_Heart">Creaking Heart</a>
  */
-@Experimental("winter_drop")
-@ApiStatus.Experimental
 public interface CreakingHeart extends BlockEntity {
 
 }
diff --git a/src/main/java/org/spongepowered/api/data/Keys.java b/src/main/java/org/spongepowered/api/data/Keys.java
@@ -54,6 +54,7 @@
 import org.spongepowered.api.data.type.ArmorMaterial;
 import org.spongepowered.api.data.type.ArtType;
 import org.spongepowered.api.data.type.AttachmentSurface;
+import org.spongepowered.api.data.type.AxolotlVariant;
 import org.spongepowered.api.data.type.BoatType;
 import org.spongepowered.api.data.type.BodyPart;
 import org.spongepowered.api.data.type.BodyParts;
@@ -85,6 +86,7 @@
 import org.spongepowered.api.data.type.PushReaction;
 import org.spongepowered.api.data.type.RabbitType;
 import org.spongepowered.api.data.type.RailDirection;
+import org.spongepowered.api.data.type.SalmonSize;
 import org.spongepowered.api.data.type.SculkSensorState;
 import org.spongepowered.api.data.type.SkinPart;
 import org.spongepowered.api.data.type.SlabPortion;
@@ -145,6 +147,7 @@
 import org.spongepowered.api.entity.living.Humanoid;
 import org.spongepowered.api.entity.living.Living;
 import org.spongepowered.api.entity.living.animal.Animal;
+import org.spongepowered.api.entity.living.animal.Axolotl;
 import org.spongepowered.api.entity.living.animal.Cat;
 import org.spongepowered.api.entity.living.animal.Chicken;
 import org.spongepowered.api.entity.living.animal.Fox;
@@ -165,6 +168,8 @@
 import org.spongepowered.api.entity.living.animal.horse.llama.Llama;
 import org.spongepowered.api.entity.living.animal.horse.llama.TraderLlama;
 import org.spongepowered.api.entity.living.aquatic.Dolphin;
+import org.spongepowered.api.entity.living.aquatic.fish.Pufferfish;
+import org.spongepowered.api.entity.living.aquatic.fish.school.Salmon;
 import org.spongepowered.api.entity.living.aquatic.fish.school.TropicalFish;
 import org.spongepowered.api.entity.living.golem.IronGolem;
 import org.spongepowered.api.entity.living.golem.Shulker;
@@ -468,6 +473,11 @@ public final class Keys {
      */
     public static final Key<Value<Axis>> AXIS = Keys.key(ResourceKey.sponge("axis"), Axis.class);
 
+    /**
+     * The {@link AxolotlVariant} of an {@link Axolotl}.
+     */
+    public static final Key<Value<AxolotlVariant>> AXOLOTL_VARIANT = Keys.key(ResourceKey.sponge("axolotl_variant"), AxolotlVariant.class);
+
     /**
      * The ticks until a {@link Ageable} turns into an adult.
      */
@@ -2786,6 +2796,12 @@ public final class Keys {
      */
     public static final Key<Value<Integer>> PROFESSION_LEVEL = Keys.key(ResourceKey.sponge("profession_level"), Integer.class);
 
+    /**
+     * The "puffiness" state of a {@link Pufferfish}, ranges from 0 to 2 per
+     * the <a href="https://minecraft.wiki/w/Pufferfish#Entity_data">Minecraft Wiki</a>.
+     */
+    public static final Key<Value<Integer>> PUFFER_FISH_PUFFINESS_STATE = Keys.key(ResourceKey.sponge("puffer_fish_size"), Integer.class);
+
     /**
      * The {@link Entity} or {@link BlockState} push reaction when a {@link Piston} pushes it.
      * Readonly
@@ -2921,6 +2937,11 @@ public final class Keys {
      */
     public static final Key<Value<Ticks>> ROARING_TIME = Keys.key(ResourceKey.sponge("roaring_time"), Ticks.class);
 
+    /**
+     * The {@link SalmonSize} of a {@link Salmon} entity.
+     */
+    public static final Key<Value<SalmonSize>> SALMON_SIZE = Keys.key(ResourceKey.sponge("salmon_size"), SalmonSize.class);
+
     /**
      * The current saturation of a {@link Player}.
      *
diff --git a/src/main/java/org/spongepowered/api/data/type/AxolotlVariant.java b/src/main/java/org/spongepowered/api/data/type/AxolotlVariant.java
@@ -0,0 +1,32 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.data.type;
+
+import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.util.annotation.CatalogedBy;
+
+@CatalogedBy(AxolotlVariants.class)
+public interface AxolotlVariant extends DefaultedRegistryValue, StringRepresentable {
+}
diff --git a/src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java b/src/main/java/org/spongepowered/api/data/type/AxolotlVariants.java
@@ -0,0 +1,53 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.data.type;
+
+import org.spongepowered.api.ResourceKey;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.RegistryKey;
+import org.spongepowered.api.registry.RegistryTypes;
+
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
+public class AxolotlVariants {
+
+    public static final DefaultedRegistryReference<AxolotlVariant> BLUE = AxolotlVariants.key(ResourceKey.sponge("blue"));
+
+    public static final DefaultedRegistryReference<AxolotlVariant> CYAN = AxolotlVariants.key(ResourceKey.sponge("cyan"));
+
+    public static final DefaultedRegistryReference<AxolotlVariant> GOLD = AxolotlVariants.key(ResourceKey.sponge("gold"));
+
+    public static final DefaultedRegistryReference<AxolotlVariant> LUCY = AxolotlVariants.key(ResourceKey.sponge("lucy"));
+
+    public static final DefaultedRegistryReference<AxolotlVariant> WILD = AxolotlVariants.key(ResourceKey.sponge("wild"));
+
+
+    private static DefaultedRegistryReference<AxolotlVariant> key(final ResourceKey location) {
+        return RegistryKey.of(RegistryTypes.AXOLOTL_VARIANT, location).asDefaultedReference(Sponge::game);
+    }
+
+}
diff --git a/src/main/java/org/spongepowered/api/data/type/SalmonSize.java b/src/main/java/org/spongepowered/api/data/type/SalmonSize.java
@@ -0,0 +1,32 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.data.type;
+
+import org.spongepowered.api.registry.DefaultedRegistryValue;
+import org.spongepowered.api.util.annotation.CatalogedBy;
+
+@CatalogedBy(SalmonSizes.class)
+public interface SalmonSize extends DefaultedRegistryValue, StringRepresentable {
+}
diff --git a/src/main/java/org/spongepowered/api/data/type/SalmonSizes.java b/src/main/java/org/spongepowered/api/data/type/SalmonSizes.java
@@ -0,0 +1,47 @@
+/*
+ * This file is part of SpongeAPI, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.api.data.type;
+
+import org.spongepowered.api.ResourceKey;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.registry.DefaultedRegistryReference;
+import org.spongepowered.api.registry.RegistryKey;
+import org.spongepowered.api.registry.RegistryTypes;
+
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
+public final class SalmonSizes {
+
+    public static final DefaultedRegistryReference<SalmonSize> LARGE = SalmonSizes.key(ResourceKey.sponge("large"));
+
+    public static final DefaultedRegistryReference<SalmonSize> MEDIUM = SalmonSizes.key(ResourceKey.sponge("medium"));
+
+    public static final DefaultedRegistryReference<SalmonSize> SMALL = SalmonSizes.key(ResourceKey.sponge("small"));
+
+    private static DefaultedRegistryReference<SalmonSize> key(ResourceKey key) {
+        return RegistryKey.of(RegistryTypes.SALMON_SIZE, key).asDefaultedReference(Sponge::game);
+    }
+}
diff --git a/src/main/java/org/spongepowered/api/entity/living/animal/Axolotl.java b/src/main/java/org/spongepowered/api/entity/living/animal/Axolotl.java
@@ -24,8 +24,23 @@
  */
 package org.spongepowered.api.entity.living.animal;
 
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.type.AxolotlVariant;
+import org.spongepowered.api.data.value.Value;
+
 /**
  * Represents an Axolotl.
  */
 public interface Axolotl extends Animal {
+
+    /**
+     * Gets the {@link AxolotlVariant} of this Axolotl. Can be
+     * set back.
+     *
+     * @see org.spongepowered.api.data.type.AxolotlVariants
+     * @return The AxolotlVariant of this Axolotl.
+     */
+    default Value<AxolotlVariant> variant() {
+        return this.requireValue(Keys.AXOLOTL_VARIANT);
+    }
 }
diff --git a/src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/Salmon.java b/src/main/java/org/spongepowered/api/entity/living/aquatic/fish/school/Salmon.java
@@ -24,5 +24,14 @@
  */
 package org.spongepowered.api.entity.living.aquatic.fish.school;
 
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.type.SalmonSize;
+import org.spongepowered.api.data.value.Value;
+
 public interface Salmon extends SchoolingFish {
+
+    default Value.Mutable<SalmonSize> size() {
+        return this.requireValue(Keys.SALMON_SIZE).asMutable();
+    }
+
 }
diff --git a/src/main/java/org/spongepowered/api/entity/living/monster/Creaking.java b/src/main/java/org/spongepowered/api/entity/living/monster/Creaking.java
@@ -27,15 +27,13 @@
 import org.spongepowered.api.data.Keys;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.entity.living.Monster;
-import org.spongepowered.api.util.annotation.Experimental;
 import org.spongepowered.math.vector.Vector3i;
 
 import java.util.Optional;
 
 /**
  * A Creaking is a type of monster that originates from the {@link org.spongepowered.api.world.biome.Biomes#PALE_GARDEN}
  */
-@Experimental("winter_drop")
 public interface Creaking extends Monster {
 
     default Optional<Value.Mutable<Vector3i>> homePosition() {
diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java
@@ -46,6 +46,7 @@
 import org.spongepowered.api.data.type.ArmorMaterial;
 import org.spongepowered.api.data.type.ArtType;
 import org.spongepowered.api.data.type.AttachmentSurface;
+import org.spongepowered.api.data.type.AxolotlVariant;
 import org.spongepowered.api.data.type.BambooLeavesType;
 import org.spongepowered.api.data.type.BannerPatternShape;
 import org.spongepowered.api.data.type.BellAttachmentType;
@@ -81,6 +82,7 @@
 import org.spongepowered.api.data.type.RabbitType;
 import org.spongepowered.api.data.type.RaidStatus;
 import org.spongepowered.api.data.type.RailDirection;
+import org.spongepowered.api.data.type.SalmonSize;
 import org.spongepowered.api.data.type.SculkSensorState;
 import org.spongepowered.api.data.type.SkinPart;
 import org.spongepowered.api.data.type.SlabPortion;
@@ -204,6 +206,8 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<AttributeType> ATTRIBUTE_TYPE = RegistryTypes.minecraftKeyInGame("attribute");
 
+    public static final DefaultedRegistryType<AxolotlVariant> AXOLOTL_VARIANT = RegistryTypes.spongeKeyInGame("axolotl_variant");
+
     public static final DefaultedRegistryType<Biome> BIOME = RegistryTypes.minecraftKeyInServer("worldgen/biome");
 
     public static final DefaultedRegistryType<BlockType> BLOCK_TYPE = RegistryTypes.minecraftKeyInGame("block");
@@ -473,6 +477,8 @@ public final class RegistryTypes {
 
     public static final DefaultedRegistryType<Rotation> ROTATION = RegistryTypes.spongeKeyInGame("rotation");
 
+    public static final DefaultedRegistryType<SalmonSize> SALMON_SIZE = RegistryTypes.spongeKeyInGame("salmon_size");
+
     public static final DefaultedRegistryType<SculkSensorState> SCULK_SENSOR_STATE = RegistryTypes.spongeKeyInGame("sculk_sensor_state");
 
     public static final DefaultedRegistryType<SelectorSortAlgorithm> SELECTOR_SORT_ALGORITHM = RegistryTypes.spongeKeyInGame("selector_sort_algorithm");
diff --git a/src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteractions.java b/src/main/java/org/spongepowered/api/world/explosion/ExplosionBlockInteractions.java
@@ -31,6 +31,9 @@
 import org.spongepowered.api.registry.RegistryKey;
 import org.spongepowered.api.registry.RegistryTypes;
 
+/**
+ * <!-- This file is automatically generated. Any manual changes will be overwritten. -->
+ */
 public final class ExplosionBlockInteractions {
 
     public static final DefaultedRegistryReference<ExplosionBlockInteraction> DESTROY = ExplosionBlockInteractions.key(ResourceKey.sponge("destroy"));
