more changes

100 files changed, 2345 insertions, 252 deletions

diff --git a/common/src/main/java/de/hype/bbsentials/common/api/Discord.java b/common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java
index 6b2f468..0093305 100644
--- a/common/src/main/java/de/hype/bbsentials/common/api/Discord.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.api;
+package de.hype.bbsentials.forge.common.api;
 
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.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/forge/common/api/Formatting.java
index c8702d4..9118533 100644
--- a/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/api/Formatting.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.api;
+package de.hype.bbsentials.forge.common.api;
 
 public enum Formatting{
     BLACK("§0"),
diff --git a/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java b/common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java
index 28808d9..fcaf70e 100644
--- a/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.api;
+package de.hype.bbsentials.forge.common.api;
 
 public interface ISimpleOption {
     void set(Object value);
diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java
index 7f450bb..a9562ef 100644
--- a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.common.chat;
+package de.hype.bbsentials.forge.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.mclibraries.EnvironmentCore;
-import de.hype.bbsentials.common.packets.packets.SplashUpdatePacket;
+import de.hype.bbsentials.forge.common.api.Formatting;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.Config;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.packets.packets.SplashUpdatePacket;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
@@ -22,8 +22,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static de.hype.bbsentials.common.client.BBsentials.*;
-
 public class Chat {
 
     public static String[] getVariableInfo(String packageName, String className) {
@@ -119,11 +117,11 @@ public class Chat {
 
     public Message onEvent(Message text) {
         if (!isSpam(text.toString())) {
-            if (getConfig().isDetailedDevModeEnabled()) {
+            if (BBsentials.getConfig().isDetailedDevModeEnabled()) {
                 System.out.println("got a message: " + text.getJson());
             }
             Message message = new Message(text.toString(),text.getString());
-            executionService.execute(() -> processThreaded(message));
+            BBsentials.executionService.execute(() -> processThreaded(message));
             return processNotThreaded(message);
         }
         return text; // Return the original message if it is spam
@@ -138,13 +136,13 @@ public class Chat {
             sendPrivateMessageToSelfBase(Formatting.RED + "B: " + message.getUnformattedString());
             return null;
         }
-        if (config.doPartyChatCustomMenu && message.isFromParty()) {
+        if (BBsentials.config.doPartyChatCustomMenu && message.isFromParty()) {
             message.replaceInJson("/viewprofile \\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", "/socialoptions party " + message.getPlayerName() + " " + message.getUnformattedString());
         }
-        else if (config.doGuildChatCustomMenu && message.isFromGuild()) {
+        else if (BBsentials.config.doGuildChatCustomMenu && message.isFromGuild()) {
             message.replaceInJson("/viewprofile \\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", "/socialoptions guild " + message.getPlayerName() + " " + message.getUnformattedString());
         }
-        else if (config.doAllChatCustomMenu) {
+        else if (BBsentials.config.doAllChatCustomMenu) {
             System.out.println("User: '" + message.getPlayerName() + "' | Message: " + message.getUnformattedString());
             message.replaceInJson("/socialoptions " + message.getPlayerName(), "/socialoptions sb " + message.getPlayerName() + " " + message.getUnformattedString());
         }
@@ -160,18 +158,18 @@ public class Chat {
 
             }
             else if (!EnvironmentCore.mcUtils.isWindowFocused()) {
-                if (config.doDesktopNotifications) {
-                    if ((messageUnformatted.endsWith("is visiting Your Garden !") || messageUnformatted.endsWith("is visiting Your Island !")) && !EnvironmentCore.mcUtils.isWindowFocused() && config.doDesktopNotifications) {
+                if (BBsentials.config.doDesktopNotifications) {
+                    if ((messageUnformatted.endsWith("is visiting Your Garden !") || messageUnformatted.endsWith("is visiting Your Island !")) && !EnvironmentCore.mcUtils.isWindowFocused() && BBsentials.config.doDesktopNotifications) {
                         sendNotification("BBsentials Visit-Watcher", messageUnformatted);
                     }
                     else if (message.isMsg()) {
                         sendNotification("BBsentials Message Notifier", username + " sent you the following message: " + message.getMessageContent());
                     }
-                    if (message.getMessageContent().toLowerCase().contains(getConfig().getUsername().toLowerCase()) || (message.getMessageContent().toLowerCase().contains(getConfig().getNickname().toLowerCase() + " ") && getConfig().getNotifForParty().toLowerCase().equals("nick")) || getConfig().getNotifForParty().toLowerCase().equals("all")) {
+                    if (message.getMessageContent().toLowerCase().contains(BBsentials.getConfig().getUsername().toLowerCase()) || (message.getMessageContent().toLowerCase().contains(BBsentials.getConfig().getNickname().toLowerCase() + " ") && BBsentials.getConfig().getNotifForParty().toLowerCase().equals("nick")) || BBsentials.getConfig().getNotifForParty().toLowerCase().equals("all")) {
                         sendNotification("BBsentials Party Chat Notification", username + " : " + message.getMessageContent());
                     }
                     else {
-                        if (message.getMessageContent().toLowerCase().contains(getConfig().getUsername().toLowerCase()) || message.getMessageContent().toLowerCase().contains(config.getNickname().toLowerCase() + " ")) {
+                        if (message.getMessageContent().toLowerCase().contains(BBsentials.getConfig().getUsername().toLowerCase()) || message.getMessageContent().toLowerCase().contains(BBsentials.config.getNickname().toLowerCase() + " ")) {
                             sendNotification("BBsentials Notifier", "You got mentioned in chat! " + message.getMessageContent());
                         }
                     }
@@ -185,7 +183,7 @@ public class Chat {
                 else if (message.contains("invited you to join their party")) {
                     if (lastPartyDisbandedUsername != null && partyDisbandedMap != null) {
                         Instant lastDisbandedInstant = partyDisbandedMap.get(lastPartyDisbandedUsername);
-                        if (config.acceptReparty) {
+                        if (BBsentials.config.acceptReparty) {
                             if (lastDisbandedInstant != null && lastDisbandedInstant.isAfter(Instant.now().minusSeconds(20)) && (username.equals(lastPartyDisbandedUsername))) {
                                 sendCommand("/p accept " + username);
                             }
@@ -221,14 +219,14 @@ public class Chat {
                         Config.partyMembers.add(temp);
                     }
                 }
-                else if ((message.contains("Party Leader:") && !message.contains(getConfig().getUsername())) || message.equals("You are not currently in a party.") || (message.contains("warped the party into a Skyblock Dungeon") && !message.startsWith(getConfig().getUsername()) || (!message.startsWith("The party was transferred to " + getConfig().getUsername()) && message.startsWith("The party was transferred to"))) || messageUnformatted.endsWith(getConfig().getUsername() + " is now a Party Moderator") || (message.startsWith("The party was disbanded")) || (message.contains("You have joined ") && message.contains("'s party!")) || (message.contains("Party Leader, ") && message.contains(" , summoned you to their server.")) || (message.contains("warped to your dungeon"))) {
+                else if ((message.contains("Party Leader:") && !message.contains(BBsentials.getConfig().getUsername())) || message.equals("You are not currently in a party.") || (message.contains("warped the party into a Skyblock Dungeon") && !message.startsWith(BBsentials.getConfig().getUsername()) || (!message.startsWith("The party was transferred to " + BBsentials.getConfig().getUsername()) && message.startsWith("The party was transferred to"))) || messageUnformatted.endsWith(BBsentials.getConfig().getUsername() + " is now a Party Moderator") || (message.startsWith("The party was disbanded")) || (message.contains("You have joined ") && message.contains("'s party!")) || (message.contains("Party Leader, ") && message.contains(" , summoned you to their server.")) || (message.contains("warped to your dungeon"))) {
                     BBsentials.getConfig().setIsLeader(false);
-                    if (getConfig().isDetailedDevModeEnabled()) {
-                        sendPrivateMessageToSelfDebug("Leader: " + getConfig().isLeader());
+                    if (BBsentials.getConfig().isDetailedDevModeEnabled()) {
+                        sendPrivateMessageToSelfDebug("Leader: " + BBsentials.getConfig().isLeader());
                     }
                 }
-                else if (config.getPlayersInParty().length == 0 && messageUnformatted.endsWith("to the party! They have 60 seconds to accept")) {
-                    config.setIsLeader(true);
+                else if (BBsentials.config.getPlayersInParty().length == 0 && messageUnformatted.endsWith("to the party! They have 60 seconds to accept")) {
+                    BBsentials.config.setIsLeader(true);
                 }
                 else if (messageUnformatted.startsWith("You'll be partying with:")) {
                     List<String> members = new ArrayList<>();
@@ -238,18 +236,18 @@ public class Chat {
                     }
                     Config.partyMembers=members;
                 }
-                else if (((messageUnformatted.startsWith("Party Leader: ") && messageUnformatted.endsWith(getConfig().getUsername() + " ●"))) || (message.contains(getConfig().getUsername() + " warped the party to a SkyBlock dungeon!")) || message.startsWith("The party was transferred to " + getConfig().getUsername()) || message.getUnformattedString().endsWith(" has promoted " + getConfig().getUsername() + " to Party Leader") || (message.contains("warped to your dungeon"))) {
+                else if (((messageUnformatted.startsWith("Party Leader: ") && messageUnformatted.endsWith(BBsentials.getConfig().getUsername() + " ●"))) || (message.contains(BBsentials.getConfig().getUsername() + " warped the party to a SkyBlock dungeon!")) || message.startsWith("The party was transferred to " + BBsentials.getConfig().getUsername()) || message.getUnformattedString().endsWith(" has promoted " + BBsentials.getConfig().getUsername() + " to Party Leader") || (message.contains("warped to your dungeon"))) {
                     BBsentials.getConfig().setIsLeader(true);
-                    if (getConfig().isDetailedDevModeEnabled()) {
-                        sendPrivateMessageToSelfDebug("Leader: " + getConfig().isLeader());
+                    if (BBsentials.getConfig().isDetailedDevModeEnabled()) {
+                        sendPrivateMessageToSelfDebug("Leader: " + BBsentials.getConfig().isLeader());
                     }
                 }
                 else if (message.getUnformattedString().equals("Please type /report confirm to log your report for staff review.")) {
                     sendCommand("/report confirm");
                 }
                 else if (messageUnformatted.startsWith("BUFF! You splashed yourself with")) {
-                    if (splashStatusUpdateListener != null) {
-                        splashStatusUpdateListener.setStatus(SplashUpdatePacket.STATUS_SPLASHING);
+                    if (BBsentials.splashStatusUpdateListener != null) {
+                        BBsentials.splashStatusUpdateListener.setStatus(SplashUpdatePacket.STATUS_SPLASHING);
                     }
                 }
             }
@@ -329,11 +327,11 @@ public class Chat {
     }
 
     public static void sendCommand(String s) {
-        getConfig().sender.addSendTask(s);
+        BBsentials.getConfig().sender.addSendTask(s);
     }
 
     public void sendNotification(String title, String text) {
-        executionService.execute(() -> {
+        BBsentials.executionService.execute(() -> {
             try {
                 InputStream inputStream = getClass().getResourceAsStream("/sounds/mixkit-sci-fi-confirmation-914.wav");
                 AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(inputStream);
@@ -382,7 +380,7 @@ public class Chat {
                 public void run() {
                     String promptCommand = "/cb " + finalLastPrompt1;
                     BBsentials.getConfig().setLastChatPromptAnswer(promptCommand);
-                    if (config.isDevModeEnabled()) {
+                    if (BBsentials.config.isDevModeEnabled()) {
                         Chat.sendPrivateMessageToSelfDebug("set the last prompt action too + \"" + promptCommand + "\"");
                     }
                     try {
@@ -402,8 +400,8 @@ public class Chat {
                 @Override
                 public void run() {
                     String promptCommand = "/chatprompt " + finalLastPrompt + " YES";
-                    getConfig().setLastChatPromptAnswer(promptCommand);
-                    if (config.isDevModeEnabled()) {
+                    BBsentials.getConfig().setLastChatPromptAnswer(promptCommand);
+                    if (BBsentials.config.isDevModeEnabled()) {
                         Chat.sendPrivateMessageToSelfDebug("set the last prompt action too + \"" + promptCommand + "\"");
                     }
                     try {
@@ -411,7 +409,7 @@ public class Chat {
                     } catch (InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    getConfig().setLastChatPromptAnswer(null);
+                    BBsentials.getConfig().setLastChatPromptAnswer(null);
                     return;
                 }
             }).start();
diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Message.java b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Message.java
index 66a3599..5c5769b 100644
--- a/common/src/main/java/de/hype/bbsentials/common/chat/Message.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Message.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.chat;
+package de.hype.bbsentials.forge.common.chat;
 
-import de.hype.bbsentials.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.BBsentials;
 
 public class Message {
     private String text;
diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Sender.java
index 9bdde1f..742c18a 100644
--- a/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Sender.java
@@ -1,13 +1,13 @@
-package de.hype.bbsentials.common.chat;
+package de.hype.bbsentials.forge.common.chat;
 
-import de.hype.bbsentials.common.api.Formatting;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.api.Formatting;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static de.hype.bbsentials.common.chat.Chat.sendPrivateMessageToSelfInfo;
-import static de.hype.bbsentials.common.chat.Chat.sendPrivateMessageToSelfText;
+import static de.hype.bbsentials.forge.common.chat.Chat.sendPrivateMessageToSelfInfo;
+import static de.hype.bbsentials.forge.common.chat.Chat.sendPrivateMessageToSelfText;
 
 public class Sender {
     private final List<String> sendQueue;
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/BBsentials.java
index b694add..24ef170 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/BBsentials.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.common.client;
 
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.client.Commands.Commands;
-import de.hype.bbsentials.common.communication.BBsentialConnection;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.client.Commands.Commands;
+import de.hype.bbsentials.forge.common.communication.BBsentialConnection;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/Commands/Commands.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/Commands/Commands.java
index deb4dda..804e816 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/Commands/Commands.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/Commands/Commands.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.common.client.Commands;
+package de.hype.bbsentials.forge.common.client.Commands;
 
-import de.hype.bbsentials.common.client.Config;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.client.Config;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
 
-import static de.hype.bbsentials.common.client.BBsentials.getConfig;
+import static de.hype.bbsentials.forge.common.client.BBsentials.getConfig;
 public class Commands {
     public Commands() {
         EnvironmentCore.commands.registerMain();
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/Config.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/Config.java
index a23fe62..abe7e23 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/Config.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/Config.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.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 de.hype.bbsentials.forge.common.chat.Sender;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
 
 import java.io.*;
 import java.time.LocalDate;
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/CustomGson.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/CustomGson.java
index 31f2626..71870c8 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/CustomGson.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/CustomGson.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.common.client;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/DebugThread.java
index d51fcec..db2b692 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/DebugThread.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.common.client;
 
 
 import java.util.List;
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/SplashManager.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashManager.java
index 5d7d464..7495559 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/SplashManager.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashManager.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.common.client;
 
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
-import de.hype.bbsentials.common.packets.packets.SplashNotifyPacket;
-import de.hype.bbsentials.common.packets.packets.SplashUpdatePacket;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.packets.packets.SplashNotifyPacket;
+import de.hype.bbsentials.forge.common.packets.packets.SplashUpdatePacket;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/SplashStatusUpdateListener.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashStatusUpdateListener.java
index 5ea2384..8054818 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/SplashStatusUpdateListener.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashStatusUpdateListener.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.common.client;
 
-import de.hype.bbsentials.common.communication.BBsentialConnection;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
-import de.hype.bbsentials.common.packets.packets.SplashNotifyPacket;
-import de.hype.bbsentials.common.packets.packets.SplashUpdatePacket;
+import de.hype.bbsentials.forge.common.communication.BBsentialConnection;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.packets.packets.SplashNotifyPacket;
+import de.hype.bbsentials.forge.common.packets.packets.SplashUpdatePacket;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/ToDisplayConfig.java b/common/src/main/java/de/hype/bbsentials/forge/common/client/ToDisplayConfig.java
index 8e8998c..603fccb 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/ToDisplayConfig.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/client/ToDisplayConfig.java
@@ -1,8 +1,8 @@
-package de.hype.bbsentials.common.client;
+package de.hype.bbsentials.forge.common.client;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java b/common/src/main/java/de/hype/bbsentials/forge/common/communication/BBsentialConnection.java
index 76ee4bd..1603a24 100644
--- a/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/communication/BBsentialConnection.java
@@ -1,16 +1,16 @@
-package de.hype.bbsentials.common.communication;
-
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.chat.Message;
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.client.SplashManager;
-import de.hype.bbsentials.common.client.SplashStatusUpdateListener;
-import de.hype.bbsentials.common.constants.enviromentShared.*;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
-import de.hype.bbsentials.common.packets.AbstractPacket;
-import de.hype.bbsentials.common.packets.PacketManager;
-import de.hype.bbsentials.common.packets.PacketUtils;
-import de.hype.bbsentials.common.packets.packets.*;
+package de.hype.bbsentials.forge.common.communication;
+
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.chat.Message;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.SplashManager;
+import de.hype.bbsentials.forge.common.client.SplashStatusUpdateListener;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.*;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.PacketManager;
+import de.hype.bbsentials.forge.common.packets.PacketUtils;
+import de.hype.bbsentials.forge.common.packets.packets.*;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProvider.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProvider.java
index ca3aa36..7728b99 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProvider.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProvider.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.constants;
+package de.hype.bbsentials.forge.common.constants;
 
 public interface BBDisplayNameProvider {
     String getDisplayName();
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProviderWithCustom.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProviderWithCustom.java
index 43cb5ac..c1508c3 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProviderWithCustom.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProviderWithCustom.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.constants;
+package de.hype.bbsentials.forge.common.constants;
 
 public interface BBDisplayNameProviderWithCustom<T extends Enum<T>> extends BBDisplayNameProvider {
     T setDisplayName(String displayname);
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/AuthenticationConstants.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/AuthenticationConstants.java
index 52f1ea1..cbb1bc0 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/AuthenticationConstants.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/AuthenticationConstants.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
 public class AuthenticationConstants {
     //Authentication Types
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItem.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItem.java
index b937367..8c1cf20 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItem.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItem.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
 public class ChChestItem {
     private String displayName;
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItems.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItems.java
index 0a12742..0301356 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItems.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItems.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/EnumUtils.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/EnumUtils.java
index 5214f65..3664d4f 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/EnumUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/EnumUtils.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
-import de.hype.bbsentials.common.constants.BBDisplayNameProvider;
-import de.hype.bbsentials.common.constants.BBDisplayNameProviderWithCustom;
+import de.hype.bbsentials.forge.common.constants.BBDisplayNameProvider;
+import de.hype.bbsentials.forge.common.constants.BBDisplayNameProviderWithCustom;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/InternalReasonConstants.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/InternalReasonConstants.java
index 43835c6..35b710e 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/InternalReasonConstants.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/InternalReasonConstants.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
 public enum InternalReasonConstants {
     INVALID_PARAMETER,
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/Islands.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/Islands.java
index e2e914c..6a1e5f1 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/Islands.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/Islands.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
-import de.hype.bbsentials.common.constants.BBDisplayNameProvider;
+import de.hype.bbsentials.forge.common.constants.BBDisplayNameProvider;
 
 public enum Islands implements BBDisplayNameProvider {
     CRYSTAL_HOLLOWS("crystal_hollows", "Crystal Hollows"),
diff --git a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/MiningEvents.java b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/MiningEvents.java
index 5f6e99e..c6baf87 100644
--- a/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/MiningEvents.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/MiningEvents.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.constants.enviromentShared;
+package de.hype.bbsentials.forge.common.constants.enviromentShared;
 
-import de.hype.bbsentials.common.constants.BBDisplayNameProvider;
+import de.hype.bbsentials.forge.common.constants.BBDisplayNameProvider;
 
 // Mining Events
 public enum MiningEvents implements BBDisplayNameProvider {
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/BBUtils.java b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/BBUtils.java
index b2c9559..1c7f1b4 100644
--- a/common/src/main/java/de/hype/bbsentials/common/mclibraries/BBUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/BBUtils.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.mclibraries;
+package de.hype.bbsentials.forge.common.mclibraries;
 
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
 
 import java.util.List;
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/EnvironmentCore.java
index f7e2eab..377c25b 100644
--- a/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/EnvironmentCore.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.mclibraries;
+package de.hype.bbsentials.forge.common.mclibraries;
 
 
-import de.hype.bbsentials.common.client.DebugThread;
+import de.hype.bbsentials.forge.common.client.DebugThread;
 
 public class EnvironmentCore {
     public static MCCommand commands;
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCChat.java b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCChat.java
index eeb89fe..c4abda0 100644
--- a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCChat.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCChat.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.mclibraries;
+package de.hype.bbsentials.forge.common.mclibraries;
 
-import de.hype.bbsentials.common.chat.Message;
+import de.hype.bbsentials.forge.common.chat.Message;
 
 public interface MCChat {
     void init();
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCCommand.java b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCCommand.java
index 133cff0..a82fb86 100644
--- a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCCommand.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCCommand.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.mclibraries;
+package de.hype.bbsentials.forge.common.mclibraries;
 
 public interface MCCommand {
     public void registerMain();
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCUtils.java
index 493785a..ab11bfc 100644
--- a/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCUtils.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.mclibraries;
+package de.hype.bbsentials.forge.common.mclibraries;
 
 import java.io.File;
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/mclibraries/Options.java b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/Options.java
index b5cb014..6d6f125 100644
--- a/common/src/main/java/de/hype/bbsentials/common/mclibraries/Options.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/Options.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.mclibraries;
+package de.hype.bbsentials.forge.common.mclibraries;
 
 public interface Options {
     void setFov(int value);
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/AbstractPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/AbstractPacket.java
index 7328517..7b2e74b 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/AbstractPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/AbstractPacket.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.common.packets;
+package de.hype.bbsentials.forge.common.packets;
 
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.client.Config;
-import de.hype.bbsentials.common.communication.BBsentialConnection;
-import de.hype.bbsentials.common.packets.packets.InvalidCommandFeedbackPacket;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.Config;
+import de.hype.bbsentials.forge.common.communication.BBsentialConnection;
+import de.hype.bbsentials.forge.common.packets.packets.InvalidCommandFeedbackPacket;
 
 import java.lang.reflect.Field;
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/EnviromentPacketConfig.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/EnviromentPacketConfig.java
index ee82d32..8d95998 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/EnviromentPacketConfig.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/EnviromentPacketConfig.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.packets;
+package de.hype.bbsentials.forge.common.packets;
 
 public class EnviromentPacketConfig {
     public static final String enviroment = "Client";
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/Packet.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/Packet.java
index f184578..0724cd2 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/Packet.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/Packet.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.packets;
+package de.hype.bbsentials.forge.common.packets;
 
 import java.util.function.Consumer;
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/PacketManager.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketManager.java
index 23368d8..2641f4a 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/PacketManager.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketManager.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets;
+package de.hype.bbsentials.forge.common.packets;
 
-import de.hype.bbsentials.common.communication.BBsentialConnection;
-import de.hype.bbsentials.common.packets.packets.*;
+import de.hype.bbsentials.forge.common.communication.BBsentialConnection;
+import de.hype.bbsentials.forge.common.packets.packets.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/PacketUtils.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketUtils.java
index bc5f9b0..7b9ade4 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/PacketUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketUtils.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.common.packets;
+package de.hype.bbsentials.forge.common.packets;
 
 import com.google.gson.Gson;
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.client.CustomGson;
-import de.hype.bbsentials.common.communication.BBsentialConnection;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.CustomGson;
+import de.hype.bbsentials.forge.common.communication.BBsentialConnection;
 
 import java.util.function.Consumer;
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/BingoChatMessagePacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BingoChatMessagePacket.java
index c7432da..cd2e945 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/BingoChatMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BingoChatMessagePacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class BingoChatMessagePacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/BroadcastMessagePacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BroadcastMessagePacket.java
index bbd6d90..88cf5cf 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/BroadcastMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BroadcastMessagePacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class BroadcastMessagePacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/ChChestPacket.java
index 7355397..9cd41f8 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/ChChestPacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.constants.enviromentShared.ChChestItem;
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.ChChestItem;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class ChChestPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisconnectPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisconnectPacket.java
index ca60a49..7b8782e 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisconnectPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisconnectPacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.constants.enviromentShared.InternalReasonConstants;
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.InternalReasonConstants;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class DisconnectPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisplayTellrawMessagePacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisplayTellrawMessagePacket.java
index e3e7f70..ab3ddf4 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisplayTellrawMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisplayTellrawMessagePacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class DisplayTellrawMessagePacket extends AbstractPacket {
     public final String rawJson;
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/InternalCommandPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InternalCommandPacket.java
index fb7a774..b1f7c25 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/InternalCommandPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InternalCommandPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 //Only used for small things which don't really need an own Packet.
 public class InternalCommandPacket extends AbstractPacket {
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/InvalidCommandFeedbackPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InvalidCommandFeedbackPacket.java
index 2f4510e..1394a11 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/InvalidCommandFeedbackPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InvalidCommandFeedbackPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class InvalidCommandFeedbackPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/MiningEventPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/MiningEventPacket.java
index 9d9be62..67a88da 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/MiningEventPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/MiningEventPacket.java
@@ -1,8 +1,8 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
-import de.hype.bbsentials.common.constants.enviromentShared.MiningEvents;
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.MiningEvents;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class MiningEventPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/PartyPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PartyPacket.java
index 48a36f4..b536d6d 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/PartyPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PartyPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class PartyPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/PunishUserPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PunishUserPacket.java
index dce052f..d807ad8 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/PunishUserPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PunishUserPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class PunishUserPacket extends AbstractPacket {
     public static final String PUNISHMENT_TYPE_BAN = "BAN";
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/RequestConnectPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/RequestConnectPacket.java
index 9ce468a..705e2f5 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/RequestConnectPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/RequestConnectPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class RequestConnectPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashNotifyPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashNotifyPacket.java
index 427e4f2..ad3e459 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashNotifyPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashNotifyPacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class SplashNotifyPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashUpdatePacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashUpdatePacket.java
index 9645daf..f0e306b 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashUpdatePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashUpdatePacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class SplashUpdatePacket extends AbstractPacket {
     public static final String STATUS_WAITING = "Waiting";
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/SystemMessagePacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SystemMessagePacket.java
index 13b92d4..3ec68c1 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/SystemMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SystemMessagePacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class SystemMessagePacket extends AbstractPacket {
     public final String message;
diff --git a/common/src/main/java/de/hype/bbsentials/common/packets/packets/WelcomeClientPacket.java b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/WelcomeClientPacket.java
index 00aa003..01e743d 100644
--- a/common/src/main/java/de/hype/bbsentials/common/packets/packets/WelcomeClientPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/WelcomeClientPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.common.packets.packets;
+package de.hype.bbsentials.forge.common.packets.packets;
 
-import de.hype.bbsentials.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
 
 public class WelcomeClientPacket extends AbstractPacket {
 
diff --git a/common/src/main/resources/bbsentials.mixins.json b/common/src/main/resources/bbsentials.mixins.json
deleted file mode 100644
index 4467110..0000000
--- a/common/src/main/resources/bbsentials.mixins.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "de.hype.bbsentials.mixins",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [],
-  "client": [
-    "de.hype.bbsentials.common.mixins.ClientCommandSourceMixin",
-    "de.hype.bbsentials.common.mixins.ItemRendererMixin",
-    "de.hype.bbsentials.common.mixins.ScreenMixin",
-    "de.hype.bbsentials.common.mixins.SimpleOptionMixin"
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
\ No newline at end of file
diff --git a/common/src/main/resources/fabric.mod.json b/common/src/main/resources/fabric.mod.json
deleted file mode 100644
index d296d7c..0000000
--- a/common/src/main/resources/fabric.mod.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "bbsentials",
-  "version": "${version}",
-  "name": "BBsentials",
-  "icon": "logo.png",
-  "description": "Mod to connect to the BBsentials Network for Splashes and more",
-  "authors": [
-    "Hype_the_Time/hackthetime"
-  ],
-  "contributors": ["hannibal2"],
-  "contact": {
-    "homepage": "https://github.com/HacktheTime/BBsentials1.20",
-    "issues": "https://github.com/HacktheTime/BBsentials1.20/issues",
-    "email": "s0844x76@duck.com",
-    "sources": "https://github.com/HacktheTime/BBsentials1.20"
-  },
-  "license": "Look on Github (Sources). a Modified \"CC BY-NC-ND 4.0\" License",
-  "environment": "client",
-  "entrypoints": {
-    "client": [
-      "de.hype.bbsentials.common.client.BBsentials"
-    ],
-    "modmenu": [
-      "de.hype.bbsentials.fabric.ModMenueScreen"
-    ]
-  },
-  "depends": {
-    "fabricloader": ">=${loader_version}",
-    "fabric": "*",
-    "minecraft": "${minecraft_version}"
-  },
-  "mixins": [
-    "bbsentials.mixins.json"
-  ],
-  "custom": {
-    "modmenu": {
-      "links": {
-        "License": "https://github.com/HacktheTime/BBsentials1.20/blob/master/LICENSE",
-        "modmenu.discord":"discord.gg/qr5mPRq8uG"
-      },
-      "update_checker": true
-    }
-  }
-}
\ No newline at end of file
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 4fa2a38..8200bfb 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -17,7 +17,7 @@ repositories {
     // for more information about repositories.
 }
 dependencies {
-    implementation project(path: ':common')
+    implementation project(":common")
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
@@ -76,7 +76,12 @@ jar {
                 'MixinConfigs': 'modid.mixin.json'
     }
 }
+task copyCustomJar(type: Copy) {
+    from jar // Specify the customJar task as the source
+    into project.projectDir // Set the destination directory (e.g., project root)
+}
 
+copyCustomJar.dependsOn jar
 // configure the maven publication
 publishing {
     publications {
@@ -92,4 +97,11 @@ publishing {
         // The repositories here will be used for publishing your artifact, not for
         // retrieving dependencies.
     }
-}
\ No newline at end of file
+}
+sourceSets {
+    main {
+        resources {
+            project(':common').sourceSets.main.resources.srcDirs
+        }
+    }
+}
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/BBUtils.java b/fabric/src/main/java/de/hype/bbsentials/fabric/BBUtils.java
index 5dca4ac..d0442cc 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/BBUtils.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/BBUtils.java
@@ -1,15 +1,15 @@
 package de.hype.bbsentials.fabric;
 
 import com.google.common.collect.Lists;
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.PlayerListEntry;
 
 import java.util.Iterator;
 import java.util.List;
 
-public class BBUtils implements de.hype.bbsentials.common.mclibraries.BBUtils {
+public class BBUtils implements de.hype.bbsentials.forge.common.mclibraries.BBUtils {
     public Islands getCurrentIsland() {
         try {
             String string = MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-b").getDisplayName().getString();
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/BBsentialsConfigScreemFactory.java b/fabric/src/main/java/de/hype/bbsentials/fabric/BBsentialsConfigScreemFactory.java
index a723284..64775db 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/BBsentialsConfigScreemFactory.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/BBsentialsConfigScreemFactory.java
@@ -1,7 +1,7 @@
 package de.hype.bbsentials.fabric;
 
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
 import me.shedaniel.clothconfig2.api.ConfigBuilder;
 import me.shedaniel.clothconfig2.api.ConfigCategory;
 import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java b/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java
index e23d76b..d4f1369 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java
@@ -3,14 +3,14 @@ package de.hype.bbsentials.fabric;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.constants.enviromentShared.ChChestItems;
-import de.hype.bbsentials.common.constants.enviromentShared.MiningEvents;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
-import de.hype.bbsentials.common.mclibraries.MCCommand;
-import de.hype.bbsentials.common.packets.AbstractPacket;
-import de.hype.bbsentials.common.packets.packets.*;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.ChChestItems;
+import de.hype.bbsentials.forge.common.constants.enviromentShared.MiningEvents;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.mclibraries.MCCommand;
+import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.forge.common.packets.packets.*;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java b/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
index 1752492..eaf4f61 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java
@@ -2,7 +2,7 @@ package de.hype.bbsentials.fabric;
 
 import java.util.List;
 
-public class DebugThread implements de.hype.bbsentials.common.client.DebugThread {
+public class DebugThread implements de.hype.bbsentials.forge.common.client.DebugThread {
     @Override
     public void loop() {
 
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/FabricChat.java b/fabric/src/main/java/de/hype/bbsentials/fabric/FabricChat.java
index 0244181..8e538a6 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/FabricChat.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/FabricChat.java
@@ -1,8 +1,8 @@
 package de.hype.bbsentials.fabric;
 
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.chat.Message;
-import de.hype.bbsentials.common.mclibraries.MCChat;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.chat.Message;
+import de.hype.bbsentials.forge.common.mclibraries.MCChat;
 import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
 import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
 import net.minecraft.client.MinecraftClient;
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/MCUtils.java b/fabric/src/main/java/de/hype/bbsentials/fabric/MCUtils.java
index 149b72a..5230f2e 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/MCUtils.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/MCUtils.java
@@ -10,7 +10,7 @@ import net.minecraft.util.Identifier;
 
 import java.io.File;
 
-public class MCUtils implements de.hype.bbsentials.common.mclibraries.MCUtils {
+public class MCUtils implements de.hype.bbsentials.forge.common.mclibraries.MCUtils {
     public boolean isWindowFocused() {
         return MinecraftClient.getInstance().isWindowFocused();
     }
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/ModInitialiser.java b/fabric/src/main/java/de/hype/bbsentials/fabric/ModInitialiser.java
index 2e7b4fe..7769582 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/ModInitialiser.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/ModInitialiser.java
@@ -1,11 +1,11 @@
 package de.hype.bbsentials.fabric;
 
 import com.mojang.brigadier.arguments.StringArgumentType;
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.chat.Message;
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.client.Config;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.chat.Message;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.Config;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
@@ -22,7 +22,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import static de.hype.bbsentials.common.client.BBsentials.*;
+import static de.hype.bbsentials.forge.common.client.BBsentials.*;
 
 public class ModInitialiser implements ClientModInitializer {
     @Override
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/Options.java b/fabric/src/main/java/de/hype/bbsentials/fabric/Options.java
index 3d7cbe3..4d519bb 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/Options.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/Options.java
@@ -1,9 +1,9 @@
 package de.hype.bbsentials.fabric;
 
-import de.hype.bbsentials.common.api.ISimpleOption;
+import de.hype.bbsentials.forge.common.api.ISimpleOption;
 import net.minecraft.client.MinecraftClient;
 
-public class Options implements de.hype.bbsentials.common.mclibraries.Options {
+public class Options implements de.hype.bbsentials.forge.common.mclibraries.Options {
     public void setFov(int value) {
         ((ISimpleOption) (Object) MinecraftClient.getInstance().options.getFov()).set(value);
     }
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ItemRendererMixin.java b/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ItemRendererMixin.java
index 0c6a2bb..2207c5a 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ItemRendererMixin.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ItemRendererMixin.java
@@ -1,6 +1,6 @@
 package de.hype.bbsentials.fabric.mixins;
 
-import de.hype.bbsentials.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.BBsentials;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.ItemRenderer;
diff --git a/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/SimpleOptionMixin.java b/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/SimpleOptionMixin.java
index 711ac09..64c90b2 100644
--- a/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/SimpleOptionMixin.java
+++ b/fabric/src/main/java/de/hype/bbsentials/fabric/mixins/SimpleOptionMixin.java
@@ -1,6 +1,6 @@
 package de.hype.bbsentials.fabric.mixins;
 
-import de.hype.bbsentials.common.api.ISimpleOption;
+import de.hype.bbsentials.forge.common.api.ISimpleOption;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.SimpleOption;
 import org.spongepowered.asm.mixin.Final;
diff --git a/fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png b/fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png
deleted file mode 100644
index 7929d1a..0000000
--- a/fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png
+++ /dev/null
diff --git a/fabric/src/main/resources/assets/public_bbsentials_cert.crt b/fabric/src/main/resources/assets/public_bbsentials_cert.crt
deleted file mode 100644
index 723fc34..0000000
--- a/fabric/src/main/resources/assets/public_bbsentials_cert.crt
+++ /dev/null
diff --git a/fabric/src/main/resources/logo.png b/fabric/src/main/resources/logo.png
deleted file mode 100644
index 407312a..0000000
--- a/fabric/src/main/resources/logo.png
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav b/fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav
deleted file mode 100644
index d079479..0000000
--- a/fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav b/fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav
deleted file mode 100644
index f118ac5..0000000
--- a/fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav b/fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav
deleted file mode 100644
index 4bed79a..0000000
--- a/fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav b/fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav
deleted file mode 100644
index 582445e..0000000
--- a/fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav b/fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav
deleted file mode 100644
index 37800c9..0000000
--- a/fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav
+++ /dev/null
diff --git a/forge/build.gradle b/forge/build.gradle
new file mode 100644
index 0000000..2b7af90
--- /dev/null
+++ b/forge/build.gradle
@@ -0,0 +1,127 @@
+plugins {
+    id("idea")
+    id("java")
+    id("gg.essential.loom") version "0.10.0.+"
+    id("dev.architectury.architectury-pack200") version "0.1.3"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("com.bnorm.power.kotlin-power-assert") version "0.13.0"
+}
+
+// Toolchains:
+java {
+    toolchain.languageVersion.set(JavaLanguageVersion.of(8))
+}
+
+// Minecraft configuration:
+loom {
+    log4jConfigs.from(file("log4j2.xml"))
+    launchConfigs {
+        "client" {
+            // If you don't want mixins, remove these lines
+            property("mixin.debug", "true")
+            property("asmhelper.verbose", "true")
+            arg("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker")
+            arg("--mixin", "mixins.$modid.json")
+        }
+    }
+    forge {
+        pack200Provider.set(dev.architectury.pack200.java.Pack200Adapter())
+        // If you don't want mixins, remove this lines
+        mixinConfig("mixins.bbsentials.json")
+    }
+    // If you don't want mixins, remove these lines
+    mixin {
+        defaultRefmapName.set("mixins.bbsentials.refmap.json")
+    }
+}
+
+sourceSets.main {
+    output.resourcesDir = file("$buildDir/classes/java/main")
+}
+
+// Dependencies:
+
+repositories {
+    mavenCentral()
+    maven("https://repo.spongepowered.org/maven/")
+    // If you don't want to log in with your real minecraft account, remove this line
+    maven("https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1")
+}
+
+val shadowImpl: Configuration by configurations.creating {
+    configurations.implementation.get().extendsFrom(this)
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:1.8.9")
+    mappings("de.oceanlabs.mcp:mcp_stable:22-1.8.9")
+    forge("net.minecraftforge:forge:1.8.9-11.15.1.2318-1.8.9")
+
+    // If you don't want mixins, remove these lines
+    shadowImpl("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+        isTransitive = false
+    }
+    annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT")
+
+    // If you don't want to log in with your real minecraft account, remove this line
+    runtimeOnly("me.djtheredstoner:DevAuth-forge-legacy:1.1.2")
+
+}
+
+// Tasks:
+
+tasks.withType(JavaCompile::class) {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType(Jar::class) {
+    archiveBaseName.set(modid)
+    manifest.attributes.run {
+        this["FMLCorePluginContainsFMLMod"] = "true"
+        this["ForceLoadAsMod"] = "true"
+
+        // If you don't want mixins, remove these lines
+        this["TweakClass"] = "org.spongepowered.asm.launch.MixinTweaker"
+        this["MixinConfigs"] = "mixins.$modid.json"
+    }
+}
+
+tasks.processResources {
+    inputs.property("version", project.version)
+    inputs.property("mcversion", mcVersion)
+    inputs.property("modid", modid)
+    inputs.property("mixinGroup", mixinGroup)
+
+    filesMatching(listOf("mcmod.info", "mixins.$modid.json")) {
+        expand(inputs.properties)
+        rename { fileName ->
+            fileName.replaceAll("(.+_at.cfg)", "META-INF/" + fileName)
+        }
+    }
+}
+
+
+val remapJar by tasks.named<net.fabricmc.loom.task.RemapJarTask>("remapJar") {
+    archiveClassifier.set("")
+    from(tasks.shadowJar)
+    input.set(tasks.shadowJar.get().archiveFile)
+}
+
+tasks.jar {
+    archiveClassifier.set("without-deps")
+    destinationDirectory.set(layout.buildDirectory.dir("badjars"))
+}
+
+tasks.shadowJar {
+    destinationDirectory.set(layout.buildDirectory.dir("badjars"))
+    archiveClassifier.set("all-dev")
+    configurations = listOf(shadowImpl)
+    doLast {
+        configurations.forEach {
+            println("Copying jars into mod: ${it.files}")
+        }
+    }
+}
+
+tasks.assemble.get().dependsOn(tasks.remapJar)
+
diff --git a/forge/gradle.properties b/forge/gradle.properties
new file mode 100644
index 0000000..3545637
--- /dev/null
+++ b/forge/gradle.properties
@@ -0,0 +1,20 @@
+loom.platform=forge
+org.gradle.jvmargs=-Xmx4g
+mcVersion = 1.8.9
+modid = bbsentials
+version = 1.0.0
+# Done to increase the memory available to gradle.
+# Fabric Properties
+# check these on https://modmuss50.me/fabric.html
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.1
+loader_version=0.14.22
+#Fabric api
+fabric_version=0.89.2+1.20.2
+# Mod Properties
+mod_version=1.0
+baseGroup = de.hype.bbsentials.forge
+forgeMcVersion = 1.8.9
+maven_group=de.hype
+archives_base_name=bbsentials
+#Other
\ No newline at end of file
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java b/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java
new file mode 100644
index 0000000..9a118a1
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java
@@ -0,0 +1,36 @@
+package de.hype.bbsentials.forge;
+
+import de.hype.bbsentials.forge.client.BBsentials;
+import de.hype.bbsentials.forge.client.CommandBBI;
+import net.minecraftforge.client.ClientCommandHandler;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+
+@Mod(modid = "bbsentials", useMetadata = true)
+public class ExampleMod {
+    static boolean alreadyInialised = false;
+    static BBsentials sentials = new BBsentials();
+
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent event) {
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    public void clientSetup() {
+        if (!alreadyInialised) {
+            ClientCommandHandler.instance.registerCommand(new CommandBBI());
+            alreadyInialised = true;
+            sentials.init();
+        }
+    }
+
+    @SubscribeEvent
+    public void onEntityJoinWorld(EntityJoinWorldEvent event) {
+        clientSetup();
+        MinecraftForge.EVENT_BUS.unregister(this);
+    }
+}
+
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java b/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java
new file mode 100644
index 0000000..9b0ce86
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java
@@ -0,0 +1,18 @@
+package de.hype.bbsentials.forge;
+
+import de.hype.bbsentials.forge.client.BBsentials;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+public class Temphook {
+    public static void renderItemOverlayPost(FontRenderer fr, ItemStack stack, int xPosition, int yPosition, String text, CallbackInfo ci) {
+        if (BBsentials.config.highlightitem) {
+            if (stack != null) {
+                if (stack.getDisplayName().contains(BBsentials.bbserver.getItemName())) {
+                    stack.setStackDisplayName("§6(Bingo Splash) " + stack.getDisplayName());
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java b/forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java
new file mode 100644
index 0000000..ec81c52
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java
@@ -0,0 +1,580 @@
+package de.hype.bbsentials.forge.chat;
+
+import de.hype.bbsentials.forge.client.BBsentials;
+import de.hype.bbsentials.forge.client.Config;
+import net.minecraft.client.Minecraft;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IChatComponent;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import org.lwjgl.opengl.Display;
+
+import javax.sound.sampled.AudioInputStream;
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.Clip;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static de.hype.bbsentials.forge.client.BBsentials.config;
+import static de.hype.bbsentials.forge.client.BBsentials.getConfig;
+
+public class Chat {
+    public Chat() {
+        init();
+    }
+
+    public static String[] getVariableInfo(String packageName, String className) {
+        List<String> variableInfoList = new ArrayList<>();
+
+        // Combine the class name with the package name
+        String fullClassName = packageName + "." + className;
+
+        // Load the class
+        Class<?> clazz = null;
+        try {
+            clazz = Class.forName(fullClassName);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
+        // Extract fields of the class
+        Field[] fields = clazz.getDeclaredFields();
+
+        // Collect information for each field
+        for (Field field : fields) {
+            // Exclude transient fields
+            if (Modifier.isTransient(field.getModifiers())) {
+                continue;
+            }
+
+            String variableName = field.getName();
+            String variablePackageName = clazz.getPackage().getName();
+            String variableClassName = clazz.getSimpleName();
+
+            String variableInfo = variableName;
+            variableInfoList.add(variableInfo);
+        }
+
+        return variableInfoList.toArray(new String[variableInfoList.size()]);
+    }
+
+    public static void setVariableValue(Object obj, String variableName, String value) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
+        if (value == null) {
+            // Handle null value case
+            sendPrivateMessageToSelf(EnumChatFormatting.RED + "Invalid value: null");
+            return;
+        }
+
+        Class<?> objClass = obj.getClass();
+        Field field = objClass.getDeclaredField(variableName);
+        field.setAccessible(true);
+
+        // Get the type of the field
+        Class<?> fieldType = field.getType();
+
+        // Convert the value to the appropriate type
+        Object convertedValue = parseValue(value, fieldType);
+
+        if (Modifier.isStatic(field.getModifiers())) {
+            // If the field is static
+            field.set(null, convertedValue);
+        }
+        else {
+            field.set(obj, convertedValue);
+        }
+
+        // Check and output the value of the variable
+        sendPrivateMessageToSelf(EnumChatFormatting.GREEN + "The variable " + field.getName() + " is now: " + field.get(obj));
+    }
+
+    private static Object parseValue(String value, Class<?> targetType) {
+        if (targetType == int.class || targetType == Integer.class) {
+            return Integer.parseInt(value);
+        }
+        else if (targetType == double.class || targetType == Double.class) {
+            return Double.parseDouble(value);
+        }
+        else if (targetType == float.class || targetType == Float.class) {
+            return Float.parseFloat(value);
+        }
+        else if (targetType == long.class || targetType == Long.class) {
+            return Long.parseLong(value);
+        }
+        else if (targetType == boolean.class || targetType == Boolean.class) {
+            return Boolean.parseBoolean(value);
+        }
+        else {
+            // For other types, return the original string value
+            return value;
+        }
+    }
+
+    public static void getVariableValue(Object object, String variableName) throws NoSuchFieldException, IllegalAccessException {
+        Class<?> objClass = object.getClass();
+        Field field = objClass.getDeclaredField(variableName);
+        field.setAccessible(true);
+        sendPrivateMessageToSelf(EnumChatFormatting.GREEN + "The variable " + field.getName() + " is: " + field.get(object));
+    }
+
+    private void init() {
+        MinecraftForge.EVENT_BUS.register(this);
+    }
+
+    @SubscribeEvent
+    public void onClientChatReceived(ClientChatReceivedEvent event) {
+        IChatComponent newMessage = onEvent(event.message);
+        if (!newMessage.equals(event.message)){
+            event.setCanceled(true);
+            Chat.sendPrivateMessageToSelfText(newMessage);
+        }
+    }
+
+    private net.minecraft.util.IChatComponent onEvent(net.minecraft.util.IChatComponent message) {
+        Callable<net.minecraft.util.IChatComponent> callable = () -> {
+            if (!isSpam(message.toString())) {
+                if (getConfig().isDetailedDevModeEnabled()) {
+                    System.out.println("got a message: " + net.minecraft.util.IChatComponent.Serializer.componentToJson(message));
+                }
+                return handleInClient(message);
+            }
+            return message; // Return the original message if it is spam
+        };
+
+        FutureTask<net.minecraft.util.IChatComponent> future = new FutureTask<>(callable);
+        Thread thread = new Thread(future);
+        thread.start();
+
+        try {
+            return future.get(); // Retrieve the result from the background thread
+        } catch (InterruptedException | ExecutionException e) {
+            // Handle exceptions, if needed
+            e.printStackTrace();
+        }
+
+        return message; // Return the original message if an exception occurred
+    }
+
+    //Handle in client
+    public net.minecraft.util.IChatComponent handleInClient(net.minecraft.util.IChatComponent messageOriginal) {
+        String message = extractPlainText(messageOriginal.toString()).trim();
+        if (getConfig().messageFromAlreadyReported(message) && getPlayerNameFromMessage(message) != " " && getPlayerNameFromMessage(message) != "") {
+            System.out.println("Message: " + message);
+            sendPrivateMessageToSelf(EnumChatFormatting.RED + "B: " + message);
+            return null;
+        }
+        if (getConfig().isDevModeEnabled()) {
+            System.out.println("Got message to analyse internally: " + message);
+        }
+        //party accepter
+        if (message != null) {
+            if (message.contains("party")) {
+                if (message.contains("disbanded the party")) {
+                    lastPartyDisbandedMessage = message;
+                    partyDisbandedMap.put(getPlayerNameFromMessage(message), Instant.now());
+                    if (getConfig().isDevModeEnabled()) {
+                        sendPrivateMessageToSelf("Watching next 20 Sec for invite: " + getPlayerNameFromMessage(message));
+                    }
+                }
+                else if (message.contains("invited you to join their party")) {
+                    if (lastPartyDisbandedMessage != null && partyDisbandedMap != null) {
+                        Instant lastDisbandedInstant = partyDisbandedMap.get(getPlayerNameFromMessage(lastPartyDisbandedMessage));
+                        if (lastDisbandedInstant != null && lastDisbandedInstant.isAfter(Instant.now().minusSeconds(20)) && (getPlayerNameFromMessage(message).equals(getPlayerNameFromMessage(lastPartyDisbandedMessage)))) {
+                            sendCommand("/p accept " + getPlayerNameFromMessage(lastPartyDisbandedMessage));
+                        }
+                    }
+                    if (!Display.isActive()) {
+                        sendNotification("BBsentials Party Notifier", "You got invited too a party by: " + getPlayerNameFromMessage(message));
+                    }
+
+                }
+                else if (message.equals("Party > " + BBsentials.getConfig().getUsername() + ": rp")) {
+                    sendCommand("/pl");
+                    repartyActive = true;
+                }
+                else if (message.startsWith("Party Members (")) {
+                    Config.partyMembers = new ArrayList<String>();
+                }
+                else if (message.startsWith("Party Moderators:") && repartyActive) {
+                    message = message.replace("Party Moderators:", "").replace(" ●", "").replaceAll("\\s*\\[[^\\]]+\\]", "").trim();
+                    if (message.contains(",")) {
+                        for (int i = 0; i < message.split(",").length; i++) {
+                            Config.partyMembers.add(message.split(",")[i - 1]);
+                        }
+                    }
+                    else {
+                        Config.partyMembers.add(message);
+                    }
+                }
+                else if (message.startsWith("Party Members:")) {
+                    message = message.replace("Party Members:", "").replace(" ●", "").replaceAll("\\s*\\[[^\\]]+\\]", "").trim();
+                    if (message.contains(",")) {
+                        for (int i = 0; i < message.split(",").length; i++) {
+                            System.out.println("Added to plist: " + (message.split(",")[i - 1]));
+                            Config.partyMembers.add(message.split(",")[i - 1]);
+                        }
+                    }
+                    else {
+                        Config.partyMembers.add(message);
+                    }
+                    if (repartyActive) {
+                        repartyActive = false;
+                        sendCommand("/p disband");
+                        for (int i = 0; i < Integer.max(4, getConfig().getPlayersInParty().length); i++) {
+                            if (i < getConfig().getPlayersInParty().length) {
+                                sendCommand("/p invite " + getConfig().getPlayersInParty()[i]);
+                            }
+                        }
+                    }
+                }
+                else if (message.endsWith("bb:party me") && message.startsWith("From ")) {
+                    if (BBsentials.getConfig().allowBBinviteMe()) {
+                        sendCommand("/p " + getPlayerNameFromMessage(message.replace("From ", "")));
+                    }
+                }
+
+            } //Everything containing party is processed differently (split so fewer checks)
+            else if (message.contains("unlocked Wither Essence") && message.startsWith(getConfig().getUsername())) {
+                if (BBsentials.getConfig().isLeader()) {
+                    repartyActive = true;
+                    sendCommand("/pl");
+                }
+                else {
+                    System.out.println("No Reparty because not leader");
+                }
+                if (getConfig().isLeaveDungeonAutomatically()) {
+                    config.sender.addSendTask("/warp dhub", 3);
+                }
+            }
+            else if (message.contains("unlocked Crimson Essence") && message.startsWith(getConfig().getUsername())) {
+                if (BBsentials.getConfig().isLeader()) {
+                    repartyActive = true;
+                    sendCommand("/pl");
+                }
+                else {
+                    System.out.println("No Reparty because not leader");
+                }
+                try {
+                    Thread.sleep(3000);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+                if (getConfig().isLeaveKuudraAutomatically()) {
+                    sendCommand("/warp kuudra");
+                }
+            }
+            else if (message.contains("bb:test")) {
+                sendPrivateMessageToSelf(test());
+            }
+            else if ((message.endsWith("is visiting Your Garden !") || message.endsWith("is visiting Your Island !")) && !Display.isActive()) {
+                sendNotification("BBsentials Visit-Watcher", message);
+            }
+            else if (message.equals("Please type /report confirm to log your report for staff review.")) {
+                sendCommand("/report confirm");
+            }
+            else if (message.contains(":") && !Display.isActive()) {
+                if (message.startsWith("Party >")) {
+                    String partyMessage = message.replaceFirst("Party >", "").trim();
+                    messageOriginal = replaceAllForText(messageOriginal, "\"action\":\"run_command\",\"value\":\"/viewprofile", "\"action\":\"run_command\",\"value\":\"/hci menu pcm " + partyMessage);
+                    if (partyMessage.split(":", 2)[1].toLowerCase().contains(getConfig().getUsername().toLowerCase()) || (partyMessage.toLowerCase().contains(getConfig().getNickname().toLowerCase() + " ") && getConfig().getNotifForParty().toLowerCase().equals("nick")) || getConfig().getNotifForParty().toLowerCase().equals("all")) {
+                        sendNotification("BBsentials Party Chat Notification", partyMessage);
+                    }
+                }
+                else if (message.startsWith("From ")) {
+                    String sender = getPlayerNameFromMessage(message.replaceFirst("From", "").trim());
+                    String content = message.split(":", 2)[1];
+                    sendNotification("BBsentials Message Notifier", sender + " sent you the following message: " + content);
+                }
+                else if (message.toLowerCase().contains("party")) {
+                    if ((message.contains("Party Leader:") && !message.contains(getConfig().getUsername())) || message.equals("You are not currently in a party.") || (message.contains("warped the party into a Skyblock Dungeon") && !message.startsWith(getConfig().getUsername()) || (!message.startsWith("The party was transferred to " + getConfig().getUsername()) && message.startsWith("The party was transferred to"))) || message.equals(getConfig().getUsername() + " is now a Party Moderator") || (message.equals("The party was disbanded because all invites expired and the party was empty.")) || (message.contains("You have joined ") && message.contains("'s party!")) || (message.contains("Party Leader, ") && message.contains(" , summoned you to their server.")) || (message.contains("warped to your dungeon"))) {
+                        BBsentials.getConfig().setIsLeader(false);
+                        if (getConfig().isDetailedDevModeEnabled()) {
+                            sendPrivateMessageToSelf("Leader: " + getConfig().isLeader());
+                        }
+                    }
+                    if ((message.equals("Party Leader: " + getConfig().getUsername() + " ●")) || (message.contains(getConfig().getUsername() + " warped the party to a SkyBlock dungeon!")) || message.startsWith("The party was transferred to " + getConfig().getUsername()) || message.equals("Raul_J has promoted " + getConfig().getUsername() + " to Party Leader") || (message.contains("warped to your dungeon"))) {
+                        BBsentials.getConfig().setIsLeader(true);
+                        if (getConfig().isDetailedDevModeEnabled()) {
+                            sendPrivateMessageToSelf("Leader: " + getConfig().isLeader());
+                        }
+                    }
+                    else if (repartyActive && !BBsentials.getConfig().isLeader()) {
+                        repartyActive = false;
+                        sendPrivateMessageToSelf("Resetted Reparty is Active since you are not leader ");
+                    }
+                }
+                else {
+                    String[] temp = message.split(":", 2);
+                    String content = temp[temp.length - 1];
+                    if (temp.length == 2 && (content.toLowerCase().contains(getConfig().getUsername().toLowerCase()) || content.toLowerCase().contains(config.getNickname().toLowerCase() + " "))) {
+                        sendNotification("BBsentials Notifier", "You got mentioned in chat! " + content);
+                    }
+                }
+            }
+            else if (message.equals("You laid an Egg!")) {
+                Thread eggThread = new Thread(() -> {
+                    try {
+                        Thread.sleep(21000); // Wait for 21 seconds (in milliseconds)
+                        sendPrivateMessageToSelf("Chicken Head is ready");
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                });
+
+                eggThread.start();
+            }
+            else if (message.contains("[OPEN MENU]") || message.contains("YES")) {
+                setChatPromtId(messageOriginal.toString());
+            }
+
+        }
+        return messageOriginal;
+    }
+
+    //{"strikethrough":false,"extra":[{"strikethrough":false,"clickEvent":{"action":"run_command","value":"/viewprofile 4fa1228c-8dd6-47c4-8fe3-b04b580311b8"},"hoverEvent":{"action":"show_text","contents":{"strikethrough":false,"text":"§eClick here to view §bHype_the_Time§e's profile"}},"text":"§9Party §8> §b[MVP§2+§b] Hype_the_Time§f: "},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"text":"h:test"}],"text":""}// {"strikethrough":false,"extra":[{"strikethrough":false,"clickEvent":{"action":"run_command","value":"/viewprofile f772b2c7-bd2a-46e1-b1a2-41fa561157d6"},"hoverEvent":{"action":"show_text","contents":{"strikethrough":false,"text":"§eClick here to view §bShourtu§e's profile"}},"text":"§9Party §8> §b[MVP§c+§b] Shourtu§f: "},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"text":"Hype_the_Time TEST"}],"text":""}
+    //{"strikethrough":false,"extra":[{"strikethrough":false,"clickEvent":{"action":"run_command","value":"/viewprofile 4fa1228c-8dd6-47c4-8fe3-b04b580311b8"},"hoverEvent":{"action":"show_text","contents":{"strikethrough":false,"text":"§eClick here to view §bHype_the_Time§e's profile"}},"text":"§9Party §8> §b[MVP§2+§b] Hype_the_Time§f: "},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"text":"h:test"}],"text":""}
+    private final Map<String, Instant> partyDisbandedMap = new HashMap<>();
+    private String lastPartyDisbandedMessage = null;
+
+    public static String getPlayerNameFromMessage(String message) {
+        message = message.replaceAll("\\[.*?\\]", "").trim();
+        message = message.replaceAll("-----------------------------------------------------", "").replaceAll(":", "");
+        String[] temp = message.split(" ");
+        String playerName = "";
+
+        for (int i = 0; i < temp.length; i++) {
+            if (!temp[i].equals(" ") && !temp[i].equals("")) {
+                playerName = temp[i];
+                break; // Stop looping after finding the first non-empty value
+            }
+        }
+
+        // Remove the rank from the player name, if it exists
+        Pattern rankPattern = Pattern.compile("\\s*\\[[^\\]]+\\]");
+        playerName = rankPattern.matcher(playerName).replaceAll(" ");
+
+        return playerName;
+    }
+
+    public String extractPlainText(String input) {
+        String returns = "";
+        String[] literals = input.split("literal\\{");
+        if (!input.startsWith("literal")) {
+            literals[0] = "";
+        }
+        for (int i = 0; i < literals.length; i++) {
+            if (dontExclude(literals, i) && !literals[i].equals("")) {
+                String literal = literals[i].split("}")[0];
+
+                if (!literal.isEmpty()) {
+                    returns = returns + literal;
+                }
+            }
+        }
+        // Remove § formatting
+        returns = returns.replaceAll("§.", "");
+        // Remove brackets that contain only uppercase letters or pluses
+        returns = returns.replaceAll("\\[[A-Z+]+\\]", "");
+        returns = returns.replaceAll("\\[[0-9]+\\]", "");
+        returns = returns.trim();
+        returns = returns.replaceAll("\\s+", " ");
+
+        return returns;
+    }
+
+    private boolean dontExclude(String[] s, int i) {
+        if ((i - 1) < 0) {
+            return true;
+        }
+        else {
+            if (s[i - 1].endsWith("value='")) {
+                return false;
+            }
+            else {
+                return true;
+            }
+        }
+    }
+
+    public boolean isSpam(String message) {
+        if (message.contains("Mana")) return true;
+        if (message.contains("Achievement Points")) return true;
+        return false;
+    }
+
+    private boolean repartyActive = false;
+
+    public String test() {
+        //put test code here
+        sendNotification("test", "This is an example which was run of the h:test test");
+        return new String();
+    }
+
+    private static String removeMultipleSpaces(String input) {
+        return input.replaceAll("\\s+", " ");
+    }
+
+    public static void sendPrivateMessageToSelf(String message) {
+        if (Minecraft.getMinecraft().thePlayer != null) {
+            Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + message));
+        }
+    }
+
+    public static void sendPrivateMessageToSelfText(net.minecraft.util.IChatComponent message) {
+        if (Minecraft.getMinecraft().thePlayer != null) {
+            Minecraft.getMinecraft().thePlayer.addChatMessage(message);
+        }
+    }
+
+    public static void sendCommand(String s) {
+        getConfig().sender.addSendTask(s);
+    }
+
+    public void sendNotification(String title, String text) {
+        Thread soundThread = new Thread(() -> {
+            try {
+                InputStream inputStream = getClass().getResourceAsStream("/sounds/mixkit-sci-fi-confirmation-914.wav");
+                AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(inputStream);
+                Clip clip = AudioSystem.getClip();
+                clip.open(audioInputStream);
+                clip.start();
+                Thread.sleep(clip.getMicrosecondLength() / 1000);
+                clip.close();
+                audioInputStream.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+
+        soundThread.start();
+
+        List<String> argsList = new ArrayList<>();
+        argsList.add("--title");
+        argsList.add(title);
+        argsList.add("--passivepopup");
+        argsList.add(text);
+        argsList.add("5");
+
+        try {
+            ProcessBuilder processBuilder = new ProcessBuilder();
+            processBuilder.command("kdialog");
+            processBuilder.command().addAll(argsList);
+
+            Process process = processBuilder.start();
+            process.waitFor();
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static net.minecraft.util.IChatComponent createClientSideTellraw(String tellrawInput) {
+        net.minecraft.util.IChatComponent formattedMessage = null;
+        try {
+            formattedMessage = net.minecraft.util.IChatComponent.Serializer.jsonToComponent(tellrawInput);
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.out.println("Invalid Json: \n" + tellrawInput);
+        }
+        return formattedMessage;
+    }
+
+    public static void followMenu(String menu, String message) {
+        // Check the "menu" argument and execute the appropriate logic
+        String command;
+        String username = getPlayerNameFromMessage(message);
+        if (message.contains(":")) {
+            message = message.split(":", 2)[1].trim();
+            if (menu.equalsIgnoreCase("pcm")) {
+                command = "[\"\",{\"text\":\"@@username\",\"color\":\"gray\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/pc @username\"}},{\"text\":\" [Copy_Message]\",\"color\":\"blue\",\"clickEvent\":{\"action\":\"copy_to_clipboard\",\"value\":\"Copy-Text-Message\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Copy the message the Player send without their name into the clipboard.\"]}},{\"text\":\" [Kick_Player]\",\"color\":\"dark_red\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p kick @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Kick the player from the party\"]}},{\"text\":\" [Promote_Player]\",\"color\":\"dark_green\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p promote @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Promote the player\"]}},{\"text\":\" [Demote_Player]\",\"color\":\"red\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p demote @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Demote the player\"]}},{\"text\":\" [Transfer_to_Player]\",\"color\":\"gold\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p transfer @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Transfer the Party to the player\"]}},{\"text\":\" [Mute/Unmute_Party]\",\"color\":\"dark_aqua\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p mute @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Mutes the ENTIRE party but party moderators or Hypixel Staff can still type.\"]}}]";
+                //{"jformat":8,"jobject":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"gray","insertion":"","click_event_type":"suggest_command","click_event_value":"/pc @username","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"@username"},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"blue","insertion":"","click_event_type":"copy_to_clipboard","click_event_value":"Copy-Text-Message","hover_event_type":"show_text","hover_event_value":"","hover_event_object":{},"hover_event_children":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"none","insertion":"","click_event_type":"none","click_event_value":"","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"Copy the message the Player send without their name into the clipboard."}],"text":" [Copy_Message]"},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"dark_red","insertion":"","click_event_type":"run_command","click_event_value":"/p kick @username","hover_event_type":"show_text","hover_event_value":"","hover_event_object":{},"hover_event_children":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"none","insertion":"","click_event_type":"none","click_event_value":"","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"Kick the player from the party"}],"text":" [Kick_Player]"},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"dark_green","insertion":"","click_event_type":"run_command","click_event_value":"/p promote @username","hover_event_type":"show_text","hover_event_value":"","hover_event_object":{},"hover_event_children":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"none","insertion":"","click_event_type":"none","click_event_value":"","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"Promote the player"}],"text":" [Promote_Player]"},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"red","insertion":"","click_event_type":"run_command","click_event_value":"/p demote @username","hover_event_type":"show_text","hover_event_value":"","hover_event_object":{},"hover_event_children":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"none","insertion":"","click_event_type":"none","click_event_value":"","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"Demote the player"}],"text":" [Demote_Player]"},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"gold","insertion":"","click_event_type":"run_command","click_event_value":"/p transfer @username","hover_event_type":"show_text","hover_event_value":"","hover_event_object":{},"hover_event_children":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"none","insertion":"","click_event_type":"none","click_event_value":"","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"Transfer the Party to the player"}],"text":" [Transfer_to_Player]"},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"dark_aqua","insertion":"","click_event_type":"run_command","click_event_value":"/p mute @username","hover_event_type":"show_text","hover_event_value":"","hover_event_object":{},"hover_event_children":[{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"font":null,"color":"none","insertion":"","click_event_type":"none","click_event_value":"","hover_event_type":"none","hover_event_value":"","hover_event_object":{},"hover_event_children":[],"text":"Mutes the ENTIRE party but party moderators or Hypixel Staff can still type."}],"text":" [Mute/Unmute_Party]"}],"command":"%s","jtemplate":"tellraw"}
+            }
+            else if (menu.equalsIgnoreCase("sbacm")) {
+                command = "[\"\",\"\\n\",{\"text\":\"@@username\",\"color\":\"gray\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"@username\"}},{\"text\":\" [Party_Player]\",\"color\":\"gold\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p invite @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Invite the player to the party\"]}},{\"text\":\" [Ignore_Player]\",\"color\":\"yellow\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/ignore add @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Add the player to your ignore list.\"]}},{\"text\":\" [Chat_Report_Player]\",\"color\":\"dark_red\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/creport @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Chat report the user with /creport.\"]}},{\"text\":\" [Visit_Player]\",\"color\":\"dark_green\",\"insertion\":\" \",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/visit @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[]}},{\"text\":\" [/Invite_Player]\",\"color\":\"green\",\"insertion\":\" \",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/invite @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"/invite the player to visit your Island / Garden.\"]}},{\"text\":\" [Copy_Message] \",\"color\":\"blue\",\"clickEvent\":{\"action\":\"copy_to_clipboard\",\"value\":\"Copy-Text-Message\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Copy the message the user send without their prefixes nor their username\"]}},{\"text\":\" [Copy_Username]\",\"color\":\"dark_aqua\",\"insertion\":\" \",\"clickEvent\":{\"action\":\"copy_to_clipboard\",\"value\":\"@username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Copy the players username into the clipboard.\"]}},{\"text\":\" [/msg_Chat_Player]\",\"color\":\"light_purple\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/msg @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"/msg the Player. the chat will be set to message them. This means you do not need to type /msg upfront. To return to normal do /chat a\"]}},{\"text\":\" [Sky_shiiyu_player]\",\"color\":\"aqua\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://sky.shiiyu.moe/stats/@username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Opens the players Skyblock Profile in Sky Crypt (sky.shiiyu.moe)\"]}},\"\\n\"]";
+            }
+            else if (menu.equalsIgnoreCase("acm")) {
+                command = "[\"\",\"\\n\",{\"text\":\"@@username\",\"color\":\"gray\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"@username\"}},{\"text\":\" [Party_Player]\",\"color\":\"gold\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/p invite @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Invite the player to the party\"]}},{\"text\":\" [Ignore_Player]\",\"color\":\"yellow\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/ignore add @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Add the player to your ignore list.\"]}},{\"text\":\" [Chat_Report_Player]\",\"color\":\"dark_red\",\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/creport @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Chat report the user with /creport.\"]}},{\"text\":\" [Copy_Message] \",\"color\":\"blue\",\"clickEvent\":{\"action\":\"copy_to_clipboard\",\"value\":\"Copy-Text-Message\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Copy the message the user send without their prefixes nor their username\"]}},{\"text\":\" [Copy_Username]\",\"color\":\"dark_aqua\",\"insertion\":\" \",\"clickEvent\":{\"action\":\"copy_to_clipboard\",\"value\":\"@username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"Copy the players username into the clipboard.\"]}},{\"text\":\" [/msg_Chat_Player]\",\"color\":\"light_purple\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/msg @username\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"/msg the Player. the chat will be set to message them. This means you do not need to type /msg upfront. To return to normal do /chat a\"]}}";
+            }
+            else {
+                // Handle unrecognized menu argument
+                sendPrivateMessageToSelf(EnumChatFormatting.RED + "Unrecognized menu argument! Do not use this command unless you know exactly what you are doing aka only use it as a developer!");
+                return;
+            }
+            command = command.replaceAll("@username", username);
+            command = command.replaceAll("Copy-Text-Message", message);
+            sendPrivateMessageToSelfText(createClientSideTellraw(command));
+        }
+        else {
+            sendPrivateMessageToSelf("Invalid message!: " + message);
+        }
+    }
+
+    public static void setChatPromtId(String logMessage) {
+        String cbUUIDPattern = "/cb ([a-fA-F0-9-]+)";
+        Pattern cbPattern = Pattern.compile(cbUUIDPattern);
+        Matcher cbMatcher = cbPattern.matcher(logMessage);
+
+        String yesClickAction = "/chatprompt ([a-fA-F0-9-]+) YES";
+        Pattern yesPattern = Pattern.compile(yesClickAction);
+        Matcher yesMatcher = yesPattern.matcher(logMessage);
+        String lastPrompt = null;
+        if (cbMatcher.find()) {
+            lastPrompt = cbMatcher.group(1);
+            String finalLastPrompt1 = lastPrompt;
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    BBsentials.getConfig().setLastChatPromptAnswer("/cb " + finalLastPrompt1);
+                    try {
+                        Thread.sleep(10 * 1000);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    BBsentials.getConfig().setLastChatPromptAnswer(null);
+                    return;
+                }
+            }).start();
+        }
+        if (yesMatcher.find()) {
+            lastPrompt = yesMatcher.group(1);
+            String finalLastPrompt = lastPrompt;
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    BBsentials.getConfig().setLastChatPromptAnswer("/chatprompt " + finalLastPrompt + " YES");
+                    try {
+                        Thread.sleep(10 * 1000);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                    BBsentials.getConfig().setLastChatPromptAnswer(null);
+                    return;
+                }
+            }).start();
+
+        }
+    }
+
+    public static net.minecraft.util.IChatComponent replaceAllForText(net.minecraft.util.IChatComponent input, String replace, String replaceWith) {
+        String text = net.minecraft.util.IChatComponent.Serializer.componentToJson(input);
+        if (text.contains(replace)) {
+            text = text.replaceAll("\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", "");
+        }
+        text = text.replace(replace, replaceWith);
+        net.minecraft.util.IChatComponent output = net.minecraft.util.IChatComponent.Serializer.jsonToComponent(text);
+        return output;
+    }
+}
\ No newline at end of file
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/chat/Sender.java b/forge/src/main/java/de/hype/bbsentials/forge/chat/Sender.java
new file mode 100644
index 0000000..15cd3d7
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/chat/Sender.java
@@ -0,0 +1,100 @@
+package de.hype.bbsentials.forge.chat;
+
+import com.mojang.realmsclient.gui.ChatFormatting;
+import net.minecraft.client.Minecraft;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Sender {
+    private final List<String> sendQueue;
+    private final List<Double> sendQueueTiming;
+    private final List<Boolean> hidden;
+
+    public Sender() {
+        this.sendQueue = new ArrayList<>();
+        this.sendQueueTiming = new ArrayList<>();
+        this.hidden = new ArrayList<>();
+        startSendingThread();
+    }
+
+    public void addSendTask(String task, double timing) {
+        synchronized (sendQueue) {
+            Chat.sendPrivateMessageToSelf(ChatFormatting.GREEN + "Scheduled send-task (as " + sendQueueTiming.size() + " in line): " + task + " | Delay: " + timing);
+            sendQueueTiming.add(timing);
+            sendQueue.add(task);
+            hidden.add(false);
+            sendQueue.notify(); // Notify the waiting thread that a new String has been added
+        }
+    }
+
+    public void addHiddenSendTask(String task, double timing) {
+        synchronized (sendQueue) {
+            sendQueueTiming.add(timing);
+            sendQueue.add(task);
+            hidden.add(true);
+            sendQueue.notify(); // Notify the waiting thread that a new String has been added
+        }
+    }
+
+    public void addImmediateSendTask(String task) {
+        synchronized (sendQueue) {
+            sendQueueTiming.add(0, 0.0);
+            sendQueue.add(0, task);
+            hidden.add(false);
+            sendQueue.notify(); // Notify the waiting thread that a new String has been added
+        }
+    }
+
+    public void addSendTask(String task) {
+        addSendTask(task, 1);
+    }
+
+    public void startSendingThread() {
+        Thread sendingThread = new Thread(new SendingRunnable());
+        sendingThread.start();
+    }
+
+    private class SendingRunnable implements Runnable {
+        @Override
+        public void run() {
+            while (true) {
+                String task = getNextTask();
+                if (task != null) {
+                    send(task, sendQueueTiming.remove(0), hidden.remove(0));
+                }
+                else {
+                    synchronized (sendQueue) {
+                        try {
+                            sendQueue.wait(); // Wait for new Send
+                        } catch (InterruptedException e) {
+                            throw new RuntimeException(e);
+                        }
+                    }
+                }
+            }
+        }
+
+        private String getNextTask() {
+            synchronized (sendQueue) {
+                if (!sendQueue.isEmpty()) {
+                    return sendQueue.remove(0);
+                }
+                return null;
+            }
+        }
+
+        private void send(String toSend, double timing, boolean hidden) {
+            try {
+                Thread.sleep((long) (timing * 1000)); // Simulate the send operation
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            Minecraft.getMinecraft().thePlayer.sendChatMessage(toSend);
+            if (!hidden) {
+                Chat.sendPrivateMessageToSelf("Sent Command to Server: " + toSend);
+            }
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/BBsentials.java b/forge/src/main/java/de/hype/bbsentials/forge/client/BBsentials.java
new file mode 100644
index 0000000..87dc13b
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/BBsentials.java
@@ -0,0 +1,42 @@
+package de.hype.bbsentials.forge.client;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.forge.client.Commands.CommandsOLD;
+import de.hype.bbsentials.forge.communication.BBsentialConnection;
+
+
+public class BBsentials {
+    private boolean initialised = false;
+    public static Config config;
+    public static BBsentialConnection bbserver;
+    public static CommandsOLD coms;
+
+    public void init() {
+        if (!initialised) {
+            config = Config.load();
+            Chat chat = new Chat();
+            if (Config.isBingoTime() || config.overrideBingoTime()) {
+                connectToBBserver();
+            }
+            initialised = true;
+        }
+    }
+
+    public static Config getConfig() {
+        return config;
+    }
+
+    public static void connectToBBserver() {
+        if (bbserver != null) {
+            bbserver.sendHiddenMessage("exit");
+        }
+        bbserver = new BBsentialConnection();
+        bbserver.setMessageReceivedCallback(message -> bbserver.onMessageReceived(message));
+        bbserver.connect(config.getBBServerURL(), 5000);
+    }
+
+    public static void refreshCommands() {
+        coms = new CommandsOLD();
+    }
+
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/CommandBBI.java b/forge/src/main/java/de/hype/bbsentials/forge/client/CommandBBI.java
new file mode 100644
index 0000000..352a7b6
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/CommandBBI.java
@@ -0,0 +1,87 @@
+package de.hype.bbsentials.forge.client;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+import static de.hype.bbsentials.forge.client.BBsentials.connectToBBserver;
+import static de.hype.bbsentials.forge.client.BBsentials.getConfig;
+
+
+public class CommandBBI extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bbi";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/bbi <reconnect|config>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length == 0) {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bbi <reconnect|config|set-key>"));
+            return;
+        }
+
+        String subCommand = args[0];
+        switch (subCommand) {
+            case "reconnect":
+                connectToBBserver();
+                break;
+
+            case "config":
+                if (args.length < 2) {
+                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bbi config <category>"));
+                    return;
+                }
+
+                String category = args[1];
+                switch (category) {
+                    case "save":
+                        getConfig().save();
+                        Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + "Saved config successfully"));
+                        break;
+
+                    case "load":
+                        BBsentials.config = Config.load();
+                        break;
+
+                    default:
+                        sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Unknown category: " + category));
+                        break;
+                }
+                break;
+
+            case "set-key":
+                if (args.length < 4) {
+                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bbi set-key <key> set-server <value>"));
+                    return;
+                }
+
+                String key = args[1];
+                if (args[2].equalsIgnoreCase("set-server")) {
+                    String value = args[3];
+                    // Handle setting the key and value logic here for server
+                }
+                else {
+                    sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bbi set-key <key> set-server <value>"));
+                }
+                break;
+
+            default:
+                sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Unknown command: " + subCommand));
+                break;
+        }
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java
new file mode 100644
index 0000000..8044991
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java
@@ -0,0 +1,29 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
+import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+
+
+public class Command2xPowder extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "2xpowder";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/2xpowder";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        bbserver.sendMessage("?dwevent 2xpowder");
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java
new file mode 100644
index 0000000..3d2afb7
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java
@@ -0,0 +1,36 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class CommandBAnnounce extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bannounce";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName() + " <message>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length >= 1) {
+            String message = String.join(" ", args);
+            Chat.sendCommand("?announce " + message);
+        }
+        else {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender)));
+        }
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java
new file mode 100644
index 0000000..3254d1c
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java
@@ -0,0 +1,41 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.client.BBsentials;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class CommandBBServer extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bbserver";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/bbserver <Message>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length < 1) {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bbserver <Message>"));
+            return;
+        }
+
+        String message = args[0];
+        if (message.equals("bb:reconnect")) {
+            BBsentials.connectToBBserver();
+        }
+        else {
+            BBsentials.bbserver.sendMessage(message);
+        }
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java
new file mode 100644
index 0000000..15d99b7
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java
@@ -0,0 +1,36 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class CommandBBan extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bban";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName() + " <message>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length >= 1) {
+            String message = String.join(" ", args);
+            Chat.sendCommand("?bban " + message);
+        }
+        else {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender)));
+        }
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java
new file mode 100644
index 0000000..0b46507
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java
@@ -0,0 +1,36 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class CommandBC extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bc";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/bc <Message to Bingo Chat>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length < 1) {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bc <Message to Bingo Chat>"));
+            return;
+        }
+
+        String message = args[0];
+        Chat.sendCommand("?bingochat " + message);
+    }
+
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java
new file mode 100644
index 0000000..3fd6390
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java
@@ -0,0 +1,35 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class CommandBMute extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bmute";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName() + " <message>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length >= 1) {
+            String message = String.join(" ", args);
+            Chat.sendCommand("?mute " + message);
+        }
+        else {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender)));
+        }
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java
new file mode 100644
index 0000000..78f20f8
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java
@@ -0,0 +1,29 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
+import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+
+
+public class CommandBetterTogether extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bettertogether";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/bettertogether";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        bbserver.sendMessage("?dwevent bettertogether");
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java
new file mode 100644
index 0000000..655cfdb
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java
@@ -0,0 +1,35 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+public class CommandBingoChat extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "bingochat";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/bingochat <Message to Bingo Chat>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length < 1) {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /bingochat <Message to Bingo Chat>"));
+            return;
+        }
+
+        String message = args[0];
+        Chat.sendCommand("?bingochat " + message);
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java
new file mode 100644
index 0000000..daaa1f3
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java
@@ -0,0 +1,48 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+
+
+public class CommandChChest extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "chchest";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/chchest <Item> <X> <Y> <Z> <ContactWay>";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length < 5) {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: /chchest <Item> <X> <Y> <Z> <ContactWay>"));
+            return;
+        }
+
+        String item = args[0];
+        try {
+            int x = parseInt(args[1]);
+            int y = parseInt(args[2]);
+            int z = parseInt(args[3]);
+            String contactWay = args[4];
+
+            String combinedString = "?chchest " + item + " " + x + " " + y + " " + z + " " + contactWay;
+            bbserver.sendMessage(combinedString);
+        } catch (Exception e) {
+            Chat.sendPrivateMessageToSelf("§cYour coords were invalid.");
+        }
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java
new file mode 100644
index 0000000..bb7d276
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java
@@ -0,0 +1,29 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
+import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+
+
+public class CommandGoblinRaid extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "goblinraid";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/goblinraid";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        bbserver.sendMessage("?dwevent goblinraid");
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java
new file mode 100644
index 0000000..602e422
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java
@@ -0,0 +1,29 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
+import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+
+
+public class CommandGoneWithTheWind extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "gonewiththewind";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/gonewiththewind";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        bbserver.sendMessage("?dwevent gonewiththewind");
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java
new file mode 100644
index 0000000..235c538
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java
@@ -0,0 +1,29 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+
+import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+
+
+public class CommandRaffle extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "raffle";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/raffle";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        bbserver.sendMessage("?dwevent raffle");
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java
new file mode 100644
index 0000000..041d0fc
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java
@@ -0,0 +1,50 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.NumberInvalidException;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.Arrays;
+
+public class CommandSplashAnnounce extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "splashAnnounce";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/" + getCommandName() + " <Hub> <location> [extramessage]";
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length >= 2) {
+            int hub_Number = 0;
+            try {
+                hub_Number = parseInt(args[0], 1, 28);
+            } catch (NumberInvalidException e) {
+                Chat.sendPrivateMessageToSelf("§cInvalid hub number");
+            }
+            String location = args[1];
+            String message = "";
+
+            if (args.length > 2) {
+                message = String.join(" ", Arrays.copyOfRange(args, 2, args.length));
+            }
+
+            Chat.sendCommand("?splash " + hub_Number + " " + location + " " + message);
+        }
+        else {
+            sender.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + "Usage: " + getCommandUsage(sender)));
+        }
+    }
+    @Override
+    public boolean canCommandSenderUseCommand(ICommandSender sender) {
+        return true;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java
new file mode 100644
index 0000000..804815c
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java
@@ -0,0 +1,38 @@
+package de.hype.bbsentials.forge.client.Commands;
+
+import de.hype.bbsentials.forge.client.BBsentials;
+import net.minecraftforge.client.ClientCommandHandler;
+
+import static de.hype.bbsentials.forge.client.BBsentials.getConfig;
+
+
+public class CommandsOLD {
+    public CommandsOLD() {
+        ClientCommandHandler.instance.registerCommand(new CommandGoblinRaid());
+        ClientCommandHandler.instance.registerCommand(new Command2xPowder());
+        ClientCommandHandler.instance.registerCommand(new CommandBetterTogether());
+        ClientCommandHandler.instance.registerCommand(new CommandRaffle());
+        ClientCommandHandler.instance.registerCommand(new CommandGoneWithTheWind());
+        ClientCommandHandler.instance.registerCommand(new CommandChChest());
+        ClientCommandHandler.instance.registerCommand(new CommandBBServer());
+        ClientCommandHandler.instance.registerCommand(new CommandBC());
+        ClientCommandHandler.instance.registerCommand(new CommandBingoChat());
+        if (getConfig().bbsentialsRoles != null) {
+            if (getConfig().bbsentialsRoles.contains("mod")) {
+                ClientCommandHandler.instance.registerCommand(new CommandBAnnounce());
+                ClientCommandHandler.instance.registerCommand(new CommandBMute());
+                ClientCommandHandler.instance.registerCommand(new CommandBBan());
+            }
+            if (getConfig().bbsentialsRoles.contains("splasher")) {
+                ClientCommandHandler.instance.registerCommand(new CommandSplashAnnounce());
+            }
+            else {
+            }
+        }
+    }
+
+    public void sendCommand(String message) {
+        BBsentials.bbserver.sendCommand(message);
+    }
+}
+
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Config.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Config.java
new file mode 100644
index 0000000..f4fff7e
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/client/Config.java
@@ -0,0 +1,198 @@
+//Keep in mind that a lot of the stuff in here may never be used and is here because its copied from the 1.20 version which is the main part of the code.
+
+package de.hype.bbsentials.forge.client;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.forge.chat.Sender;
+import net.minecraft.client.Minecraft;
+
+import java.io.*;
+import java.time.LocalDate;
+import java.util.ArrayList;
+
+public class Config implements Serializable {
+    // Helper class for sending chat messages
+    public transient final Sender sender = new Sender();
+
+    public transient boolean highlightitem = false;
+    public transient String lastChatPromptAnswer = null;
+
+    // Automatically set, no need for config
+    private transient String username;
+    private boolean overrideBingoTime = false;
+
+    // Set in-game
+    private transient boolean isLeader;
+    private transient String alreadyReported = "";
+    private String bbServerURL = "static.204.177.34.188.clients.your-server.de";
+    public String bbsentialsRoles = "";
+    public static ArrayList<String> partyMembers = new ArrayList<>();
+
+    // Set via load / default
+    private String bbsentialsCommandPrefix = ".";
+    private String apiKey = "";
+    private boolean leaveDungeonAutomatically;
+    private boolean allowBBinviteMe = true;
+    private boolean leaveKuudraAutomatically;
+    private boolean devMode = false;
+    private boolean detailedDevMode = false;
+    private boolean acceptReparty;
+    private String nickname;
+    private String getNotifForParty;
+
+    // Set default attribute values
+    private void setDefaults() {
+        username = Minecraft.getMinecraft().thePlayer.getName();
+        leaveKuudraAutomatically = true;
+        leaveDungeonAutomatically = true;
+        acceptReparty = true;
+        if (username.equals("Hype_the_Time")) {
+            nickname = "hype";
+            getNotifForParty = "nick";
+        }
+        else {
+            nickname = "";
+            getNotifForParty = "none";
+        }
+    }
+    // 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("./config/BBsential_settings.json");
+
+    // Constructor
+    public Config() {
+        setDefaults();
+    }
+
+    // Load the config from file
+    public static Config load() {
+        Config settings;
+        File CONFIG_FILE = new File("./config/BBsential_settings.json");
+        Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+        if (CONFIG_FILE.exists()) {
+            try (FileReader reader = new FileReader(CONFIG_FILE)) {
+                settings = GSON.fromJson(reader, Config.class);
+            } catch (IOException e) {
+                e.printStackTrace();
+                settings = new Config(); // Use default values if loading fails
+            }
+        }
+        else {
+            settings = new Config(); // Use default values if the file doesn't exist
+        }
+        if (!settings.bbsentialsRoles.contains("dev")) {
+            settings.detailedDevMode = false;
+            settings.devMode = false;
+        }
+        settings.save();
+        return settings;
+    }
+
+    // Save the config to file
+    public void save() {
+        try (FileWriter writer = new FileWriter(CONFIG_FILE)) {
+            GSON.toJson(this, writer);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    // Getter methods for various config attributes
+    public String getUsername() {
+        return username;
+    }
+
+    public boolean isLeader() {
+        return isLeader;
+    }
+
+    public void setIsLeader(boolean value) {
+        isLeader = value;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public String getNotifForParty() {
+        return getNotifForParty;
+    }
+
+    public boolean isLeaveDungeonAutomatically() {
+        return leaveDungeonAutomatically;
+    }
+
+    public boolean isLeaveKuudraAutomatically() {
+        return leaveKuudraAutomatically;
+    }
+
+    public boolean isDevModeEnabled() {
+        return devMode;
+    }
+
+    public boolean isDetailedDevModeEnabled() {
+        return detailedDevMode;
+    }
+
+    public String[] getPlayersInParty() {
+        return partyMembers.toArray(new String[0]);
+    }
+
+    public boolean messageFromAlreadyReported(String message) {
+        return alreadyReported.contains(Chat.getPlayerNameFromMessage(message));
+    }
+
+    public void addReported(String playerName) {
+        alreadyReported = alreadyReported + " , " + playerName;
+    }
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public String getBBServerURL() {
+        return bbServerURL;
+    }
+
+    public String getCommandPrefix(String type) {
+        if (type.equals("BBsentials")) {
+            System.out.println("Registered command with: " + bbsentialsCommandPrefix);
+            return bbsentialsCommandPrefix;
+        }
+        else {
+            return "/";
+        }
+    }
+
+    public static boolean isBingoTime() {
+        LocalDate currentDate = LocalDate.now();
+        LocalDate lastDayOfMonth = currentDate.withDayOfMonth(currentDate.lengthOfMonth());
+        LocalDate firstDayOfMonth = currentDate.withDayOfMonth(1);
+        Boolean isBefore = currentDate.isAfter(lastDayOfMonth.minusDays(4));
+        Boolean isInRange = currentDate.isBefore(firstDayOfMonth.plusDays(15));
+        return isBefore || isInRange;
+    }
+
+    public boolean overrideBingoTime()  {
+        return overrideBingoTime;
+    }
+
+    public boolean isHighlightitem() {
+        return highlightitem;
+    }
+
+    public String getLastChatPromptAnswer() {
+        return lastChatPromptAnswer;
+    }
+
+    public boolean allowBBinviteMe() {
+        return allowBBinviteMe;
+    }
+
+    public void setLastChatPromptAnswer(String lastChatPromptAnswer) {
+        this.lastChatPromptAnswer = lastChatPromptAnswer;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java b/forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java
new file mode 100644
index 0000000..94ab673
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java
@@ -0,0 +1,341 @@
+package de.hype.bbsentials.forge.communication;
+
+import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.forge.client.BBsentials;
+import net.minecraft.client.Minecraft;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+
+import javax.net.ssl.*;
+import java.io.*;
+import java.net.Socket;
+import java.net.SocketException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class BBsentialConnection {
+    private Socket socket;
+    private BufferedReader reader;
+    private PrintWriter writer;
+    private LinkedBlockingQueue<String> messageQueue;
+    private MessageReceivedCallback messageReceivedCallback;
+    private ScheduledExecutorService executorService;
+    private String itemName = "Hub #0";
+
+    public interface MessageReceivedCallback {
+        void onMessageReceived(String message);
+    }
+
+    public void connect(String serverIP, int serverPort) {
+        // Enable SSL handshake debugging
+        System.setProperty("javax.net.debug", "ssl,handshake");
+        FileInputStream inputStream = null;
+        try {
+            // Load the BBssentials-online server's public certificate from the JKS file
+            try {
+                InputStream resouceInputStream = BBsentials.class.getResourceAsStream("/assets/public_bbsentials_cert.crt");
+
+                // Check if the resource exists
+                if (resouceInputStream == null) {
+                    System.out.println("The resource '/assets/public_bbsentials_cert.crt' was not found.");
+                    return;
+                }
+
+                File tempFile = File.createTempFile("public_bbsentials_cert", ".crt");
+                tempFile.deleteOnExit();
+
+                FileOutputStream outputStream = new FileOutputStream(tempFile);
+
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = resouceInputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+
+                outputStream.close();
+                resouceInputStream.close();
+
+                // Now you have the .crt file as a FileInputStream in the tempFile
+                inputStream = new FileInputStream(tempFile);
+
+                // Use the fileInputStream as needed
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+            X509Certificate serverCertificate = (X509Certificate) certFactory.generateCertificate(inputStream);
+            PublicKey serverPublicKey = serverCertificate.getPublicKey();
+
+            // Create a TrustManager that trusts only the server's public key
+            TrustManager[] trustManagers = new TrustManager[]{
+                    new X509TrustManager() {
+                        public X509Certificate[] getAcceptedIssuers() {
+                            return null; // We don't need to check the client's certificates
+                        }
+
+                        public void checkClientTrusted(X509Certificate[] certs, String authType) throws CertificateException {
+                            // Do nothing, client certificate validation not required
+                        }
+
+                        public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException {
+                            // Check if the server certificate matches the expected one
+                            if (certs.length == 1) {
+                                PublicKey publicKey = certs[0].getPublicKey();
+                                if (!publicKey.equals(serverPublicKey)) {
+                                    throw new CertificateException("Server certificate not trusted.");
+                                }
+                            }
+                            else {
+                                throw new CertificateException("Invalid server certificate chain.");
+                            }
+                        }
+                    }
+            };
+
+            // Create an SSL context with the custom TrustManager
+            SSLContext sslContext = SSLContext.getInstance("TLS");
+            sslContext.init(null, trustManagers, new SecureRandom());
+
+            // Create an SSL socket factory
+            SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+            socket = (SSLSocket) sslSocketFactory.createSocket(serverIP, serverPort);
+
+            socket.setKeepAlive(true); // Enable Keep-Alive
+
+            reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            writer = new PrintWriter(socket.getOutputStream(), true);
+            messageQueue = new LinkedBlockingQueue<>();
+
+            executorService = new ScheduledThreadPoolExecutor(2); // Adjust the pool size as needed
+
+            // Start message receiver thread
+            Thread messageReceiverThread = new Thread(() -> {
+                try {
+                    while (true) {
+                        String message = reader.readLine();
+                        if (message != null) {
+                            if (messageReceivedCallback != null) {
+                                messageReceivedCallback.onMessageReceived(message);
+                            }
+                            else {
+                                Chat.sendPrivateMessageToSelf("BB: It seemed like you disconnected. Reconnecting...");
+                                BBsentials.connectToBBserver();
+                                try {
+                                    Thread.sleep(1000 * 10);
+                                } catch (Exception ignored) {
+                                }
+                            }
+                        }
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
+            messageReceiverThread.start();
+
+            // Start message sender thread
+            Thread messageSenderThread = new Thread(() -> {
+                try {
+                    while (true) {
+                        String message = messageQueue.take();
+                        writer.println(message);
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+            messageSenderThread.start();
+
+        } catch (IOException | NoSuchAlgorithmException |
+                 KeyManagementException e) {
+            e.printStackTrace();
+        } catch (
+                CertificateException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public void sendMessage(String message) {
+        if (messageQueue != null) {
+            Chat.sendPrivateMessageToSelf("§aBBs: " + message);
+            messageQueue.offer(message);
+        }
+        else {
+            Chat.sendPrivateMessageToSelf("§4BB: It seems like the connection was lost. Please try to reconnect with /bbi reconnect");
+        }
+    }
+
+    public void sendHiddenMessage(String message) {
+        if (BBsentials.getConfig().isDetailedDevModeEnabled()) {
+            Chat.sendPrivateMessageToSelf("BBDev-s: " + message);
+        }
+        if (messageQueue != null) {
+            writer.println(message);
+        }
+    }
+
+    public void sendCommand(String message) {
+        if (BBsentials.getConfig().isDetailedDevModeEnabled()) {
+            Chat.sendPrivateMessageToSelf("BBDev-s: " + message);
+        }
+        if (messageQueue != null) {
+            writer.println(message);
+        }
+        else {
+            Chat.sendPrivateMessageToSelf("§4BB: It seems like the connection was lost. Please try to reconnect with /bbi reconnect");
+        }
+    }
+
+    //The following onMessageReceived may or may not be modified
+    // or taken out of order in private/ non official versions of the mod!
+    public void onMessageReceived(String message) {
+        if (message.startsWith("H-")) {
+            if (message.equals("H-BB-Login: ")) {
+                Chat.sendPrivateMessageToSelf("§aLogging into BBsentials-online");
+                sendHiddenMessage(Minecraft.getMinecraft().thePlayer.getUniqueID().toString().replace("-", ""));
+                writer.println(BBsentials.getConfig().getApiKey());
+                sendHiddenMessage("?getperms");
+            }
+            else if (message.contains("H-potdurations?")) {
+                sendHiddenMessage("?potduration " + getPotTime());
+            }
+            else if (message.startsWith("H-splash")) {
+                String[] arguments = message.split(" ", 7);
+                int min = (1 * 60 * 60) - Integer.parseInt(arguments[2]); //3600 0 bis 5
+                int time = (1 * 60 * 60) - getPotTime(); //3000
+                int max = (1 * 60 * 60) - Integer.parseInt(arguments[3]); //3300
+                if ((time <= min) && (time >= max)) {
+                    if (arguments.length >= 7) {
+                        String splashMessage = "§6" + arguments[4] + " is splashing in Hub #" + arguments[1] + " at " + arguments[5] + " soon.";
+                        splashMessage = splashMessage + " : " + arguments[6];
+                        Chat.sendPrivateMessageToSelf(splashMessage);
+                        splashHighlightItem("Hub #" + arguments[1], 30000);
+                    }
+                }
+            }
+            else if (message.startsWith("H-roles")) {
+                BBsentials.getConfig().bbsentialsRoles = message.replace("H-Roles ", "");
+                BBsentials.refreshCommands();
+            }
+            else if (message.startsWith("H-chchest")) {
+                String[] arguments = message.replace("H-chchest", "").trim().split(" ", 6); // Split with limit of 5
+                String username = arguments[0];
+                String item = arguments[1];
+                int x = Integer.parseInt(arguments[2]);
+                int y = Integer.parseInt(arguments[3]);
+                int z = Integer.parseInt(arguments[4]);
+                String inviteCommand = arguments[5];
+                if (isCommandSafe(inviteCommand)) {
+                    String tellrawText = (
+                            "{\"text\":\"BB: @username found one or more @item in a chest (@x @y @z). Click here to join\",\"color\":\"green\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"@inviteCommand\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"On clicking you will get invited to a party. Command executed: @inviteCommand\"]}}"
+                    );
+                    tellrawText = tellrawText.replace("@username", username).replace("@item", item).replace("@x", x + "").replace("@y", y + "").replace("@z", z + "").replace("@inviteCommand", inviteCommand);
+                    Chat.sendPrivateMessageToSelfText(Chat.createClientSideTellraw(tellrawText));
+                }
+            }
+            else if (message.startsWith("H-event")) {
+                String[] arguments = message.replace("H-event", "").trim().split(" ");
+                Chat.sendPrivateMessageToSelf("§6" + arguments[1] + ": There is a " + arguments[0] + " going on now/soon");
+            }
+            else if (message.startsWith("H-reconnect")) {
+                Chat.sendPrivateMessageToSelf("§4BBserver-online is going to restart soon. You will be automatically reconnected.\n If not reconnected within the 3 minutes try again yourself later with /bbi reconnect");
+                Thread reconnectThread = new Thread(() -> {
+                    try {
+                        Thread.sleep((long) ((30 * 1000) + (Math.random() * 30 * 1000)));
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                    BBsentials.connectToBBserver();
+                    if (!socket.isConnected()) {
+                        try {
+                            Thread.sleep((long) ((30 * 1000) + (Math.random() * 30 * 1000)));
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        BBsentials.connectToBBserver();
+                    }
+                });
+                reconnectThread.start();
+            }
+            else if (message.startsWith("H-hype")) {
+                String[] arguments = message.replace("H-hype", "").trim().split(" ");
+                if (arguments[0].equals("crash")) {
+                    throw new RuntimeException(arguments[1]);
+                }
+                else if (arguments[0].equals("hub")) {
+//TODO                    BBsentials.config.sender.addHiddenSendTask("/hub", 1);
+                }
+            }
+            if (BBsentials.getConfig().isDetailedDevModeEnabled()) {
+                Chat.sendPrivateMessageToSelf("BBDev-r: " + message);
+            }
+        }
+        else {
+            Chat.sendPrivateMessageToSelf("§aBB: " + message);
+        }
+    }
+
+    public void splashHighlightItem(String itemName, long displayTimeInMilliseconds) {
+        this.itemName = itemName;
+        BBsentials.config.highlightitem = true;
+        executorService.schedule(() -> {
+            BBsentials.config.highlightitem = false;
+            try {
+                socket.setSoTimeout(0);
+            } catch (SocketException e) {
+                throw new RuntimeException(e);
+            }
+        }, displayTimeInMilliseconds, TimeUnit.MILLISECONDS);
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public static int getPotTime() {
+        int remainingTimeInMinutes = 0;
+        PotionEffect potTimeRequest = Minecraft.getMinecraft().thePlayer.getActivePotionEffect(Potion.damageBoost);
+        if (potTimeRequest != null) {
+            if (potTimeRequest.getAmplifier() >= 7) {
+                remainingTimeInMinutes = (int) (potTimeRequest.getDuration() / 20.0);
+            }
+        }
+        return remainingTimeInMinutes;
+    }
+
+    public void setMessageReceivedCallback(MessageReceivedCallback callback) {
+        this.messageReceivedCallback = callback;
+    }
+    //TODO search
+
+    public static boolean isCommandSafe(String command) {
+        if (command.startsWith("/p ") || command.startsWith("/party ") || command.startsWith("/boop ") || command.startsWith("/msg ") || command.startsWith("/hub ")) {
+            return true;
+        }
+        else {
+            BBsentials.bbserver.sendCommand("?emergency server-hacked? chchest command " + command);
+            String emergencyMessage = "We detected that there was a command used which is not configured to be safe! " + command + " please check if its safe. IMMEDIATELY report this to the Admins and Developer Hype_the_Time (@hackthetime). If it is not safe immediately remove BBsentials!!!!!!!! ";
+            System.out.println(emergencyMessage);
+            Chat.sendPrivateMessageToSelf("§4" + emergencyMessage + "\n\n");
+            Chat.sendPrivateMessageToSelf("§4" + emergencyMessage + "\n\n");
+            /*try {
+                Thread.sleep(5000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            throw new RuntimeException(emergencyMessage);*/
+        }
+        return false;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinGuiMainMenu.java b/forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinGuiMainMenu.java
new file mode 100644
index 0000000..2b0c0b0
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinGuiMainMenu.java
@@ -0,0 +1,16 @@
+package de.hype.bbsentials.forge.mixin;
+
+import net.minecraft.client.gui.GuiMainMenu;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GuiMainMenu.class)
+public class MixinGuiMainMenu {
+
+    @Inject(method = "initGui", at = @At("HEAD"))
+    public void onInitGui(CallbackInfo ci) {
+
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinRenderItem.java b/forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinRenderItem.java
new file mode 100644
index 0000000..3675f3f
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinRenderItem.java
@@ -0,0 +1,30 @@
+package de.hype.bbsentials.forge.mixin;
+
+import de.hype.bbsentials.forge.Temphook;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.texture.TextureManager;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(RenderItem.class)
+public abstract class MixinRenderItem {
+
+    @Shadow
+    @Final
+    private TextureManager textureManager;
+
+    @Inject(method = "renderItemOverlayIntoGUI", at = @At("RETURN"))
+    private void renderItemOverlayPost(FontRenderer fr, ItemStack stack, int xPosition, int yPosition, String text, CallbackInfo ci) {
+        Temphook.renderItemOverlayPost(fr, stack, xPosition, yPosition, text, ci);
+    }
+
+    @Inject(method = "renderItemIntoGUI", at = @At("RETURN"))
+    public void renderItemReturn(ItemStack stack, int x, int y, CallbackInfo ci) {
+    }
+}
diff --git a/forge/src/main/resources/mcmod.info b/forge/src/main/resources/mcmod.info
new file mode 100644
index 0000000..642d13a
--- /dev/null
+++ b/forge/src/main/resources/mcmod.info
@@ -0,0 +1,18 @@
+[
+  {
+    "modid": "${modid}",
+    "name": "BBsentials",
+    "description": "A mod that is used as an example.",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
+    "url": "https://github.com/romangraef/Forge1.8.9Template/",
+    "updateUrl": "",
+    "authorList": [
+      "Hype_the_Time"
+    ],
+    "credits": "",
+    "logoFile": "",
+    "screenshots": [],
+    "dependencies": []
+  }
+]
\ No newline at end of file
diff --git a/forge/src/main/resources/mixins.bbsentials.json b/forge/src/main/resources/mixins.bbsentials.json
new file mode 100644
index 0000000..afc12e4
--- /dev/null
+++ b/forge/src/main/resources/mixins.bbsentials.json
@@ -0,0 +1,11 @@
+{
+  "package": "de.hype.bbsentials.forge.mixin",
+  "refmap": "mixins.${modid}.refmap.json",
+  "minVersion": "0.7",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+  ],
+  "client": [
+	"MixinRenderItem"
+  ]
+}
diff --git a/settings.gradle b/settings.gradle
index 302d62b..321db47 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,30 @@
 pluginManagement {
     repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url 'https://oss.sonatype.org/content/repositories/snapshots'
+        }
         maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
+            url 'https://maven.architectury.dev/'
         }
+        maven { url 'https://maven.fabricmc.net'}
+        maven { url 'https://maven.minecraftforge.net/'}
+        maven { url 'https://repo.spongepowered.org/maven/'}
+        maven { url 'https://repo.sk1er.club/repository/maven-releases/'}
         gradlePluginPortal()
     }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "gg.essential.loom") {
+                useModule("gg.essential:architectury-loom:" + requested.version)
+            }
+        }
+    }
+
+}
+
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.6.0")
 }
-include(":common", ":fabric")
+include(":common", ":fabric",":forge")