2.8.1, MC 1.20.2, debug cleanup, readme cleanup, nms helper cleanup

Author: mcmonkey4eva

README.md

@@ -18,13 +18,11 @@ Sentinel NPCs: Combat NPCs for Spigot!
 * [Integrating Your Plugin With Sentinel](#Integrating-Your-Plugin-With-Sentinel)
 * [Need help using Sentinel?](#need-help-using-sentinel-try-one-of-these-places)
 * [Dependencies](#Dependencies)
-* [Sentry user?](#Sentry-user?)
-* [Update Warnings](#Update-Warnings)
 * [License](#licensing-pre-note)
 
 ![AnimatedSentinel](https://i.imgur.com/VDwTzrs.gif)
 
-**Version 2.8.0**: Compatible with Spigot 1.8.8 through 1.20.1 (Primarily targeted at 1.20.1) - see 'Common Issues' section below if on older supported versions)
+**Version 2.8.1**: Compatible with Spigot 1.8.8 through 1.20.2 (Primarily targeted at 1.20.2) - see 'Common Issues' section below if on older supported versions)
 
 ### Downloads
 
@@ -346,7 +344,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.8.0-SNAPSHOT</version>
+            <version>2.8.1-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.8.0-SNAPSHOT</version>
+    <version>2.8.1-SNAPSHOT</version>
     <name>Sentinel</name>
     <description>Combat NPCs for Spigot</description>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.20.1-R0.1-SNAPSHOT</bukkit.version>
-        <citizens.version>2.0.32-SNAPSHOT</citizens.version>
+        <bukkit.version>1.20.2-R0.1-SNAPSHOT</bukkit.version>
+        <citizens.version>2.0.33-SNAPSHOT</citizens.version>
         <BUILD_NUMBER>Unknown</BUILD_NUMBER>
     </properties>
 

src/main/java/org/mcmonkey/sentinel/targeting/SentinelTargetingHelper.java

@@ -281,9 +281,7 @@ public void processAvoidance() {
             }
         }
         else {
-            if (SentinelPlugin.debugMe) {
-                sentinel.debug("I have nowhere to run!");
-            }
+            sentinel.debug("I have nowhere to run!");
         }
     }
 
@@ -293,10 +291,12 @@ public void processAvoidance() {
     public Location findBestRunSpot() {
         if (sentinel.avoidReturnPoint != null
                 && sentinel.avoidReturnPoint.getWorld().equals(getLivingEntity().getWorld())) {
+            sentinel.debug("I have an avoid return point, I'll go there");
             return sentinel.avoidReturnPoint.clone();
         }
         Location pos = sentinel.getGuardZone();
         if (!pos.getWorld().equals(getLivingEntity().getWorld())) {
+            sentinel.debug("Run spot out-of-world, must teleport away!");
             // Emergency corrective measures...
             getNPC().getNavigator().cancelNavigation();
             Bukkit.getScheduler().scheduleSyncDelayedTask(SentinelPlugin.instance, () ->  getLivingEntity().teleport(sentinel.getGuardZone()), 1);
@@ -312,14 +312,14 @@ public Location findBestRunSpot() {
             }
         }
         if (closestThreat == null) {
+            sentinel.debug("No threats in range, actually I won't run away");
             return null;
         }
         if (threatRangeSquared >= sentinel.avoidRange * sentinel.avoidRange) {
-            if (SentinelPlugin.debugMe) {
-                sentinel.debug("Threats are getting close... holding my post.");
-            }
+            sentinel.debug("Threats are getting close... holding my post.");
             return pos.clone();
         }
+        sentinel.debug("I'll just pick a direction to run in I guess...");
         return runDirection(pos);
     }
 

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

@@ -13,7 +13,7 @@
  */
 public class SentinelNMSHelper {
 
-    public static MethodHandle CRAFTENTITY_GETHANDLE, NMSENTITY_WORLDGETTER, NMSWORLD_BROADCASTENTITYEFFECT, NMSENTITY_GETDATAWATCHER, DATWATCHER_SET, LIVINGENTITY_ATTACKSTRENGTHTICKS;
+    public static MethodHandle CRAFTENTITY_GETHANDLE, NMSENTITY_WORLDGETTER, NMSWORLD_BROADCASTENTITYEFFECT, NMSENTITY_GETDATAWATCHER, DATWATCHER_SET;
 
     public static Object ENTITYENDERMAN_DATAWATCHER_ANGRY;
 
@@ -27,8 +27,6 @@ public static void init() {
             }
             // Will be like "org.bukkit.craftbukkit.v1_16_R3"
             String bukkitPackageName = Bukkit.getServer().getClass().getPackage().getName();
-            // Should be like "v1_16_R3"
-            String packageVersion = bukkitPackageName.substring(bukkitPackageName.lastIndexOf('.') + 1);
             Class craftEntity = Class.forName(bukkitPackageName + ".entity.CraftEntity");
             CRAFTENTITY_GETHANDLE = NMS.getMethodHandle(craftEntity, "getHandle", true);
             Class nmsEntity, nmsWorld, nmsDataWatcher, nmsDataWatcherObject, nmsEntityEnderman, nmsHuman, nmsLivingEntity;
@@ -40,43 +38,30 @@ public static void init() {
                 nmsDataWatcher = Class.forName("net.minecraft.network.syncher.DataWatcher"); // SynchedEntityData
                 nmsDataWatcherObject = Class.forName("net.minecraft.network.syncher.DataWatcherObject"); // EntityDataAccessor
                 nmsEntityEnderman = Class.forName("net.minecraft.world.entity.monster.EntityEnderman");
-                nmsLivingEntity = Class.forName("net.minecraft.world.entity.EntityLiving");
-                String attackStrengthField = null;
-                boolean isCompat = false;
                 if (SentinelVersionCompat.v1_20 && !SentinelVersionCompat.vFuture) { // 1.20 names
-                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.20
+                    // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.20.2
                     endermanAngryField = "bV"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
-                    attackStrengthField = "aQ"; // net.minecraft.world.entity.LivingEntity#attackStrengthTicker
                     broadcastEffectMethod = "a"; // net.minecraft.world.level.Level#broadcastEntityEvent(Entity,byte)
                     dataWatcherSet = "a"; // net.minecraft.network.syncher.SynchedEntityData#set
-                    isCompat = true;
                 }
                 else if (SentinelVersionCompat.v1_19 && !SentinelVersionCompat.v1_20) { // 1.19.4 names
                     // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.19.4
                     endermanAngryField = "bU"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
-                    attackStrengthField = "aO"; // net.minecraft.world.entity.LivingEntity#attackStrengthTicker
                     broadcastEffectMethod = "a"; // net.minecraft.world.level.Level#broadcastEntityEvent(Entity,byte)
                     dataWatcherSet = "b"; // net.minecraft.network.syncher.SynchedEntityData#set
-                    isCompat = true;
                 }
                 else if (SentinelVersionCompat.v1_18 && !SentinelVersionCompat.v1_19) { // 1.18 names
                     // https://minidigger.github.io/MiniMappingViewer/#/mojang/server/1.18.2
                     endermanAngryField = "bX"; // net.minecraft.world.entity.monster.EnderMan#DATA_CREEPY
-                    attackStrengthField = "aQ"; // net.minecraft.world.entity.LivingEntity#attackStrengthTicker
                     broadcastEffectMethod = "a"; // net.minecraft.world.level.Level#broadcastEntityEvent(Entity,byte)
                     dataWatcherSet = "b"; // net.minecraft.network.syncher.SynchedEntityData#set
-                    isCompat = true;
                 }
                 else if (!SentinelVersionCompat.v1_18) { // 1.17 names
                     endermanAngryField = "bV"; // EnderMan#DATA_CREEPY
-                    attackStrengthField = "aQ"; // LivingEntity#attackStrengthTicker
-                    isCompat = true;
-                }
-                if (isCompat) {
-                    LIVINGENTITY_ATTACKSTRENGTHTICKS = NMS.getSetter(nmsLivingEntity, attackStrengthField);
                 }
             }
             else { // 1.12 through 1.16 - Original Spigot NMS versioned mappings
+                String packageVersion = bukkitPackageName.substring(bukkitPackageName.lastIndexOf('.') + 1); // Should be like "v1_16_R3"
                 String nmsPackageName = "net.minecraft.server." + packageVersion;
                 nmsEntity = Class.forName(nmsPackageName + ".Entity");
                 nmsWorld = Class.forName(nmsPackageName + ".World");