Remove debug code, move chat message methods from ClassiCubeJavaLoaderBridge to Chat class, increment VERSION_CODE (now is 2)

Author: minecraft8997

ClassiCubeJavaLoaderBridge/src/main/java/ccjl/Interface.java

@@ -2,6 +2,7 @@
 
 import ru.deewend.ccjlbridge.ClassiCubeJavaLoaderBridge;
 import ru.deewend.ccjlbridge.EventManager;
+import ru.deewend.ccjlbridge.gameapi.Chat;
 import ru.deewend.ccjlbridge.gameapi.ScheduledTask;
 
 // not meant to be called by plugins
@@ -32,6 +33,7 @@ public static Object freePendingInfo() {
         return null;
     }
 
+    // is not actually used by the native loader plugin
     public static double[] getPendingScheduledTaskIntervals() {
         try {
             return ScheduledTask.getPendingScheduledTaskIntervals();
@@ -43,7 +45,7 @@ public static double[] getPendingScheduledTaskIntervals() {
     }
 
     public static String[] getPendingChatMessages() {
-        return ClassiCubeJavaLoaderBridge.getInstance().getPendingChatMessages();
+        return Chat.getPendingChatMessages();
     }
 
     public static void fireEvent(int eventId) {

ClassiCubeJavaLoaderBridge/src/main/java/ru/deewend/ccjlbridge/ClassiCubeJavaLoaderBridge.java

@@ -1,32 +1,20 @@
 package ru.deewend.ccjlbridge;
 
-import ccjl.Interface;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import ru.deewend.ccjlbridge.gameapi.Chat;
 
 public class ClassiCubeJavaLoaderBridge {
     public static boolean DEBUG = false;
-    public static final int VERSION_CODE = 1;
+    public static final int VERSION_CODE = 2;
 
     public static final String LOG_FORMAT = "[HH:mm:ss dd.MM.yyyy] ";
     public static final String LOG_FILENAME_FORMAT = "dd-MM-yyyy-logs.txt";
     public static final boolean SHOULD_SAVE_LOGS_ON_DISK = true;
 
     private static ClassiCubeJavaLoaderBridge instance;
 
-    private final List<String> pendingChatMessages = new ArrayList<>();
-
     private ClassiCubeJavaLoaderBridge() {
     }
 
-    public static void main(String[] args) {
-        System.out.println(Arrays.toString(Interface.getPendingScheduledTaskIDs()));
-        System.out.println(Arrays.toString(Interface.getPendingScheduledTaskIntervals()));
-    }
-
     public static boolean start() {
         return (new ClassiCubeJavaLoaderBridge()).run();
     }
@@ -48,32 +36,8 @@ public boolean run() {
         }
         PluginManager.getInstance().loadPlugins();
         int loaded = PluginManager.getInstance().getPluginCount();
-        ClassiCubeJavaLoaderBridge.getInstance()
-                .addChatMessage("Initialized " + loaded + " Java plugin" + (loaded != 1 ? "s" : ""));
+        Chat.add("Initialized " + loaded + " Java plugin" + (loaded != 1 ? "s" : ""));
 
         return true;
     }
-
-    public void addChatMessage(String message) {
-        Objects.requireNonNull(message);
-
-        synchronized (pendingChatMessages) {
-            pendingChatMessages.add(message);
-        }
-    }
-
-    public String[] getPendingChatMessages() {
-        return getPendingChatMessages(true);
-    }
-
-    public String[] getPendingChatMessages(boolean reset) {
-        String[] messages;
-        synchronized (pendingChatMessages) {
-            messages = pendingChatMessages.toArray(new String[0]);
-
-            if (reset) pendingChatMessages.clear();
-        }
-
-        return messages;
-    }
 }

ClassiCubeJavaLoaderBridge/src/main/java/ru/deewend/ccjlbridge/gameapi/Chat.java

@@ -1,10 +1,37 @@
 package ru.deewend.ccjlbridge.gameapi;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
 public class Chat {
+    private static final List<String> PENDING_CHAT_MESSAGES = new ArrayList<>();
+
     private Chat() {
     }
 
     public static void add(String message) {
-        throw new UnsupportedOperationException();
+        Objects.requireNonNull(message);
+
+        synchronized (PENDING_CHAT_MESSAGES) {
+            PENDING_CHAT_MESSAGES.add(message);
+        }
+    }
+
+    // not meant to be called by plugins
+    public static String[] getPendingChatMessages() {
+        return getPendingChatMessages(true);
+    }
+
+    // not meant to be called by plugins, especially if reset is set to true
+    public static String[] getPendingChatMessages(boolean reset) {
+        String[] messages;
+        synchronized (PENDING_CHAT_MESSAGES) {
+            messages = PENDING_CHAT_MESSAGES.toArray(new String[0]);
+
+            if (reset) PENDING_CHAT_MESSAGES.clear();
+        }
+
+        return messages;
     }
 }