feat(minecraft): Update to 1.21.11

gradle.properties

@@ -1,5 +1,5 @@
 group=org.spongepowered
-version=17.0.0-SNAPSHOT
+version=18.0.0-SNAPSHOT
 organization=SpongePowered
 projectUrl=https://www.spongepowered.org
 projectDescription=A plugin API for Minecraft: Java Edition

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

@@ -407,7 +407,7 @@ public final class Keys {
      * fade over time and the entity will become peaceful again once its anger
      * reaches its minimum.</p>
      */
-    public static final Key<Value<Integer>> ANGER_LEVEL = Keys.key(ResourceKey.sponge("anger_level"), Integer.class);
+    public static final Key<Value<Long>> ANGER_LEVEL = Keys.key(ResourceKey.sponge("anger_level"), Long.class);
 
     /**
      * The set of {@link PotionEffect}s applied on use of an {@link ItemStack}.

src/main/java/org/spongepowered/api/data/type/ItemActionType.java

@@ -31,5 +31,5 @@
  * Represents a possible type of {@link ItemAction}.
  */
 @CatalogedBy(ItemActionTypes.class)
-public interface ItemActionType extends DefaultedRegistryValue {
+public interface ItemActionType extends DefaultedRegistryValue<ItemActionType> {
 }

src/main/java/org/spongepowered/api/effect/potion/PotionEffectTypes.java

@@ -46,6 +46,8 @@ public final class PotionEffectTypes {
 
     public static final DefaultedRegistryReference<PotionEffectType> BLINDNESS = PotionEffectTypes.key(ResourceKey.minecraft("blindness"));
 
+    public static final DefaultedRegistryReference<PotionEffectType> BREATH_OF_THE_NAUTILUS = PotionEffectTypes.key(ResourceKey.minecraft("breath_of_the_nautilus"));
+
     public static final DefaultedRegistryReference<PotionEffectType> CONDUIT_POWER = PotionEffectTypes.key(ResourceKey.minecraft("conduit_power"));
 
     public static final DefaultedRegistryReference<PotionEffectType> DARKNESS = PotionEffectTypes.key(ResourceKey.minecraft("darkness"));

src/main/java/org/spongepowered/api/effect/sound/SoundTypes.java

@@ -1756,6 +1756,16 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_AXOLOTL_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.axolotl.swim"));
 
+    public static final DefaultedRegistryReference<SoundType> ENTITY_BABY_NAUTILUS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.ambient"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_BABY_NAUTILUS_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.death"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_BABY_NAUTILUS_EAT = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.eat"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_BABY_NAUTILUS_HURT = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.hurt"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_BABY_NAUTILUS_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.baby_nautilus.swim"));
+
     public static final DefaultedRegistryReference<SoundType> ENTITY_BAT_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.bat.ambient"));
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_BAT_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.bat.death"));
@@ -2456,6 +2466,20 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_MULE_JUMP = SoundTypes.key(ResourceKey.minecraft("entity.mule.jump"));
 
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.ambient"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_DASH = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.dash"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_DASH_READY = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.dash_ready"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.death"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_EAT = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.eat"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_HURT = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.hurt"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_NAUTILUS_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.nautilus.swim"));
+
     public static final DefaultedRegistryReference<SoundType> ENTITY_OCELOT_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.ocelot.ambient"));
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_OCELOT_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.ocelot.death"));
@@ -3210,6 +3234,8 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_HORSE_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.ambient"));
 
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_HORSE_ANGRY = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.angry"));
+
     public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_HORSE_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.death"));
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_HORSE_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_horse.hurt"));
@@ -3218,6 +3244,20 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_INFECT = SoundTypes.key(ResourceKey.minecraft("entity.zombie.infect"));
 
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.ambient"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_DASH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.dash"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_DASH_READY = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.dash_ready"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_DEATH = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.death"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_EAT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.eat"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_HURT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.hurt"));
+
+    public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_NAUTILUS_SWIM = SoundTypes.key(ResourceKey.minecraft("entity.zombie_nautilus.swim"));
+
     public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_STEP = SoundTypes.key(ResourceKey.minecraft("entity.zombie.step"));
 
     public static final DefaultedRegistryReference<SoundType> ENTITY_ZOMBIE_VILLAGER_AMBIENT = SoundTypes.key(ResourceKey.minecraft("entity.zombie_villager.ambient"));
@@ -3266,12 +3306,16 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_EQUIP_LEATHER = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_leather"));
 
+    public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_EQUIP_NAUTILUS = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_nautilus"));
+
     public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_EQUIP_NETHERITE = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_netherite"));
 
     public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_EQUIP_TURTLE = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_turtle"));
 
     public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_EQUIP_WOLF = SoundTypes.key(ResourceKey.minecraft("item.armor.equip_wolf"));
 
+    public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_UNEQUIP_NAUTILUS = SoundTypes.key(ResourceKey.minecraft("item.armor.unequip_nautilus"));
+
     public static final DefaultedRegistryReference<SoundType> ITEM_ARMOR_UNEQUIP_WOLF = SoundTypes.key(ResourceKey.minecraft("item.armor.unequip_wolf"));
 
     public static final DefaultedRegistryReference<SoundType> ITEM_AXE_SCRAPE = SoundTypes.key(ResourceKey.minecraft("item.axe.scrape"));
@@ -3420,6 +3464,24 @@ public final class SoundTypes {
 
     public static final DefaultedRegistryReference<SoundType> ITEM_SHOVEL_FLATTEN = SoundTypes.key(ResourceKey.minecraft("item.shovel.flatten"));
 
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_ATTACK = SoundTypes.key(ResourceKey.minecraft("item.spear.attack"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_HIT = SoundTypes.key(ResourceKey.minecraft("item.spear.hit"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_LUNGE_1 = SoundTypes.key(ResourceKey.minecraft("item.spear.lunge_1"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_LUNGE_2 = SoundTypes.key(ResourceKey.minecraft("item.spear.lunge_2"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_LUNGE_3 = SoundTypes.key(ResourceKey.minecraft("item.spear.lunge_3"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_USE = SoundTypes.key(ResourceKey.minecraft("item.spear.use"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_WOOD_ATTACK = SoundTypes.key(ResourceKey.minecraft("item.spear_wood.attack"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_WOOD_HIT = SoundTypes.key(ResourceKey.minecraft("item.spear_wood.hit"));
+
+    public static final DefaultedRegistryReference<SoundType> ITEM_SPEAR_WOOD_USE = SoundTypes.key(ResourceKey.minecraft("item.spear_wood.use"));
+
     public static final DefaultedRegistryReference<SoundType> ITEM_SPYGLASS_STOP_USING = SoundTypes.key(ResourceKey.minecraft("item.spyglass.stop_using"));
 
     public static final DefaultedRegistryReference<SoundType> ITEM_SPYGLASS_USE = SoundTypes.key(ResourceKey.minecraft("item.spyglass.use"));

src/main/java/org/spongepowered/api/entity/Angerable.java

@@ -43,7 +43,7 @@ default Value.Mutable<Boolean> angry() {
      *
      * @return The anger level, decays over time
      */
-    default Value.Mutable<Integer> angerLevel() {
+    default Value.Mutable<Long> angerLevel() {
         return this.requireValue(Keys.ANGER_LEVEL).asMutable();
     }
 }

src/main/java/org/spongepowered/api/entity/EntityTypes.java

@@ -48,6 +48,7 @@
 import org.spongepowered.api.entity.living.animal.Goat;
 import org.spongepowered.api.entity.living.animal.HappyGhast;
 import org.spongepowered.api.entity.living.animal.Hoglin;
+import org.spongepowered.api.entity.living.animal.Nautilus;
 import org.spongepowered.api.entity.living.animal.Ocelot;
 import org.spongepowered.api.entity.living.animal.Panda;
 import org.spongepowered.api.entity.living.animal.Parrot;
@@ -59,6 +60,7 @@
 import org.spongepowered.api.entity.living.animal.Strider;
 import org.spongepowered.api.entity.living.animal.Turtle;
 import org.spongepowered.api.entity.living.animal.Wolf;
+import org.spongepowered.api.entity.living.animal.ZombieNautilus;
 import org.spongepowered.api.entity.living.animal.cow.Cow;
 import org.spongepowered.api.entity.living.animal.cow.Mooshroom;
 import org.spongepowered.api.entity.living.animal.frog.Frog;
@@ -348,6 +350,8 @@ public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<Mule>> MULE = EntityTypes.key(ResourceKey.minecraft("mule"));
 
+    public static final DefaultedRegistryReference<EntityType<Nautilus>> NAUTILUS = EntityTypes.key(ResourceKey.minecraft("nautilus"));
+
     public static final DefaultedRegistryReference<EntityType<Boat>> OAK_BOAT = EntityTypes.key(ResourceKey.minecraft("oak_boat"));
 
     public static final DefaultedRegistryReference<EntityType<ChestBoat>> OAK_CHEST_BOAT = EntityTypes.key(ResourceKey.minecraft("oak_chest_boat"));
@@ -472,6 +476,8 @@ public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<ZombieHorse>> ZOMBIE_HORSE = EntityTypes.key(ResourceKey.minecraft("zombie_horse"));
 
+    public static final DefaultedRegistryReference<EntityType<ZombieNautilus>> ZOMBIE_NAUTILUS = EntityTypes.key(ResourceKey.minecraft("zombie_nautilus"));
+
     public static final DefaultedRegistryReference<EntityType<ZombieVillager>> ZOMBIE_VILLAGER = EntityTypes.key(ResourceKey.minecraft("zombie_villager"));
 
     public static final DefaultedRegistryReference<EntityType<ZombifiedPiglin>> ZOMBIFIED_PIGLIN = EntityTypes.key(ResourceKey.minecraft("zombified_piglin"));

src/main/java/org/spongepowered/api/entity/living/animal/Nautilus.java

@@ -0,0 +1,33 @@
+/*
+ * 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.entity.living.animal;
+
+/**
+ * A friendly {@link NautilusLike} entity.
+ * <p>
+ * See <a href="https://minecraft.wiki/w/Nautilus">Minecraft Wiki</a>
+ */
+public interface Nautilus extends NautilusLike {
+}

src/main/java/org/spongepowered/api/entity/living/animal/NautilusLike.java

@@ -0,0 +1,33 @@
+/*
+ * 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.entity.living.animal;
+
+/**
+ * Represents a Nautilus-like entity, all of which can be mounted.
+ * <p>
+ * See <a href="https://minecraft.wiki/w/Nautilus">Minecraft Wiki</a>
+ */
+public interface NautilusLike extends TameableAnimal {
+}

src/main/java/org/spongepowered/api/entity/living/animal/ZombieNautilus.java

@@ -0,0 +1,34 @@
+/*
+ * 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.entity.living.animal;
+
+/**
+ * Represents a Zombie Nautilus.
+ * <p>
+ * See <a href="https://minecraft.wiki/w/Zombie_Nautilus">Minecraft Wiki</a>
+ */
+public interface ZombieNautilus extends NautilusLike {
+
+}

src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageTypes.java

@@ -114,6 +114,8 @@ public final class DamageTypes {
 
     public static final DefaultedRegistryReference<DamageType> SONIC_BOOM = DamageTypes.key(ResourceKey.minecraft("sonic_boom"));
 
+    public static final DefaultedRegistryReference<DamageType> SPEAR = DamageTypes.key(ResourceKey.minecraft("spear"));
+
     public static final DefaultedRegistryReference<DamageType> SPIT = DamageTypes.key(ResourceKey.minecraft("spit"));
 
     public static final DefaultedRegistryReference<DamageType> STALAGMITE = DamageTypes.key(ResourceKey.minecraft("stalagmite"));