fancynpcs: fix minor code style issues

TheosRee · TheosRee · commit 8ec1d9ecbe16 · 2025-11-21T18:47:04.000+01:00
diff --git a/plugins/fancynpcs/fn-api/src/main/java/de/oliver/fancynpcs/api/Npc.java b/plugins/fancynpcs/fn-api/src/main/java/de/oliver/fancynpcs/api/Npc.java
@@ -40,14 +40,12 @@ public Npc(NpcData data) {
     }
 
     protected String generateLocalName() {
-        String localName = "";
+        StringBuilder localName = new StringBuilder();
         for (int i = 0; i < 8; i++) {
-            localName += "&" + localNameChars[(int) RandomUtils.randomInRange(0, localNameChars.length)];
+            localName.append('&').append(localNameChars[(int) RandomUtils.randomInRange(0, localNameChars.length)]);
         }
 
-        localName = ChatColor.translateAlternateColorCodes('&', localName);
-
-        return localName;
+        return ChatColor.translateAlternateColorCodes('&', localName.toString());
     }
 
     public abstract void create();
@@ -99,11 +97,9 @@ protected boolean shouldBeVisible(Player player) {
             return false;
         }
 
-        if (FancyNpcsPlugin.get().getFancyNpcConfig().isSkipInvisibleNpcs() && data.getAttributes().getOrDefault(INVISIBLE_ATTRIBUTE, "false").equalsIgnoreCase("true") && !data.isGlowing() && data.getEquipment().isEmpty()) {
-            return false;
-        }
-
-        return true;
+        return !FancyNpcsPlugin.get().getFancyNpcConfig().isSkipInvisibleNpcs()
+                || !data.getAttributes().getOrDefault(INVISIBLE_ATTRIBUTE, "false").equalsIgnoreCase("true")
+                || data.isGlowing() || !data.getEquipment().isEmpty();
     }
 
     public void checkAndUpdateVisibility(Player player) {
diff --git a/plugins/fancynpcs/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java b/plugins/fancynpcs/implementation_1_20_1/src/main/java/de/oliver/fancynpcs/v1_20_1/Npc_1_20_1.java
@@ -250,7 +250,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -307,6 +307,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java b/plugins/fancynpcs/implementation_1_20_2/src/main/java/de/oliver/fancynpcs/v1_20_2/Npc_1_20_2.java
@@ -245,7 +245,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -302,6 +302,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java b/plugins/fancynpcs/implementation_1_20_4/src/main/java/de/oliver/fancynpcs/v1_20_4/Npc_1_20_4.java
@@ -244,7 +244,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -301,6 +301,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java b/plugins/fancynpcs/implementation_1_20_6/src/main/java/de/oliver/fancynpcs/v1_20_6/Npc_1_20_6.java
@@ -249,7 +249,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -316,6 +316,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java b/plugins/fancynpcs/implementation_1_21_1/src/main/java/de/oliver/fancynpcs/v1_21_1/Npc_1_21_1.java
@@ -261,7 +261,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -329,6 +329,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/Npc_1_21_11.java b/plugins/fancynpcs/implementation_1_21_11/src/main/java/de/oliver/fancynpcs/v1_21_11/Npc_1_21_11.java
@@ -355,6 +355,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java b/plugins/fancynpcs/implementation_1_21_3/src/main/java/de/oliver/fancynpcs/v1_21_3/Npc_1_21_3.java
@@ -272,7 +272,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -340,6 +340,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/Npc_1_21_4.java b/plugins/fancynpcs/implementation_1_21_4/src/main/java/de/oliver/fancynpcs/v1_21_4/Npc_1_21_4.java
@@ -272,7 +272,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -340,6 +340,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/Npc_1_21_5.java b/plugins/fancynpcs/implementation_1_21_5/src/main/java/de/oliver/fancynpcs/v1_21_5/Npc_1_21_5.java
@@ -272,7 +272,7 @@ public void update(Player player, boolean swingArm) {
 
         npc.setGlowingTag(data.isGlowing());
 
-        if (data.getEquipment() != null && data.getEquipment().size() > 0) {
+        if (data.getEquipment() != null && !data.getEquipment().isEmpty()) {
             List<Pair<EquipmentSlot, ItemStack>> equipmentList = new ArrayList<>();
 
             for (NpcEquipmentSlot slot : data.getEquipment().keySet()) {
@@ -340,6 +340,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/Npc_1_21_6.java b/plugins/fancynpcs/implementation_1_21_6/src/main/java/de/oliver/fancynpcs/v1_21_6/Npc_1_21_6.java
@@ -350,6 +350,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/implementation_1_21_9/src/main/java/de/oliver/fancynpcs/v1_21_9/Npc_1_21_9.java b/plugins/fancynpcs/implementation_1_21_9/src/main/java/de/oliver/fancynpcs/v1_21_9/Npc_1_21_9.java
@@ -355,6 +355,7 @@ protected void refreshEntityData(Player player) {
         serverPlayer.connection.send(setEntityDataPacket);
     }
 
+    @Override
     public void move(Player player, boolean swingArm) {
         if (npc == null) {
             return;
diff --git a/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java b/plugins/fancynpcs/src/main/java/de/oliver/fancynpcs/FancyNpcs.java
@@ -163,20 +163,20 @@ public void onLoad() {
 
         String mcVersion = Bukkit.getMinecraftVersion();
 
-        switch (mcVersion) {
-            case "1.21.11" -> npcAdapter = Npc_1_21_11::new;
-            case "1.21.9", "1.21.10" -> npcAdapter = Npc_1_21_9::new;
-            case "1.21.6", "1.21.7", "1.21.8" -> npcAdapter = Npc_1_21_6::new;
-            case "1.21.5" -> npcAdapter = Npc_1_21_5::new;
-            case "1.21.4" -> npcAdapter = Npc_1_21_4::new;
-            case "1.21.2", "1.21.3" -> npcAdapter = Npc_1_21_3::new;
-            case "1.21", "1.21.1" -> npcAdapter = Npc_1_21_1::new;
-            case "1.20.5", "1.20.6" -> npcAdapter = Npc_1_20_6::new;
-            case "1.20.3", "1.20.4" -> npcAdapter = Npc_1_20_4::new;
-            case "1.20.2" -> npcAdapter = Npc_1_20_2::new;
-            case "1.20.1", "1.20" -> npcAdapter = Npc_1_20_1::new;
-            default -> npcAdapter = null;
-        }
+        npcAdapter = switch (mcVersion) {
+            case "1.21.11" -> Npc_1_21_11::new;
+            case "1.21.9", "1.21.10" -> Npc_1_21_9::new;
+            case "1.21.6", "1.21.7", "1.21.8" -> Npc_1_21_6::new;
+            case "1.21.5" -> Npc_1_21_5::new;
+            case "1.21.4" -> Npc_1_21_4::new;
+            case "1.21.2", "1.21.3" -> Npc_1_21_3::new;
+            case "1.21", "1.21.1" -> Npc_1_21_1::new;
+            case "1.20.5", "1.20.6" -> Npc_1_20_6::new;
+            case "1.20.3", "1.20.4" -> Npc_1_20_4::new;
+            case "1.20.2" -> Npc_1_20_2::new;
+            case "1.20.1", "1.20" -> Npc_1_20_1::new;
+            default -> null;
+        };
 
         npcManager = new NpcManagerImpl(this, npcAdapter);
 
@@ -195,7 +195,6 @@ public void onLoad() {
             getLogger().warning("Disabling the FancyNpcs plugin.");
             getLogger().warning("--------------------------------------------------");
             pluginManager.disablePlugin(this);
-            return;
         }
     }
 
@@ -282,9 +281,10 @@ Please update to the newest version (%s).
         }
 
         // use packet injection method
-        switch (mcVersion) {
-            case "1.20" -> pluginManager.registerEvents(new PacketReader_1_20(), instance);
-            default -> pluginManager.registerEvents(new PlayerUseUnknownEntityListener(), instance);
+        if (mcVersion.equals("1.20")) {
+            pluginManager.registerEvents(new PacketReader_1_20(), instance);
+        } else {
+            pluginManager.registerEvents(new PlayerUseUnknownEntityListener(), instance);
         }
 
         if (PLAYER_NPCS_FEATURE_FLAG.isEnabled()) {
@@ -312,11 +312,7 @@ Please update to the newest version (%s).
             final List<Npc> npcs = new ArrayList<>(npcManager.getAllNpcs());
             for (final Npc npc : npcs) {
                 try {
-                    boolean shouldUpdate = false;
-
-                    if (npc.getData().getDisplayName() != null && !npc.getData().getDisplayName().isBlank() && SkinUtils.isPlaceholder(npc.getData().getDisplayName())) {
-                        shouldUpdate = true;
-                    }
+                    boolean shouldUpdate = npc.getData().getDisplayName() != null && !npc.getData().getDisplayName().isBlank() && SkinUtils.isPlaceholder(npc.getData().getDisplayName());
 
                     if (npc.getData().getSkinData() != null) {
                         final String skinID = npc.getData().getSkinData().getIdentifier();
@@ -469,7 +465,7 @@ private void registerMetrics() {
             long count = 0;
 
             for (Npc npc : npcManager.getAllNpcs()) {
-                count += npc.getData().getActions().values().size();
+                count += npc.getData().getActions().size();
             }
 
             return (double) count;
@@ -528,6 +524,7 @@ public Thread newThread(String name, Runnable runnable) {
         return Thread.ofVirtual().name(name).unstarted(runnable);
     }
 
+    @Override
     public ExtendedFancyLogger getFancyLogger() {
         return fancyLogger;
     }

Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,12 @@ public Npc(NpcData data) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`protected String generateLocalName() {`
`43`		`- String localName = "";`
	`43`	`+ StringBuilder localName = new StringBuilder();`
`44`	`44`	`for (int i = 0; i < 8; i++) {`
`45`		`- localName += "&" + localNameChars[(int) RandomUtils.randomInRange(0, localNameChars.length)];`
	`45`	`+ localName.append('&').append(localNameChars[(int) RandomUtils.randomInRange(0, localNameChars.length)]);`
`46`	`46`	`}`
`47`	`47`
`48`		`- localName = ChatColor.translateAlternateColorCodes('&', localName);`
`49`		`-`
`50`		`- return localName;`
	`48`	`+ return ChatColor.translateAlternateColorCodes('&', localName.toString());`
`51`	`49`	`}`
`52`	`50`
`53`	`51`	`public abstract void create();`
`@@ -99,11 +97,9 @@ protected boolean shouldBeVisible(Player player) {`
`99`	`97`	`return false;`
`100`	`98`	`}`
`101`	`99`
`102`		`- if (FancyNpcsPlugin.get().getFancyNpcConfig().isSkipInvisibleNpcs() && data.getAttributes().getOrDefault(INVISIBLE_ATTRIBUTE, "false").equalsIgnoreCase("true") && !data.isGlowing() && data.getEquipment().isEmpty()) {`
`103`		`- return false;`
`104`		`- }`
`105`		`-`
`106`		`- return true;`
	`100`	`+ return !FancyNpcsPlugin.get().getFancyNpcConfig().isSkipInvisibleNpcs()`
	`101`	`+ \|\| !data.getAttributes().getOrDefault(INVISIBLE_ATTRIBUTE, "false").equalsIgnoreCase("true")`
	`102`	`+ \|\| data.isGlowing() \|\| !data.getEquipment().isEmpty();`
`107`	`103`	`}`
`108`	`104`
`109`	`105`	`public void checkAndUpdateVisibility(Player player) {`
Original file line number	Diff line number	Diff line change
`@@ -355,6 +355,7 @@ protected void refreshEntityData(Player player) {`
`355`	`355`	`serverPlayer.connection.send(setEntityDataPacket);`
`356`	`356`	`}`
`357`	`357`
	`358`	`+ @Override`
`358`	`359`	`public void move(Player player, boolean swingArm) {`
`359`	`360`	`if (npc == null) {`
`360`	`361`	`return;`