From 750ca0e38720de0c389f792e32eed3ee9588c6f6 Mon Sep 17 00:00:00 2001
From: Pyrbu <pyrmcserver@gmail.com>
Date: Wed, 26 Apr 2023 20:14:07 +0100
Subject: [PATCH] prevent stupid stuff & remove unused classes

---
 .../znpcservers/utility/GuavaCollectors.java  | 23 -------------------
 .../znpcservers/utility/ReflectionUtils.java  | 23 -------------------
 .../lol/pyr/znpcsplus/npc/NPCRegistry.java    |  5 ++--
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 src/main/java/io/github/znetworkw/znpcservers/utility/GuavaCollectors.java
 delete mode 100644 src/main/java/io/github/znetworkw/znpcservers/utility/ReflectionUtils.java

diff --git a/src/main/java/io/github/znetworkw/znpcservers/utility/GuavaCollectors.java b/src/main/java/io/github/znetworkw/znpcservers/utility/GuavaCollectors.java
deleted file mode 100644
index 4058f07..0000000
--- a/src/main/java/io/github/znetworkw/znpcservers/utility/GuavaCollectors.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.znetworkw.znpcservers.utility;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-import java.util.function.Function;
-import java.util.stream.Collector;
-import java.util.stream.Collectors;
-
-public final class GuavaCollectors {
-    public static <E> Collector<E, ?, ImmutableList<E>> toImmutableList() {
-        return Collectors.collectingAndThen(Collectors.toList(), ImmutableList::copyOf);
-    }
-
-    public static <E> Collector<E, ?, ImmutableSet<E>> toImmutableSet() {
-        return Collectors.collectingAndThen(Collectors.toSet(), ImmutableSet::copyOf);
-    }
-
-    public static <T, K, V> Collector<T, ?, ImmutableMap<K, V>> toImmutableMap(Function<? super T, ? extends K> keyFunction, Function<? super T, ? extends V> valueFunction) {
-        return Collectors.collectingAndThen(Collectors.toMap(keyFunction, valueFunction), ImmutableMap::copyOf);
-    }
-}
diff --git a/src/main/java/io/github/znetworkw/znpcservers/utility/ReflectionUtils.java b/src/main/java/io/github/znetworkw/znpcservers/utility/ReflectionUtils.java
deleted file mode 100644
index fc0e433..0000000
--- a/src/main/java/io/github/znetworkw/znpcservers/utility/ReflectionUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.github.znetworkw.znpcservers.utility;
-
-import java.lang.reflect.Field;
-
-public final class ReflectionUtils {
-    public static Field findFieldForClass(Object instance, Class<?> type) {
-        for (Field field : instance.getClass().getDeclaredFields()) {
-            if (field.getType() == type) {
-                field.setAccessible(true);
-                return field;
-            }
-        }
-        return null;
-    }
-
-    public static Field findFieldForClassAndSet(Object instance, Class<?> type, Object value) throws ReflectiveOperationException {
-        Field field = findFieldForClass(instance, type);
-        if (field == null)
-            return null;
-        field.set(instance, value);
-        return field;
-    }
-}
diff --git a/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java b/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
index 44c1c29..54b3639 100644
--- a/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
+++ b/src/main/java/lol/pyr/znpcsplus/npc/NPCRegistry.java
@@ -1,6 +1,7 @@
 package lol.pyr.znpcsplus.npc;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,7 +13,7 @@ public class NPCRegistry {
     }
 
     public static Collection<NPC> all() {
-        return NPC._ALL_NPCS;
+        return Collections.unmodifiableSet(NPC._ALL_NPCS);
     }
 
     public static NPC getByEntityId(int id) {
@@ -20,7 +21,7 @@ public class NPCRegistry {
     }
 
     public static Collection<String> ids() {
-        return npcMap.keySet();
+        return Collections.unmodifiableSet(npcMap.keySet());
     }
 
     public static void register(String id, NPC npc) {