Add support for 1.21.1

FancyMcPlugins · Aug 12, 2024 · b64aa99 · b64aa99
1 parent 9fbb8a1
commit b64aa99
Show file tree

Hide file tree

Showing 45 changed files with 98 additions and 121 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Check out **[images section](#images)** down below.
 
 ## Installation
 
-Paper **1.19.4** - **1.21** with **Java 21** (or higher) is required. Plugin should also work on **Paper** forks.
+Paper **1.19.4** - **1.21.1** with **Java 21** (or higher) is required. Plugin should also work on **Paper** forks.
 
 **Spigot** is **not** supported.
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,6 +15,9 @@ plugins {
 
 runPaper.folia.registerTask()
 
+val supportedVersions =
+    listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1")
+
 allprojects {
     group = "de.oliver"
     val buildId = System.getenv("BUILD_ID")
@@ -34,7 +37,7 @@ dependencies {
     compileOnly("io.papermc.paper:paper-api:${findProperty("minecraftVersion")}-R0.1-SNAPSHOT")
 
     implementation(project(":api"))
-    implementation(project(":implementation_1_21"))
+    implementation(project(":implementation_1_21_1"))
     implementation(project(":implementation_1_20_6"))
     implementation(project(":implementation_1_20_4", configuration = "reobf"))
     implementation(project(":implementation_1_20_2", configuration = "reobf"))
@@ -83,9 +86,10 @@ tasks {
 //        minecraftVersion("1.20.6")
 
         downloadPlugins {
-            hangar("ViaVersion", "5.0.2")
-            hangar("ViaBackwards", "5.0.2")
-//            hangar("PlaceholderAPI", "2.11.5")
+            hangar("ViaVersion", "5.0.3")
+            hangar("ViaBackwards", "5.0.3")
+            hangar("PlaceholderAPI", "2.11.6")
+            modrinth("multiverse-core", "4.3.11")
         }
     }
 
@@ -196,8 +200,7 @@ hangarPublish {
         platforms {
             paper {
                 jar = tasks.shadowJar.flatMap { it.archiveFile }
-                platformVersions =
-                    listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21")
+                platformVersions.set(supportedVersions)
             }
         }
     }
@@ -209,6 +212,6 @@ modrinth {
     versionNumber.set(project.version.toString())
     versionType.set("alpha")
     uploadFile.set(file("build/libs/${project.name}-${project.version}.jar"))
-    gameVersions.addAll(listOf("1.19.4", "1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6", "1.21"))
+    gameVersions.addAll(supportedVersions)
     loaders.add("paper")
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-minecraftVersion=1.21
+minecraftVersion=1.21.1
 fancyLibVersion=1.0.31
 fancyAnalyticsVersion=0.0.7
 plotsquaredVersion=7.2.0

diff --git a/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/MappingKeys1_21.java b/implementation_1_21/src/main/java/de/oliver/fancynpcs/v1_21/MappingKeys1_21.java
diff --git a/implementation_1_21/build.gradle.kts → implementation_1_21_1/build.gradle.kts b/implementation_1_21/build.gradle.kts → implementation_1_21_1/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     id("io.papermc.paperweight.userdev") version "1.7.1"
 }
 
-val minecraftVersion = "1.21"
+val minecraftVersion = "1.21.1"
 
 paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
 

diff --git a/...a/de/oliver/fancynpcs/v1_21/Npc_1_21.java → .../oliver/fancynpcs/v1_21_1/Npc_1_21_1.java b/...a/de/oliver/fancynpcs/v1_21/Npc_1_21.java → .../oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -1,4 +1,4 @@
-package de.oliver.fancynpcs.v1_21;
+package de.oliver.fancynpcs.v1_21_1;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.authlib.GameProfile;
@@ -46,14 +46,14 @@
 
 import java.util.*;
 
-public class Npc_1_21 extends Npc {
+public class Npc_1_21_1 extends Npc {
 
     private final String localName;
     private final UUID uuid;
     private Entity npc;
     private Display.TextDisplay sittingVehicle;
 
-    public Npc_1_21(NpcData data) {
+    public Npc_1_21_1(NpcData data) {
         super(data);
 
         this.localName = generateLocalName();
@@ -76,7 +76,7 @@ public void create() {
             }
         } else {
             EntityType<?> nmsType = BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(data.getType().getKey()));
-            EntityType.EntityFactory factory = (EntityType.EntityFactory) ReflectionUtils.getValue(nmsType, MappingKeys1_21.ENTITY_TYPE__FACTORY.getMapping()); // EntityType.factory
+            EntityType.EntityFactory factory = (EntityType.EntityFactory) ReflectionUtils.getValue(nmsType, "factory"); // EntityType.factory
             npc = factory.create(nmsType, serverLevel);
         }
     }
@@ -297,7 +297,7 @@ protected void refreshEntityData(Player player) {
 
         ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
 
-        SynchedEntityData.DataItem<?>[] itemsById = (SynchedEntityData.DataItem<?>[]) ReflectionUtils.getValue(npc.getEntityData(), MappingKeys1_21.SYNCHED_ENTITY_DATA__ITEMS_BY_ID.getMapping()); // itemsById
+        SynchedEntityData.DataItem<?>[] itemsById = (SynchedEntityData.DataItem<?>[]) ReflectionUtils.getValue(npc.getEntityData(), "itemsById"); // itemsById
         List<SynchedEntityData.DataValue<?>> entityData = new ArrayList<>();
         for (SynchedEntityData.DataItem<?> dataItem : itemsById) {
             entityData.add(dataItem.value());
@@ -320,9 +320,9 @@ public void move(Player player, boolean swingArm) {
         npc.setYRot(data.getLocation().getYaw());
 
         ClientboundTeleportEntityPacket teleportEntityPacket = new ClientboundTeleportEntityPacket(npc);
-        ReflectionUtils.setValue(teleportEntityPacket, MappingKeys1_21.CLIENTBOUND_TELEPORT_ENTITY_PACKET__X.getMapping(), data.getLocation().x()); // 'x'
-        ReflectionUtils.setValue(teleportEntityPacket, MappingKeys1_21.CLIENTBOUND_TELEPORT_ENTITY_PACKET__Y.getMapping(), data.getLocation().y()); // 'y'
-        ReflectionUtils.setValue(teleportEntityPacket, MappingKeys1_21.CLIENTBOUND_TELEPORT_ENTITY_PACKET__Z.getMapping(), data.getLocation().z()); // 'z'
+        ReflectionUtils.setValue(teleportEntityPacket, "x", data.getLocation().x()); // 'x'
+        ReflectionUtils.setValue(teleportEntityPacket, "y", data.getLocation().y()); // 'y'
+        ReflectionUtils.setValue(teleportEntityPacket, "z", data.getLocation().z()); // 'z'
         serverPlayer.connection.send(teleportEntityPacket);
 
         float angelMultiplier = 256f / 360f;

diff --git a/...ver/fancynpcs/v1_21/ReflectionHelper.java → ...r/fancynpcs/v1_21_1/ReflectionHelper.java b/...ver/fancynpcs/v1_21/ReflectionHelper.java → ...r/fancynpcs/v1_21_1/ReflectionHelper.java
@@ -1,4 +1,4 @@
-package de.oliver.fancynpcs.v1_21;
+package de.oliver.fancynpcs.v1_21_1;
 
 import de.oliver.fancylib.ReflectionUtils;
 import de.oliver.fancynpcs.api.Npc;

diff --git a/...1_21/attributes/AgeableMobAttributes.java → ...21_1/attributes/AgeableMobAttributes.java b/...1_21/attributes/AgeableMobAttributes.java → ...21_1/attributes/AgeableMobAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.AgeableMob;
 import org.bukkit.entity.Ageable;
 import org.bukkit.entity.EntityType;

diff --git a/...pcs/v1_21/attributes/AllayAttributes.java → ...s/v1_21_1/attributes/AllayAttributes.java b/...pcs/v1_21/attributes/AllayAttributes.java → ...s/v1_21_1/attributes/AllayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.allay.Allay;
 import org.bukkit.entity.EntityType;
 

diff --git a/...v1_21/attributes/ArmadilloAttributes.java → ..._21_1/attributes/ArmadilloAttributes.java b/...v1_21/attributes/ArmadilloAttributes.java → ..._21_1/attributes/ArmadilloAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.armadillo.Armadillo;
 import org.bukkit.entity.EntityType;
 

diff --git a/...1_21/attributes/ArmorStandAttributes.java → ...21_1/attributes/ArmorStandAttributes.java b/...1_21/attributes/ArmorStandAttributes.java → ...21_1/attributes/ArmorStandAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.decoration.ArmorStand;
 import org.bukkit.entity.EntityType;
 

diff --git a/...pcs/v1_21/attributes/Attributes_1_21.java → ...v1_21_1/attributes/Attributes_1_21_1.java b/...pcs/v1_21/attributes/Attributes_1_21.java → ...v1_21_1/attributes/Attributes_1_21_1.java
@@ -1,11 +1,11 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.NpcAttribute;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class Attributes_1_21 {
+public class Attributes_1_21_1 {
 
     public static List<NpcAttribute> getAllAttributes() {
         List<NpcAttribute> attributes = new ArrayList<>();

diff --git a/...s/v1_21/attributes/AxolotlAttributes.java → ...v1_21_1/attributes/AxolotlAttributes.java b/...s/v1_21/attributes/AxolotlAttributes.java → ...v1_21_1/attributes/AxolotlAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.axolotl.Axolotl;
 import org.bukkit.entity.EntityType;
 

diff --git a/...ynpcs/v1_21/attributes/BeeAttributes.java → ...pcs/v1_21_1/attributes/BeeAttributes.java b/...ynpcs/v1_21/attributes/BeeAttributes.java → ...pcs/v1_21_1/attributes/BeeAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Bee;
 import org.bukkit.entity.EntityType;
 

diff --git a/...21/attributes/BlockDisplayAttributes.java → ..._1/attributes/BlockDisplayAttributes.java b/...21/attributes/BlockDisplayAttributes.java → ..._1/attributes/BlockDisplayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.Display;

diff --git a/...pcs/v1_21/attributes/CamelAttributes.java → ...s/v1_21_1/attributes/CamelAttributes.java b/...pcs/v1_21/attributes/CamelAttributes.java → ...s/v1_21_1/attributes/CamelAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.camel.Camel;
 import org.bukkit.entity.EntityType;
 

diff --git a/...ynpcs/v1_21/attributes/CatAttributes.java → ...pcs/v1_21_1/attributes/CatAttributes.java b/...ynpcs/v1_21/attributes/CatAttributes.java → ...pcs/v1_21_1/attributes/CatAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.animal.Cat;

diff --git a/...s/v1_21/attributes/DisplayAttributes.java → ...v1_21_1/attributes/DisplayAttributes.java b/...s/v1_21/attributes/DisplayAttributes.java → ...v1_21_1/attributes/DisplayAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.Display;
 import org.bukkit.entity.EntityType;
 

diff --git a/...cs/v1_21/attributes/EntityAttributes.java → .../v1_21_1/attributes/EntityAttributes.java b/...cs/v1_21/attributes/EntityAttributes.java → .../v1_21_1/attributes/EntityAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.Entity;
 import org.bukkit.entity.EntityType;
 

diff --git a/...ynpcs/v1_21/attributes/FoxAttributes.java → ...pcs/v1_21_1/attributes/FoxAttributes.java b/...ynpcs/v1_21/attributes/FoxAttributes.java → ...pcs/v1_21_1/attributes/FoxAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.Fox;
 import org.bukkit.entity.EntityType;
 

diff --git a/...npcs/v1_21/attributes/FrogAttributes.java → ...cs/v1_21_1/attributes/FrogAttributes.java b/...npcs/v1_21/attributes/FrogAttributes.java → ...cs/v1_21_1/attributes/FrogAttributes.java
@@ -1,13 +1,10 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
-import io.papermc.paper.registry.RegistryAccess;
-import io.papermc.paper.registry.RegistryKey;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.animal.FrogVariant;
 import net.minecraft.world.entity.animal.frog.Frog;
 import org.bukkit.entity.EntityType;
 

diff --git a/...npcs/v1_21/attributes/GoatAttributes.java → ...cs/v1_21_1/attributes/GoatAttributes.java b/...npcs/v1_21/attributes/GoatAttributes.java → ...cs/v1_21_1/attributes/GoatAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.animal.goat.Goat;
 import org.bukkit.entity.EntityType;
 

diff --git a/...pcs/v1_21/attributes/HorseAttributes.java → ...s/v1_21_1/attributes/HorseAttributes.java b/...pcs/v1_21/attributes/HorseAttributes.java → ...s/v1_21_1/attributes/HorseAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.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;

diff --git a/...s/v1_21/attributes/IllagerAttributes.java → ...v1_21_1/attributes/IllagerAttributes.java b/...s/v1_21/attributes/IllagerAttributes.java → ...v1_21_1/attributes/IllagerAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.raid.Raider;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Illager;

diff --git a/..._21/attributes/InteractionAttributes.java → ...1_1/attributes/InteractionAttributes.java b/..._21/attributes/InteractionAttributes.java → ...1_1/attributes/InteractionAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.entity.Interaction;
 import org.bukkit.entity.EntityType;
 

diff --git a/...21/attributes/LivingEntityAttributes.java → ..._1/attributes/LivingEntityAttributes.java b/...21/attributes/LivingEntityAttributes.java → ..._1/attributes/LivingEntityAttributes.java
@@ -1,8 +1,8 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.world.InteractionHand;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

diff --git a/...pcs/v1_21/attributes/PandaAttributes.java → ...s/v1_21_1/attributes/PandaAttributes.java b/...pcs/v1_21/attributes/PandaAttributes.java → ...s/v1_21_1/attributes/PandaAttributes.java
@@ -1,10 +1,9 @@
-package de.oliver.fancynpcs.v1_21.attributes;
+package de.oliver.fancynpcs.v1_21_1.attributes;
 
 import de.oliver.fancylib.ReflectionUtils;
 import de.oliver.fancynpcs.api.Npc;
 import de.oliver.fancynpcs.api.NpcAttribute;
-import de.oliver.fancynpcs.v1_21.MappingKeys1_21;
-import de.oliver.fancynpcs.v1_21.ReflectionHelper;
+import de.oliver.fancynpcs.v1_21_1.ReflectionHelper;
 import net.minecraft.network.syncher.EntityDataAccessor;
 import net.minecraft.world.entity.animal.Panda;
 import org.bukkit.entity.EntityType;
@@ -87,7 +86,7 @@ private static void setEating(Npc npc, String value) {
     }
 
     private static void setFlag(Panda panda, int mask, boolean value) {
-        EntityDataAccessor<Byte> DATA_ID_FLAGS = (EntityDataAccessor<Byte>) ReflectionUtils.getValue(panda, MappingKeys1_21.PANDA__DATA_ID_FLAGS.getMapping());
+        EntityDataAccessor<Byte> DATA_ID_FLAGS = (EntityDataAccessor<Byte>) ReflectionUtils.getValue(panda, "DATA_ID_FLAGS");
 
         byte b0 = panda.getEntityData().get(DATA_ID_FLAGS);