preperations to have a common code and different implementations for forge and fabric to ease up maintaining both versions

80 files changed, 656 insertions, 420 deletions

diff --git a/build.gradle b/common/build.gradle
index 49c5e5c..3aaffbf 100644
--- a/build.gradle
+++ b/common/build.gradle
@@ -16,15 +16,12 @@ repositories {
     // See https://docs.gradle.org/current/userguide/declaring_repositories.html
     // for more information about repositories.
 }
-
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
     modImplementation 'com.terraformersmc:modmenu:8.0.0'
-    //https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/7.2.2/modmenu-7.2.2.pom
-    // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
     modApi("me.shedaniel.cloth:cloth-config-fabric:12.0.109") {
         exclude(group: "net.fabricmc.fabric-api")
@@ -94,4 +91,4 @@ publishing {
         // The repositories here will be used for publishing your artifact, not for
         // retrieving dependencies.
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/de/hype/bbsentials/api/Discord.java b/common/src/main/java/de/hype/bbsentials/common/api/Discord.java
index 3f47439..6b2f468 100644
--- a/src/main/java/de/hype/bbsentials/api/Discord.java
+++ b/common/src/main/java/de/hype/bbsentials/common/api/Discord.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.api;
+package de.hype.bbsentials.common.api;
 
-import de.hype.bbsentials.chat.Chat;
-import de.hype.bbsentials.client.BBsentials;
+import de.hype.bbsentials.common.chat.Chat;
+import de.hype.bbsentials.common.client.BBsentials;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
diff --git a/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java b/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java
new file mode 100644
index 0000000..c8702d4
--- /dev/null
+++ b/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java
@@ -0,0 +1,36 @@
+package de.hype.bbsentials.common.api;
+
+public enum Formatting{
+    BLACK("§0"),
+    DARK_BLUE("§1"),
+    DARK_GREEN("§2"),
+    DARK_AQUA("§3"),
+    DARK_RED("§4"),
+    DARK_PURPLE("§5"),
+    GOLD("§6"),
+    GRAY("§7"),
+    DARK_GRAY("§8"),
+    BLUE("§9"),
+    GREEN("§a"),
+    AQUA("§b"),
+    RED("§c"),
+    LIGHT_PURPLE("§d"),
+    YELLOW("§e"),
+    BOLD("§l"),
+    ITALIC("§o"),
+    UNDERLINE("§n"),
+    STRIKETHROUGH("§m"),
+    RESET("§r"),
+    WHITE("§f");
+
+    private final String code;
+
+    Formatting(String code) {
+        this.code = code;
+    }
+
+    @Override
+    public String toString() {
+        return code;
+    }
+}
diff --git a/src/main/java/de/hype/bbsentials/api/ISimpleOption.java b/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java
index c6e1158..28808d9 100644
--- a/src/main/java/de/hype/bbsentials/api/ISimpleOption.java
+++ b/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.api;
+package de.hype.bbsentials.common.api;
 
 public interface ISimpleOption {
     void set(Object value);
diff --git a/src/main/java/de/hype/bbsentials/chat/Chat.java b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java
index ac5f892..1d7aef1 100644
--- a/src/main/java/de/hype/bbsentials/chat/Chat.java
+++ b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java
@@ -1,13 +1,10 @@
-package de.hype.bbsentials.chat;
-
-import de.hype.bbsentials.client.BBsentials;
-import de.hype.bbsentials.client.Config;
-import de.hype.bbsentials.packets.packets.SplashUpdatePacket;
-import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
-import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
-import net.minecraft.client.MinecraftClient;
+package de.hype.bbsentials.common.chat;
+
+import de.hype.bbsentials.common.api.Formatting;
+import de.hype.bbsentials.common.client.BBsentials;
+import de.hype.bbsentials.common.client.Config;
+import de.hype.bbsentials.common.packets.packets.SplashUpdatePacket;
 import net.minecraft.text.Text;
-import net.minecraft.util.Formatting;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
@@ -25,12 +22,9 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static de.hype.bbsentials.client.BBsentials.*;
+import static de.hype.bbsentials.common.client.BBsentials.*;
 
 public class Chat {
-    public Chat() {
-        init();
-    }
 
     public static String[] getVariableInfo(String packageName, String className) {
         List<String> variableInfoList = new ArrayList<>();
@@ -123,25 +117,12 @@ public class Chat {
         sendPrivateMessageToSelfSuccess("The variable " + field.getName() + " is: " + field.get(object));
     }
 
-    private void init() {
-        // Register a callback for a custom message type
-        ClientReceiveMessageEvents.CHAT.register((message, signedMessage, sender, params, receptionTimestamp) -> {
-            onEvent(message);
-        });
-        ClientReceiveMessageEvents.MODIFY_GAME.register((message, overlay) -> (onEvent(message)));
-        ClientSendMessageEvents.CHAT.register(message -> {
-            if (message.startsWith("/")) {
-                System.out.println("Sent command: " + message);
-            }
-        });
-    }
-
-    private Text onEvent(Text text) {
+    public Message onEvent(Message text) {
         if (!isSpam(text.toString())) {
             if (getConfig().isDetailedDevModeEnabled()) {
-                System.out.println("got a message: " + Text.Serializer.toJson(text));
+                System.out.println("got a message: " + text.getJson());
             }
-            Message message = new Message(text);
+            Message message = new Message(text.toString(),text.getString());
             executionService.execute(() -> processThreaded(message));
             return processNotThreaded(message);
         }
@@ -149,7 +130,7 @@ public class Chat {
     }
 
     //Handle in the messages which need to be modified here
-    public Text processNotThreaded(Message message) {
+    public Message processNotThreaded(Message message) {
 //        if (message.isFromParty()) {
 //           message.replaceInJson("\"action\":\"run_command\",\"value\":\"/viewprofile", "\"action\":\"run_command\",\"value\":\"/bviewprofile " + messageUnformatted.split(">", 1)[1].trim());
 //        }
@@ -168,7 +149,7 @@ public class Chat {
             message.replaceInJson("/socialoptions " + message.getPlayerName(), "/socialoptions sb " + message.getPlayerName() + " " + message.getUnformattedString());
         }
 
-        return message.text;
+        return message;
     }
 
     public void processThreaded(Message message) {
@@ -178,9 +159,9 @@ public class Chat {
             if (message.isFromReportedUser()) {
 
             }
-            else if (!MinecraftClient.getInstance().isWindowFocused()) {
+            else if (!MCUtils.isWindowFocused()) {
                 if (config.doDesktopNotifications) {
-                    if ((messageUnformatted.endsWith("is visiting Your Garden !") || messageUnformatted.endsWith("is visiting Your Island !")) && !MinecraftClient.getInstance().isWindowFocused() && config.doDesktopNotifications) {
+                    if ((messageUnformatted.endsWith("is visiting Your Garden !") || messageUnformatted.endsWith("is visiting Your Island !")) && !MCUtils.isWindowFocused() && config.doDesktopNotifications) {
                         sendNotification("BBsentials Visit-Watcher", messageUnformatted);
                     }
                     else if (message.isMsg()) {
@@ -210,7 +191,7 @@ public class Chat {
                             }
                         }
                     }
-                    if (!MinecraftClient.getInstance().isWindowFocused()) {
+                    if (!MCUtils.isWindowFocused()) {
                         sendNotification("BBsentials Party Notifier", "You got invited too a party by: " + username);
                     }
                 }
@@ -288,7 +269,7 @@ public class Chat {
             }
             else {
                 if (message.contains("[OPEN MENU]") || message.contains("[YES]")) {
-                    setChatPromtId(message.getText().toString());
+                    setChatPromtId(message.getJson());
                 }
             }
         }
@@ -338,17 +319,11 @@ public class Chat {
     }
 
     private static void sendPrivateMessageToSelfBase(String message) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client.player != null) {
-            client.player.sendMessage(Text.of(Formatting.RED + message));
-        }
+        MCUtils.sendClientSideMessage(Message.of(message));
     }
 
-    public static void sendPrivateMessageToSelfText(Text message) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        if (client.player != null) {
-            client.player.sendMessage(message);
-        }
+    public static void sendPrivateMessageToSelfText(Message message) {
+        MCUtils.sendClientSideMessage(message);
     }
 
     public static void sendCommand(String s) {
diff --git a/src/main/java/de/hype/bbsentials/chat/Message.java b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java
index 42d1b2e..506146f 100644
--- a/src/main/java/de/hype/bbsentials/chat/Message.java
+++ b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java
@@ -1,28 +1,32 @@
-package de.hype.bbsentials.chat;