From 3d9ca6044566fc5ba01a175ecc8fa7ab2c706e14 Mon Sep 17 00:00:00 2001
From: Pyrbu <pyrmcserver@gmail.com>
Date: Sun, 21 May 2023 12:59:21 +0100
Subject: [PATCH] make unsafe method names consistent

---
 .../lol/pyr/znpcsplus/hologram/HologramImpl.java |  4 ++--
 .../main/java/lol/pyr/znpcsplus/npc/NpcImpl.java | 16 ++++++++--------
 .../java/lol/pyr/znpcsplus/util/Viewable.java    | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramImpl.java
index d2345d0..9f45935 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/hologram/HologramImpl.java
@@ -60,12 +60,12 @@ public class HologramImpl extends Viewable implements Hologram {
     }
 
     @Override
-    protected void _show(Player player) {
+    protected void UNSAFE_show(Player player) {
         for (HologramLine line : lines) line.show(player);
     }
 
     @Override
-    protected void _hide(Player player) {
+    protected void UNSAFE_hide(Player player) {
         for (HologramLine line : lines) line.hide(player);
     }
 
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
index 7563fbd..c0fbf14 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/npc/NpcImpl.java
@@ -84,22 +84,22 @@ public class NpcImpl extends Viewable implements Npc {
     }
 
     @Override
-    protected void _show(Player player) {
+    protected void UNSAFE_show(Player player) {
         entity.spawn(player);
         hologram.show(player);
     }
 
     @Override
-    protected void _hide(Player player) {
+    protected void UNSAFE_hide(Player player) {
         entity.despawn(player);
         hologram.hide(player);
     }
 
-    private void _refreshMeta() {
+    private void UNSAFE_refreshMeta() {
         for (Player viewer : getViewers()) entity.refreshMeta(viewer);
     }
 
-    private void _remakeTeam() {
+    private void UNSAFE_remakeTeam() {
         for (Player viewer : getViewers()) entity.remakeTeam(viewer);
     }
 
@@ -116,8 +116,8 @@ public class NpcImpl extends Viewable implements Npc {
         if (value == null) return;
         if (value.equals(key.getDefaultValue())) removeProperty(key);
         else propertyMap.put(key, value);
-        _refreshMeta();
-        if (key == EntityPropertyImpl.GLOW) _remakeTeam();
+        UNSAFE_refreshMeta();
+        if (key == EntityPropertyImpl.GLOW) UNSAFE_remakeTeam();
     }
 
     @SuppressWarnings("unchecked")
@@ -127,8 +127,8 @@ public class NpcImpl extends Viewable implements Npc {
 
     public void removeProperty(EntityPropertyImpl<?> key) {
         propertyMap.remove(key);
-        _refreshMeta();
-        if (key == EntityPropertyImpl.GLOW) _remakeTeam();
+        UNSAFE_refreshMeta();
+        if (key == EntityPropertyImpl.GLOW) UNSAFE_remakeTeam();
     }
 
     public Set<EntityPropertyImpl<?>> getAppliedProperties() {
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java b/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
index e5d4867..3b62050 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/util/Viewable.java
@@ -21,19 +21,19 @@ public abstract class Viewable {
 
     public void respawn(Player player) {
         if (!viewers.contains(player)) return;
-        _hide(player);
-        _show(player);
+        UNSAFE_hide(player);
+        UNSAFE_show(player);
     }
 
     public void show(Player player) {
         if (viewers.contains(player)) return;
-        _show(player);
+        UNSAFE_show(player);
         viewers.add(player);
     }
 
     public void hide(Player player) {
         if (!viewers.contains(player)) return;
-        _hide(player);
+        UNSAFE_hide(player);
         viewers.remove(player);
     }
 
@@ -42,11 +42,11 @@ public abstract class Viewable {
     }
 
     protected void UNSAFE_hideAll() {
-        for (Player viewer : viewers) _hide(viewer);
+        for (Player viewer : viewers) UNSAFE_hide(viewer);
     }
 
     protected void UNSAFE_showAll() {
-        for (Player viewer : viewers) _show(viewer);
+        for (Player viewer : viewers) UNSAFE_show(viewer);
     }
 
     public Set<Player> getViewers() {
@@ -57,7 +57,7 @@ public abstract class Viewable {
         return viewers.contains(player);
     }
 
-    protected abstract void _show(Player player);
+    protected abstract void UNSAFE_show(Player player);
 
-    protected abstract void _hide(Player player);
+    protected abstract void UNSAFE_hide(Player player);
 }