From a35c2ac78623940ec68bf5943179b0f62a0c21aa Mon Sep 17 00:00:00 2001 From: Oliver Date: Fri, 21 Nov 2025 13:52:51 +0100 Subject: [PATCH] Update to 1.21.11-pre1 --- .../packets/implementations/1_21_11/build.gradle.kts | 2 +- .../fancynpcs/implementation_1_21_11/build.gradle.kts | 2 +- .../fancynpcs/v1_21_11/attributes/BeeAttributes.java | 2 +- .../fancynpcs/v1_21_11/attributes/CatAttributes.java | 4 ++-- .../fancynpcs/v1_21_11/attributes/ChickenAttributes.java | 4 ++-- .../fancynpcs/v1_21_11/attributes/CowAttributes.java | 4 ++-- .../fancynpcs/v1_21_11/attributes/FoxAttributes.java | 2 +- .../v1_21_11/attributes/HappyGhastAttributes.java | 2 +- .../fancynpcs/v1_21_11/attributes/HorseAttributes.java | 9 +++++---- .../fancynpcs/v1_21_11/attributes/PandaAttributes.java | 2 +- .../fancynpcs/v1_21_11/attributes/ParrotAttributes.java | 2 +- .../fancynpcs/v1_21_11/attributes/PigAttributes.java | 4 ++-- .../fancynpcs/v1_21_11/attributes/RabbitAttributes.java | 2 +- .../v1_21_11/attributes/SpellCasterAttributes.java | 2 +- .../v1_21_11/attributes/TropicalFishAttributes.java | 2 +- .../v1_21_11/attributes/VillagerAttributes.java | 6 +++--- 16 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libraries/packets/implementations/1_21_11/build.gradle.kts b/libraries/packets/implementations/1_21_11/build.gradle.kts index 562fa237..f2d664b4 100644 --- a/libraries/packets/implementations/1_21_11/build.gradle.kts +++ b/libraries/packets/implementations/1_21_11/build.gradle.kts @@ -6,7 +6,7 @@ plugins { paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION dependencies { - paperweight.paperDevBundle("25w46a-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.11-pre1-R0.1-SNAPSHOT") compileOnly(project(":libraries:packets:packets-api")) testImplementation(project(":libraries:packets")) diff --git a/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts b/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts index 9a296ed6..bb1a4513 100644 --- a/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts +++ b/plugins/fancynpcs/implementation_1_21_11/build.gradle.kts @@ -6,7 +6,7 @@ plugins { paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION dependencies { - paperweight.paperDevBundle("25w46a-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.21.11-pre1-R0.1-SNAPSHOT") // compileOnly("com.fancyinnovations:fancymc:1.21.6-pre2") compileOnly(project(":plugins:fancynpcs:fn-api")) diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/BeeAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/BeeAttributes.java index fd78d69c..0bd6c1b3 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/BeeAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/BeeAttributes.java @@ -3,7 +3,7 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.animal.Bee; +import net.minecraft.world.entity.animal.bee.Bee; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CatAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CatAttributes.java index ac2d6872..30889dcd 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CatAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CatAttributes.java @@ -9,8 +9,8 @@ import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.entity.animal.Cat; -import net.minecraft.world.entity.animal.CatVariant; +import net.minecraft.world.entity.animal.feline.Cat; +import net.minecraft.world.entity.animal.feline.CatVariant; import net.minecraft.world.item.DyeColor; import org.bukkit.entity.EntityType; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ChickenAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ChickenAttributes.java index f9945c04..16c6eb25 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ChickenAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ChickenAttributes.java @@ -9,8 +9,8 @@ import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.entity.animal.Chicken; -import net.minecraft.world.entity.animal.ChickenVariant; +import net.minecraft.world.entity.animal.chicken.Chicken; +import net.minecraft.world.entity.animal.chicken.ChickenVariant; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CowAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CowAttributes.java index f4de238a..68369899 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CowAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/CowAttributes.java @@ -9,8 +9,8 @@ import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.entity.animal.Cow; -import net.minecraft.world.entity.animal.CowVariant; +import net.minecraft.world.entity.animal.cow.Cow; +import net.minecraft.world.entity.animal.cow.CowVariant; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/FoxAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/FoxAttributes.java index 74b90668..a3d08b86 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/FoxAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/FoxAttributes.java @@ -3,7 +3,7 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.animal.Fox; +import net.minecraft.world.entity.animal.fox.Fox; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HappyGhastAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HappyGhastAttributes.java index 6c35cf41..d5e6d475 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HappyGhastAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HappyGhastAttributes.java @@ -4,7 +4,7 @@ import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.animal.HappyGhast; +import net.minecraft.world.entity.animal.happyghast.HappyGhast; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.bukkit.entity.EntityType; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HorseAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HorseAttributes.java index 9a000564..ec066734 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HorseAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/HorseAttributes.java @@ -3,9 +3,10 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.animal.horse.Horse; -import net.minecraft.world.entity.animal.horse.Markings; -import net.minecraft.world.entity.animal.horse.Variant; +import net.minecraft.world.entity.animal.equine.AbstractHorse; +import net.minecraft.world.entity.animal.equine.Horse; +import net.minecraft.world.entity.animal.equine.Markings; +import net.minecraft.world.entity.animal.equine.Variant; import org.bukkit.entity.EntityType; import java.util.ArrayList; @@ -63,7 +64,7 @@ public class HorseAttributes { } private static void setPose(Npc npc, String value) { - net.minecraft.world.entity.animal.horse.AbstractHorse horse = ReflectionHelper.getEntity(npc); + AbstractHorse horse = ReflectionHelper.getEntity(npc); switch (value.toLowerCase()) { case "standing" -> { diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PandaAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PandaAttributes.java index 64c58194..f08298bf 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PandaAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PandaAttributes.java @@ -5,7 +5,7 @@ import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; import net.minecraft.network.syncher.EntityDataAccessor; -import net.minecraft.world.entity.animal.Panda; +import net.minecraft.world.entity.animal.panda.Panda; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ParrotAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ParrotAttributes.java index 09d8741b..96ed5fcc 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ParrotAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/ParrotAttributes.java @@ -3,7 +3,7 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.animal.Parrot; +import net.minecraft.world.entity.animal.parrot.Parrot; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PigAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PigAttributes.java index 286bba0d..4fb3f256 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PigAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/PigAttributes.java @@ -10,8 +10,8 @@ import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.animal.Pig; -import net.minecraft.world.entity.animal.PigVariant; +import net.minecraft.world.entity.animal.pig.Pig; +import net.minecraft.world.entity.animal.pig.PigVariant; import net.minecraft.world.item.Items; import org.bukkit.entity.EntityType; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/RabbitAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/RabbitAttributes.java index b6c64a2d..ecfd73af 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/RabbitAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/RabbitAttributes.java @@ -3,7 +3,7 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.animal.Rabbit; +import net.minecraft.world.entity.animal.rabbit.Rabbit; import org.bukkit.entity.EntityType; import java.util.ArrayList; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/SpellCasterAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/SpellCasterAttributes.java index 5327ec9c..28e174f1 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/SpellCasterAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/SpellCasterAttributes.java @@ -3,7 +3,7 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.monster.SpellcasterIllager; +import net.minecraft.world.entity.monster.illager.SpellcasterIllager; import org.bukkit.entity.EntityType; import org.bukkit.entity.Spellcaster; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/TropicalFishAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/TropicalFishAttributes.java index 09b87aac..c897661c 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/TropicalFishAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/TropicalFishAttributes.java @@ -3,7 +3,7 @@ package de.oliver.fancynpcs.v1_21_11.attributes; import de.oliver.fancynpcs.api.Npc; import de.oliver.fancynpcs.api.NpcAttribute; import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; -import net.minecraft.world.entity.animal.TropicalFish; +import net.minecraft.world.entity.animal.fish.TropicalFish; import net.minecraft.world.item.DyeColor; import org.bukkit.entity.EntityType; diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/VillagerAttributes.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/VillagerAttributes.java index 9ff33fea..37844169 100644 --- a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/VillagerAttributes.java +++ b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/attributes/VillagerAttributes.java @@ -6,9 +6,9 @@ import de.oliver.fancynpcs.v1_21_11.ReflectionHelper; import net.minecraft.core.Holder; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; -import net.minecraft.world.entity.npc.Villager; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.entity.npc.VillagerType; +import net.minecraft.world.entity.npc.villager.Villager; +import net.minecraft.world.entity.npc.villager.VillagerProfession; +import net.minecraft.world.entity.npc.villager.VillagerType; import org.bukkit.entity.EntityType; import java.util.ArrayList;