target MC 1.21.3

Author: mcmonkey4eva

README.md

@@ -22,7 +22,7 @@ Sentinel NPCs: Combat NPCs for Spigot!
 
 ![AnimatedSentinel](https://i.imgur.com/VDwTzrs.gif)
 
-**Version 2.9.1**: Compatible with Spigot 1.8.8 through 1.21 (Primarily targeted at 1.21 - see 'Common Issues' section below if on older supported versions)
+**Version 2.9.2**: Compatible with Spigot 1.8.8 through 1.21.3 (Primarily targeted at 1.21.3 - see 'Common Issues' section below if on older supported versions)
 
 ### Downloads
 
@@ -345,7 +345,7 @@ If you're building a separate plugin you would like to integrate into Sentinel,
         <dependency>
             <groupId>org.mcmonkey</groupId>
             <artifactId>sentinel</artifactId>
-            <version>2.9.1-SNAPSHOT</version>
+            <version>2.9.2-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
             <exclusions>

pom.xml

@@ -7,14 +7,14 @@
     <groupId>org.mcmonkey</groupId>
     <artifactId>sentinel</artifactId>
     <packaging>jar</packaging>
-    <version>2.9.1-SNAPSHOT</version>
+    <version>2.9.2-SNAPSHOT</version>
     <name>Sentinel</name>
     <description>Combat NPCs for Spigot</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.21-R0.1-SNAPSHOT</bukkit.version>
-        <citizens.version>2.0.35-SNAPSHOT</citizens.version>
+        <bukkit.version>1.21.3-R0.1-SNAPSHOT</bukkit.version>
+        <citizens.version>2.0.36-SNAPSHOT</citizens.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
     </properties>
 

src/main/java/org/mcmonkey/sentinel/SentinelWeaponHelper.java

@@ -3,7 +3,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.attribute.Attribute;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.*;
 import org.bukkit.inventory.ItemStack;
@@ -396,7 +395,7 @@ public void knockback(LivingEntity entity, float force) {
             return;
         }
         if (SentinelVersionCompat.v1_12) {
-            float resist = (float) entity.getAttribute(Attribute.GENERIC_KNOCKBACK_RESISTANCE).getValue();
+            float resist = (float) entity.getAttribute(SentinelAPIBreakageFix.ATTRIBUTE_GENERIC_KNOCKBACK_RESISTANCE).getValue();
             if (resist > 0.0 && resist <= 1.0) {
                 force *= (1.0 - resist);
             }

src/main/java/org/mcmonkey/sentinel/utilities/SentinelAPIBreakageFix.java

@@ -1,6 +1,7 @@
 package org.mcmonkey.sentinel.utilities;
 
 import org.bukkit.Particle;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.potion.PotionType;
@@ -30,6 +31,8 @@ public class SentinelAPIBreakageFix {
 
     public static Particle PARTICLE_SPELL = _getEnumValue(Particle.class, "SPELL", "EFFECT");
 
+    public static Attribute ATTRIBUTE_GENERIC_KNOCKBACK_RESISTANCE = _getEnumValue(Attribute.class, "GENERIC_KNOCKBACK_RESISTANCE", "KNOCKBACK_RESISTANCE");
+
     /**
      * Note: not necessarily actually an enum.
      */

src/main/java/org/mcmonkey/sentinel/utilities/SentinelNMSHelper.java

@@ -22,6 +22,15 @@ public class SentinelNMSHelper {
 
     public static MethodHandle INVENTORYCLOSEEVENT_GETVIEW, INVENTORYVIEW_GETTITLE;
 
+    public static Class<?> getOptionalFieldType(Class<?> clazz, String fieldName) {
+        try {
+            return clazz.getDeclaredField(fieldName).getType();
+        }
+        catch (NoSuchFieldException ex) {
+            return null;
+        }
+    }
+
     public static void init() {
         try {
             if (SentinelVersionCompat.v1_10) {
@@ -46,15 +55,21 @@ public static void init() {
                 nmsDataWatcherObject = Class.forName("net.minecraft.network.syncher.DataWatcherObject"); // EntityDataAccessor
                 nmsEntityEnderman = Class.forName("net.minecraft.world.entity.monster.EntityEnderman");
                 if (SentinelVersionCompat.v1_21 && !SentinelVersionCompat.vFuture) { // 1.21 names
-                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.21
-                    endermanAngryField = "ce"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
+                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.21.3
+                    if (getOptionalFieldType(nmsEntityEnderman, "cc") == nmsDataWatcherObject) {
+                        endermanAngryField = "cc"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
+                    }
+                    else {
+                        // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.21
+                        endermanAngryField = "ce"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
+                    }
                     broadcastEffectMethod = "a"; // net.minecraft.world.level.Level#broadcastEntityEvent(Entity,byte)
                     dataWatcherSet = "a"; // net.minecraft.network.syncher.SynchedEntityData#set
                 }
                 else if (SentinelVersionCompat.v1_20 && !SentinelVersionCompat.v1_21) { // 1.20 names
                     try {
                         // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.20.2
-                        if (nmsEntityEnderman.getDeclaredField("bV") != null) {
+                        if (getOptionalFieldType(nmsEntityEnderman, "bV") == nmsDataWatcherObject) {
                             endermanAngryField = "bV"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
                         }
                     }