more changes

52 files changed, 156 insertions, 219 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