Modules: remove statics for maps that do not need them

Flectone · Nov 9, 2023 · af1efa0 · af1efa0
1 parent ea4f436
commit af1efa0
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 17 deletions.
diff --git a/src/main/java/net/flectone/chat/FlectoneChat.java b/src/main/java/net/flectone/chat/FlectoneChat.java
@@ -96,7 +96,6 @@ public void onDisable() {
         FPlayerManager.terminateAll();
 
         FActionManager.clearAll();
-        FModuleManager.clear();
         database.getExecutor().close();
         database.disconnect();
     }

diff --git a/src/main/java/net/flectone/chat/manager/FModuleManager.java b/src/main/java/net/flectone/chat/manager/FModuleManager.java
@@ -22,7 +22,7 @@
 @Getter
 public class FModuleManager {
 
-    private static final HashMap<Class<?>, FModule> F_MODULE_MAP = new HashMap<>();
+    private final HashMap<Class<?>, FModule> F_MODULE_MAP = new HashMap<>();
 
     public Collection<FModule> getModules() {
         return F_MODULE_MAP.values();
@@ -56,8 +56,4 @@ public void init() {
     public FModule get(Class<?> clazz) {
         return F_MODULE_MAP.get(clazz);
     }
-
-    public static void clear() {
-        F_MODULE_MAP.clear();
-    }
 }
diff --git a/src/main/java/net/flectone/chat/module/autoMessage/AutoMessageModule.java b/src/main/java/net/flectone/chat/module/autoMessage/AutoMessageModule.java
@@ -23,8 +23,8 @@
 
 public class AutoMessageModule extends FModule {
 
-    private static final HashMap<Player, Integer> MESSAGE_INDEX_MAP = new HashMap<>();
-    private static final HashMap<String, List<String>> MESSAGE_MAP = new HashMap<>();
+    private final HashMap<Player, Integer> MESSAGE_INDEX_MAP = new HashMap<>();
+    private final HashMap<String, List<String>> MESSAGE_MAP = new HashMap<>();
 
     public AutoMessageModule(String name) {
         super(name);

diff --git a/src/main/java/net/flectone/chat/module/commands/CommandFlectonechat.java b/src/main/java/net/flectone/chat/module/commands/CommandFlectonechat.java
@@ -93,7 +93,6 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
         // disable all
         IntegrationsModule.unregister();
         FActionManager.clearAll();
-        FModuleManager.clear();
 
         FPlayerManager.terminateAll();
 

diff --git a/src/main/java/net/flectone/chat/module/player/afkTimeout/AfkTimeoutModule.java b/src/main/java/net/flectone/chat/module/player/afkTimeout/AfkTimeoutModule.java
@@ -20,7 +20,7 @@
 
 public class AfkTimeoutModule extends FModule {
 
-    private static final HashMap<UUID, Pair<Integer, Block>> LAST_BLOCK_MAP = new HashMap<>();
+    private final HashMap<UUID, Pair<Integer, Block>> LAST_BLOCK_MAP = new HashMap<>();
 
     public AfkTimeoutModule(FModule module, String name) {
         super(module, name);

diff --git a/src/main/java/net/flectone/chat/module/playerMessage/formatting/FormattingModule.java b/src/main/java/net/flectone/chat/module/playerMessage/formatting/FormattingModule.java
@@ -29,7 +29,7 @@
 public class FormattingModule extends FModule {
 
     private final static List<String> patterns = List.of("||", "**", "__", "##", "??", "~~");
-    private final static HashMap<String, HashMap<String, String>> FORMATTING_MAP = new HashMap<>();
+    private final HashMap<String, HashMap<String, String>> FORMATTING_MAP = new HashMap<>();
 
     public FormattingModule(FModule module, String name) {
         super(module, name);

diff --git a/src/main/java/net/flectone/chat/module/playerMessage/patterns/PatternsModule.java b/src/main/java/net/flectone/chat/module/playerMessage/patterns/PatternsModule.java
@@ -14,7 +14,7 @@
 
 public class PatternsModule extends FModule {
 
-    private static HashMap<String, HashMap<String, String>> PATTERN_MAP = new HashMap<>();
+    private HashMap<String, HashMap<String, String>> PATTERN_MAP = new HashMap<>();
 
     public PatternsModule(FModule module, String name) {
         super(module, name);

diff --git a/src/main/java/net/flectone/chat/module/server/tab/TabModule.java b/src/main/java/net/flectone/chat/module/server/tab/TabModule.java
@@ -18,10 +18,10 @@
 
 public class TabModule extends FModule {
 
-    private static final HashMap<Player, Integer> HEADER_INDEX_MAP = new HashMap<>();
-    private static final HashMap<Player, Integer> FOOTER_INDEX_MAP = new HashMap<>();
-    private static final HashMap<String, List<String>> TAB_HEADER_MAP = new HashMap<>();
-    private static final HashMap<String, List<String>> TAB_FOOTER_MAP = new HashMap<>();
+    private final HashMap<Player, Integer> HEADER_INDEX_MAP = new HashMap<>();
+    private final HashMap<Player, Integer> FOOTER_INDEX_MAP = new HashMap<>();
+    private final HashMap<String, List<String>> TAB_HEADER_MAP = new HashMap<>();
+    private final HashMap<String, List<String>> TAB_FOOTER_MAP = new HashMap<>();
 
     public TabModule(FModule module, String name) {
         super(module, name);

diff --git a/src/main/java/net/flectone/chat/module/serverMessage/advancement/AdvancementModule.java b/src/main/java/net/flectone/chat/module/serverMessage/advancement/AdvancementModule.java
@@ -25,7 +25,7 @@
 
 public class AdvancementModule extends FModule {
 
-    private static final HashMap<World, Object> LAST_WORLD_ANNOUNCE_ADVANCEMENT_MAP = new HashMap<>();
+    private final HashMap<World, Object> LAST_WORLD_ANNOUNCE_ADVANCEMENT_MAP = new HashMap<>();
 
     public AdvancementModule(FModule module, String name) {
         super(module, name);