From aafdf0b3f9ffd2ddd9b10d1a82a3dda9336aa890 Mon Sep 17 00:00:00 2001
From: D3v1s0m <d3v1s0m@gmail.com>
Date: Mon, 1 Jul 2024 10:12:52 +0530
Subject: [PATCH] update to mc 1.21

---
 api/src/main/java/lol/pyr/znpcsplus/util/NpcPose.java    | 5 ++++-
 plugin/build.gradle                                      | 4 ++--
 .../pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java | 5 +++++
 .../java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java  | 9 +++++++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/api/src/main/java/lol/pyr/znpcsplus/util/NpcPose.java b/api/src/main/java/lol/pyr/znpcsplus/util/NpcPose.java
index 4036e94..605702e 100644
--- a/api/src/main/java/lol/pyr/znpcsplus/util/NpcPose.java
+++ b/api/src/main/java/lol/pyr/znpcsplus/util/NpcPose.java
@@ -20,5 +20,8 @@ public enum NpcPose {
     ROARING,
     SNIFFING,
     EMERGING,
-    DIGGING
+    DIGGING,
+    SLIDING,
+    SHOOTING,
+    INHALING,
 }
diff --git a/plugin/build.gradle b/plugin/build.gradle
index a4ae386..90a9e2a 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -8,7 +8,7 @@ runServer {
     javaLauncher = javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(21)
     }
-    minecraftVersion "1.20.6"
+    minecraftVersion "1.21"
 }
 
 processResources {
@@ -20,7 +20,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.10.1" // JSON parsing
     implementation "org.bstats:bstats-bukkit:3.0.2" // Plugin stats
     implementation "me.robertlit:SpigotResourcesAPI:2.0" // Spigot API wrapper for update checker
-    implementation "com.github.retrooper.packetevents:spigot:2.3.0" // Packets
+    implementation "com.github.retrooper:packetevents-spigot:2.4.0" // Packets
     implementation "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs
     implementation "lol.pyr:director-adventure:2.1.2" // Commands
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
index ba70aa3..a7490c0 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/entity/EntityPropertyRegistryImpl.java
@@ -659,6 +659,11 @@ public class EntityPropertyRegistryImpl implements EntityPropertyRegistry {
 
         // Wolf
         register(new EncodedIntegerProperty<>("wolf_variant", WoldVariant.PALE, wolfIndex, WoldVariant::getId, EntityDataTypes.WOLF_VARIANT));
+
+        if (!ver.isNewerThanOrEquals(ServerVersion.V_1_21)) return;
+
+        // Bogged
+        register(new BooleanProperty("bogged_sheared", 16, false, legacyBooleans));
     }
 
     private void registerSerializer(PropertySerializer<?> serializer) {
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
index 135638b..39f52b7 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcTypeRegistryImpl.java
@@ -377,6 +377,15 @@ public class NpcTypeRegistryImpl implements NpcTypeRegistry {
         register(builder(p, "armadillo", EntityTypes.ARMADILLO)
                 .setHologramOffset(-1.325)
                 .addProperties("armadillo_state"));
+
+        if (!version.isNewerThanOrEquals(ServerVersion.V_1_21)) return;
+
+        register(builder(p, "bogged", EntityTypes.BOGGED)
+                .setHologramOffset(0.015)
+                .addProperties("bogged_sheared"));
+
+        register(builder(p, "breeze", EntityTypes.BREEZE)
+                .setHologramOffset(-0.205));
     }
 
     public Collection<NpcType> getAll() {