feat(minecraft): merge 1.21.11 updates

Merges #2606

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

Author: gabizou

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/advancement/criteria/trigger/Triggers.java

@@ -130,6 +130,8 @@ public final class Triggers {
 
     public static final DefaultedRegistryReference<Trigger<?>> SLIDE_DOWN_BLOCK = Triggers.key(ResourceKey.minecraft("slide_down_block"));
 
+    public static final DefaultedRegistryReference<Trigger<?>> SPEAR_MOBS = Triggers.key(ResourceKey.minecraft("spear_mobs"));
+
     public static final DefaultedRegistryReference<Trigger<?>> STARTED_RIDING = Triggers.key(ResourceKey.minecraft("started_riding"));
 
     public static final DefaultedRegistryReference<Trigger<?>> SUMMONED_ENTITY = Triggers.key(ResourceKey.minecraft("summoned_entity"));

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

@@ -410,7 +410,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

@@ -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/Angerable.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,11 +60,13 @@
 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.camel.Camel;
+import org.spongepowered.api.entity.living.animal.camel.CamelHusk;
 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;
 import org.spongepowered.api.entity.living.animal.frog.Tadpole;
-import org.spongepowered.api.entity.living.animal.horse.Camel;
 import org.spongepowered.api.entity.living.animal.horse.Donkey;
 import org.spongepowered.api.entity.living.animal.horse.Horse;
 import org.spongepowered.api.entity.living.animal.horse.Mule;
@@ -108,6 +111,7 @@
 import org.spongepowered.api.entity.living.monster.raider.illager.spellcaster.Evoker;
 import org.spongepowered.api.entity.living.monster.raider.illager.spellcaster.Illusioner;
 import org.spongepowered.api.entity.living.monster.skeleton.Bogged;
+import org.spongepowered.api.entity.living.monster.skeleton.Parched;
 import org.spongepowered.api.entity.living.monster.skeleton.Skeleton;
 import org.spongepowered.api.entity.living.monster.skeleton.Stray;
 import org.spongepowered.api.entity.living.monster.skeleton.WitherSkeleton;
@@ -208,6 +212,8 @@ public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<Camel>> CAMEL = EntityTypes.key(ResourceKey.minecraft("camel"));
 
+    public static final DefaultedRegistryReference<EntityType<CamelHusk>> CAMEL_HUSK = EntityTypes.key(ResourceKey.minecraft("camel_husk"));
+
     public static final DefaultedRegistryReference<EntityType<Cat>> CAT = EntityTypes.key(ResourceKey.minecraft("cat"));
 
     public static final DefaultedRegistryReference<EntityType<CaveSpider>> CAVE_SPIDER = EntityTypes.key(ResourceKey.minecraft("cave_spider"));
@@ -348,6 +354,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"));
@@ -364,6 +372,8 @@ public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<Panda>> PANDA = EntityTypes.key(ResourceKey.minecraft("panda"));
 
+    public static final DefaultedRegistryReference<EntityType<Parched>> PARCHED = EntityTypes.key(ResourceKey.minecraft("parched"));
+
     public static final DefaultedRegistryReference<EntityType<Parrot>> PARROT = EntityTypes.key(ResourceKey.minecraft("parrot"));
 
     public static final DefaultedRegistryReference<EntityType<Phantom>> PHANTOM = EntityTypes.key(ResourceKey.minecraft("phantom"));
@@ -472,6 +482,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/EntityTypes.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/Nautilus.java

@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+import org.spongepowered.api.item.inventory.Carrier;
+
+/**
+ * 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, Carrier {
+}