more changes

4 files changed, 46 insertions, 4 deletions

diff --git a/common/src/main/java/de/hype/bbsentials/common/client/Config.java b/common/src/main/java/de/hype/bbsentials/common/client/Config.java
index ddbe890..d82e238 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/Config.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/Config.java
@@ -3,6 +3,7 @@ package de.hype.bbsentials.common.client;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import de.hype.bbsentials.common.chat.Sender;
+import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
 
 import java.io.*;
 import java.time.LocalDate;
@@ -50,7 +51,7 @@ public class Config implements Serializable {
 
     // Set default attribute values
     private void setDefaults() {
-        username = MCUtils.getUsername();
+        username = EnvironmentCore.mcUtils.getUsername();
         acceptReparty = true;
         if (username.equals("Hype_the_Time")) {
             nickname = "Hype";
@@ -66,7 +67,7 @@ public class Config implements Serializable {
     // Gson object for serialization
     private final transient Gson GSON = new GsonBuilder().setPrettyPrinting().create();
     // File object for storing the config
-    private final transient File CONFIG_FILE = new File(MCUtils.getConfigPath(), "BBsential_settings.json");
+    private final transient File CONFIG_FILE = new File(EnvironmentCore.mcUtils.getConfigPath(), "BBsential_settings.json");
 
     // Constructor
     public Config() {
@@ -76,7 +77,7 @@ public class Config implements Serializable {
     // Load the config from file
     public static Config load() {
         Config settings;
-        File CONFIG_FILE = new File(MCUtils.getConfigPath(), "BBsential_settings.json");
+        File CONFIG_FILE = new File(EnvironmentCore.mcUtils.getConfigPath(), "BBsential_settings.json");
         Gson GSON = new GsonBuilder().setPrettyPrinting().create();
         if (CONFIG_FILE.exists()) {
             try (FileReader reader = new FileReader(CONFIG_FILE)) {
@@ -93,7 +94,7 @@ public class Config implements Serializable {
         }
         else {
             settings = new Config(); // Use default values if the file doesn't exist
-            settings.username = MCUtils.getUsername();
+            settings.username = EnvironmentCore.mcUtils.getUsername();
         }
         if (!settings.hasBBRoles("dev")) {
             settings.detailedDevMode = false;
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/Chat.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/Chat.java
new file mode 100644
index 0000000..1c62c87
--- /dev/null
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/Chat.java
@@ -0,0 +1,5 @@
+package de.hype.bbsentials.common.mclibraries;
+
+public interface Chat {
+    void init();
+}
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java
new file mode 100644
index 0000000..53f7c2b
--- /dev/null
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java
@@ -0,0 +1,13 @@
+package de.hype.bbsentials.common.mclibraries;
+
+public class EnvironmentCore {
+    public static BBUtils utils;
+    public static Chat chat;
+    public static MCUtils mcUtils;
+
+    public EnvironmentCore(BBUtils utils, Chat chat, MCUtils mcUtils) {
+        EnvironmentCore.utils = utils;
+        EnvironmentCore.chat = chat;
+        EnvironmentCore.mcUtils = mcUtils;
+    }
+}
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java
new file mode 100644
index 0000000..d86f7d8
--- /dev/null
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java
@@ -0,0 +1,23 @@
+package de.hype.bbsentials.common.mclibraries;
+
+import de.hype.bbsentials.common.chat.Message;
+
+import java.io.File;
+
+public interface MCUtils {
+    boolean isWindowFocused();
+
+    File getConfigPath();
+
+    String getUsername();
+
+    String getMCUUID();
+
+    void sendChatMessage(String message);
+
+    void playsound(String eventName);
+
+    void sendClientSideMessage(Message message);
+
+    int getPotTime();
+}