more changes

77 files changed, 655 insertions, 221 deletions

diff --git a/common/build.gradle b/common/build.gradle
index 4a48098..1bc4def 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -15,7 +15,6 @@ dependencies {
     implementation("org.apache.httpcomponents:httpclient:4.5.13")
     implementation("com.google.code.gson:gson:2.10.1")
     implementation("org.lwjgl:lwjgl-glfw:3.3.3")
-    // Add your common dependencies for Forge and any other libraries here.
 }
 
 processResources {
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java b/common/src/main/java/de/hype/bbsentials/common/api/Discord.java
index 0093305..6b2f468 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java
+++ b/common/src/main/java/de/hype/bbsentials/common/api/Discord.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.api;
+package de.hype.bbsentials.common.api;
 
-import de.hype.bbsentials.forge.common.chat.Chat;
-import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.common.chat.Chat;
+import de.hype.bbsentials.common.client.BBsentials;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/api/Formatting.java b/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java
index 9118533..c8702d4 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/api/Formatting.java
+++ b/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.api;
+package de.hype.bbsentials.common.api;
 
 public enum Formatting{
     BLACK("§0"),
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java b/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java
index fcaf70e..28808d9 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java
+++ b/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.api;
+package de.hype.bbsentials.common.api;
 
 public interface ISimpleOption {
     void set(Object value);
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java
index a9562ef..669dd5d 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java
+++ b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.forge.common.chat;
+package de.hype.bbsentials.common.chat;
 
-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 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 javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/chat/Message.java b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java
index 5c5769b..66a3599 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/chat/Message.java
+++ b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.chat;
+package de.hype.bbsentials.common.chat;
 
-import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.common.client.BBsentials;
 
 public class Message {
     private String text;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/chat/Sender.java b/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java
index 742c18a..9bdde1f 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/chat/Sender.java
+++ b/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java
@@ -1,13 +1,13 @@
-package de.hype.bbsentials.forge.common.chat;
+package de.hype.bbsentials.common.chat;
 
-import de.hype.bbsentials.forge.common.api.Formatting;
-import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.common.api.Formatting;
+import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static de.hype.bbsentials.forge.common.chat.Chat.sendPrivateMessageToSelfInfo;
-import static de.hype.bbsentials.forge.common.chat.Chat.sendPrivateMessageToSelfText;
+import static de.hype.bbsentials.common.chat.Chat.sendPrivateMessageToSelfInfo;
+import static de.hype.bbsentials.common.chat.Chat.sendPrivateMessageToSelfText;
 
 public class Sender {
     private final List<String> sendQueue;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/BBsentials.java b/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java
index 24ef170..b694add 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/BBsentials.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
-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 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 java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/Commands/Commands.java b/common/src/main/java/de/hype/bbsentials/common/client/Commands/Commands.java
index 804e816..deb4dda 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/Commands/Commands.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/Commands/Commands.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.common.client.Commands;
+package de.hype.bbsentials.common.client.Commands;
 
-import de.hype.bbsentials.forge.common.client.Config;
-import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.common.client.Config;
+import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
 
-import static de.hype.bbsentials.forge.common.client.BBsentials.getConfig;
+import static de.hype.bbsentials.common.client.BBsentials.getConfig;
 public class Commands {
     public Commands() {
         EnvironmentCore.commands.registerMain();
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/Config.java b/common/src/main/java/de/hype/bbsentials/common/client/Config.java
index abe7e23..a23fe62 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/Config.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/Config.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import de.hype.bbsentials.forge.common.chat.Sender;
-import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.common.chat.Sender;
+import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
 
 import java.io.*;
 import java.time.LocalDate;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/CustomGson.java b/common/src/main/java/de/hype/bbsentials/common/client/CustomGson.java
index 71870c8..31f2626 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/CustomGson.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/CustomGson.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/DebugThread.java b/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java
index db2b692..d51fcec 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/DebugThread.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
 
 import java.util.List;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashManager.java b/common/src/main/java/de/hype/bbsentials/common/client/SplashManager.java
index 7495559..5d7d464 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashManager.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/SplashManager.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
-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 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 java.util.HashMap;
 import java.util.Map;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashStatusUpdateListener.java b/common/src/main/java/de/hype/bbsentials/common/client/SplashStatusUpdateListener.java
index 8054818..5ea2384 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/SplashStatusUpdateListener.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/SplashStatusUpdateListener.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
-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 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 java.util.concurrent.TimeUnit;
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/client/ToDisplayConfig.java b/common/src/main/java/de/hype/bbsentials/common/client/ToDisplayConfig.java
index 603fccb..8e8998c 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/client/ToDisplayConfig.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/ToDisplayConfig.java
@@ -1,8 +1,8 @@
-package de.hype.bbsentials.forge.common.client;
+package de.hype.bbsentials.common.client;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/communication/BBsentialConnection.java b/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java
index 1603a24..76ee4bd 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/communication/BBsentialConnection.java
+++ b/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java
@@ -1,16 +1,16 @@
-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.*;
+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.*;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProvider.java b/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProvider.java
index 7728b99..ca3aa36 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProvider.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProvider.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.constants;
+package de.hype.bbsentials.common.constants;
 
 public interface BBDisplayNameProvider {
     String getDisplayName();
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProviderWithCustom.java b/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProviderWithCustom.java
index c1508c3..43cb5ac 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProviderWithCustom.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProviderWithCustom.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.constants;
+package de.hype.bbsentials.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/forge/common/constants/enviromentShared/AuthenticationConstants.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/AuthenticationConstants.java
index cbb1bc0..52f1ea1 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/AuthenticationConstants.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/AuthenticationConstants.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
 public class AuthenticationConstants {
     //Authentication Types
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItem.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItem.java
index 8c1cf20..b937367 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItem.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItem.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
 public class ChChestItem {
     private String displayName;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItems.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItems.java
index 0301356..0a12742 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItems.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItems.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/EnumUtils.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/EnumUtils.java
index 3664d4f..5214f65 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/EnumUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/EnumUtils.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
-import de.hype.bbsentials.forge.common.constants.BBDisplayNameProvider;
-import de.hype.bbsentials.forge.common.constants.BBDisplayNameProviderWithCustom;
+import de.hype.bbsentials.common.constants.BBDisplayNameProvider;
+import de.hype.bbsentials.common.constants.BBDisplayNameProviderWithCustom;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/InternalReasonConstants.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/InternalReasonConstants.java
index 35b710e..43835c6 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/InternalReasonConstants.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/InternalReasonConstants.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
 public enum InternalReasonConstants {
     INVALID_PARAMETER,
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/Islands.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/Islands.java
index 6a1e5f1..e2e914c 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/Islands.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/Islands.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
-import de.hype.bbsentials.forge.common.constants.BBDisplayNameProvider;
+import de.hype.bbsentials.common.constants.BBDisplayNameProvider;
 
 public enum Islands implements BBDisplayNameProvider {
     CRYSTAL_HOLLOWS("crystal_hollows", "Crystal Hollows"),
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/MiningEvents.java b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/MiningEvents.java
index c6baf87..5f6e99e 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/MiningEvents.java
+++ b/common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/MiningEvents.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.constants.enviromentShared;
+package de.hype.bbsentials.common.constants.enviromentShared;
 
-import de.hype.bbsentials.forge.common.constants.BBDisplayNameProvider;
+import de.hype.bbsentials.common.constants.BBDisplayNameProvider;
 
 // Mining Events
 public enum MiningEvents implements BBDisplayNameProvider {
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/BBUtils.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/BBUtils.java
index 1c7f1b4..b2c9559 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/BBUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/BBUtils.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.mclibraries;
+package de.hype.bbsentials.common.mclibraries;
 
-import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.common.constants.enviromentShared.Islands;
 
 import java.util.List;
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/EnvironmentCore.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java
index 377c25b..f7e2eab 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/EnvironmentCore.java
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.mclibraries;
+package de.hype.bbsentials.common.mclibraries;
 
 
-import de.hype.bbsentials.forge.common.client.DebugThread;
+import de.hype.bbsentials.common.client.DebugThread;
 
 public class EnvironmentCore {
     public static MCCommand commands;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCChat.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCChat.java
index c4abda0..eeb89fe 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCChat.java
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCChat.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.mclibraries;
+package de.hype.bbsentials.common.mclibraries;
 
-import de.hype.bbsentials.forge.common.chat.Message;
+import de.hype.bbsentials.common.chat.Message;
 
 public interface MCChat {
     void init();
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCCommand.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCCommand.java
index a82fb86..133cff0 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCCommand.java
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCCommand.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.mclibraries;
+package de.hype.bbsentials.common.mclibraries;
 
 public interface MCCommand {
     public void registerMain();
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCUtils.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java
index ab11bfc..493785a 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.mclibraries;
+package de.hype.bbsentials.common.mclibraries;
 
 import java.io.File;
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/Options.java b/common/src/main/java/de/hype/bbsentials/common/mclibraries/Options.java
index 6d6f125..b5cb014 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/Options.java
+++ b/common/src/main/java/de/hype/bbsentials/common/mclibraries/Options.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.mclibraries;
+package de.hype.bbsentials.common.mclibraries;
 
 public interface Options {
     void setFov(int value);
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/AbstractPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/AbstractPacket.java
index 7b2e74b..7328517 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/AbstractPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/AbstractPacket.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.forge.common.packets;
+package de.hype.bbsentials.common.packets;
 
-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 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 java.lang.reflect.Field;
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/EnviromentPacketConfig.java b/common/src/main/java/de/hype/bbsentials/common/packets/EnviromentPacketConfig.java
index 8d95998..ee82d32 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/EnviromentPacketConfig.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/EnviromentPacketConfig.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.packets;
+package de.hype.bbsentials.common.packets;
 
 public class EnviromentPacketConfig {
     public static final String enviroment = "Client";
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/Packet.java b/common/src/main/java/de/hype/bbsentials/common/packets/Packet.java
index 0724cd2..f184578 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/Packet.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/Packet.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.forge.common.packets;
+package de.hype.bbsentials.common.packets;
 
 import java.util.function.Consumer;
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketManager.java b/common/src/main/java/de/hype/bbsentials/common/packets/PacketManager.java
index 2641f4a..23368d8 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketManager.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/PacketManager.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets;
+package de.hype.bbsentials.common.packets;
 
-import de.hype.bbsentials.forge.common.communication.BBsentialConnection;
-import de.hype.bbsentials.forge.common.packets.packets.*;
+import de.hype.bbsentials.common.communication.BBsentialConnection;
+import de.hype.bbsentials.common.packets.packets.*;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketUtils.java b/common/src/main/java/de/hype/bbsentials/common/packets/PacketUtils.java
index 7b9ade4..bc5f9b0 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketUtils.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/PacketUtils.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.forge.common.packets;
+package de.hype.bbsentials.common.packets;
 
 import com.google.gson.Gson;
-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 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 java.util.function.Consumer;
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BingoChatMessagePacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/BingoChatMessagePacket.java
index cd2e945..c7432da 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BingoChatMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/BingoChatMessagePacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class BingoChatMessagePacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BroadcastMessagePacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/BroadcastMessagePacket.java
index 88cf5cf..bbd6d90 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BroadcastMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/BroadcastMessagePacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class BroadcastMessagePacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/ChChestPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java
index 9cd41f8..7355397 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/ChChestPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.constants.enviromentShared.ChChestItem;
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.constants.enviromentShared.ChChestItem;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class ChChestPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisconnectPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisconnectPacket.java
index 7b8782e..ca60a49 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisconnectPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisconnectPacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.constants.enviromentShared.InternalReasonConstants;
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.constants.enviromentShared.InternalReasonConstants;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class DisconnectPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisplayTellrawMessagePacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisplayTellrawMessagePacket.java
index ab3ddf4..e3e7f70 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisplayTellrawMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/DisplayTellrawMessagePacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class DisplayTellrawMessagePacket extends AbstractPacket {
     public final String rawJson;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InternalCommandPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/InternalCommandPacket.java
index b1f7c25..fb7a774 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InternalCommandPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/InternalCommandPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.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/forge/common/packets/packets/InvalidCommandFeedbackPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/InvalidCommandFeedbackPacket.java
index 1394a11..2f4510e 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InvalidCommandFeedbackPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/InvalidCommandFeedbackPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class InvalidCommandFeedbackPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/MiningEventPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/MiningEventPacket.java
index 67a88da..9d9be62 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/MiningEventPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/MiningEventPacket.java
@@ -1,8 +1,8 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-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;
+import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.common.constants.enviromentShared.MiningEvents;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class MiningEventPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PartyPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/PartyPacket.java
index b536d6d..48a36f4 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PartyPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/PartyPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class PartyPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PunishUserPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/PunishUserPacket.java
index d807ad8..dce052f 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PunishUserPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/PunishUserPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.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/forge/common/packets/packets/RequestConnectPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/RequestConnectPacket.java
index 705e2f5..9ce468a 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/RequestConnectPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/RequestConnectPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class RequestConnectPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashNotifyPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashNotifyPacket.java
index ad3e459..427e4f2 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashNotifyPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashNotifyPacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class SplashNotifyPacket extends AbstractPacket {
 
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashUpdatePacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashUpdatePacket.java
index f0e306b..9645daf 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashUpdatePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashUpdatePacket.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.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/forge/common/packets/packets/SystemMessagePacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/SystemMessagePacket.java
index 3ec68c1..13b92d4 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SystemMessagePacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/SystemMessagePacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class SystemMessagePacket extends AbstractPacket {
     public final String message;
diff --git a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/WelcomeClientPacket.java b/common/src/main/java/de/hype/bbsentials/common/packets/packets/WelcomeClientPacket.java
index 01e743d..00aa003 100644
--- a/common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/WelcomeClientPacket.java
+++ b/common/src/main/java/de/hype/bbsentials/common/packets/packets/WelcomeClientPacket.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.common.packets.packets;
+package de.hype.bbsentials.common.packets.packets;
 
-import de.hype.bbsentials.forge.common.packets.AbstractPacket;
+import de.hype.bbsentials.common.packets.AbstractPacket;
 
 public class WelcomeClientPacket extends AbstractPacket {
 
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 8200bfb..dc55ca6 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -76,12 +76,7 @@ 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 {
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 d0442cc..5dca4ac 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.forge.common.chat.Chat;
-import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.common.chat.Chat;
+import de.hype.bbsentials.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.forge.common.mclibraries.BBUtils {
+public class BBUtils implements de.hype.bbsentials.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 64775db..a723284 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.forge.common.client.BBsentials;
-import de.hype.bbsentials.forge.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.common.client.BBsentials;
+import de.hype.bbsentials.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 d4f1369..e23d76b 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.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 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 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 eaf4f61..1752492 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.forge.common.client.DebugThread {
+public class DebugThread implements de.hype.bbsentials.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 8e538a6..0244181 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.forge.common.chat.Chat;
-import de.hype.bbsentials.forge.common.chat.Message;
-import de.hype.bbsentials.forge.common.mclibraries.MCChat;
+import de.hype.bbsentials.common.chat.Chat;
+import de.hype.bbsentials.common.chat.Message;
+import de.hype.bbsentials.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 5230f2e..149b72a 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.forge.common.mclibraries.MCUtils {
+public class MCUtils implements de.hype.bbsentials.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 7769582..2e7b4fe 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.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 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 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.forge.common.client.BBsentials.*;
+import static de.hype.bbsentials.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 4d519bb..3d7cbe3 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.forge.common.api.ISimpleOption;
+import de.hype.bbsentials.common.api.ISimpleOption;
 import net.minecraft.client.MinecraftClient;
 
-public class Options implements de.hype.bbsentials.forge.common.mclibraries.Options {
+public class Options implements de.hype.bbsentials.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 2207c5a..0c6a2bb 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.forge.common.client.BBsentials;
+import de.hype.bbsentials.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 64c90b2..711ac09 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.forge.common.api.ISimpleOption;
+import de.hype.bbsentials.common.api.ISimpleOption;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.SimpleOption;
 import org.spongepowered.asm.mixin.Final;
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
index 6f42b2c..9f2eedc 100644
--- a/forge/build.gradle.kts
+++ b/forge/build.gradle.kts
@@ -42,9 +42,6 @@ loom {
     }
 }
 
-sourceSets.main {
-    output.resourcesDir = file("$buildDir/classes/java/main")
-}
 
 // Dependencies:
 
@@ -53,6 +50,7 @@ repositories {
     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 {
@@ -60,6 +58,7 @@ val shadowImpl: Configuration by configurations.creating {
 }
 
 dependencies {
+    implementation(project(":common"))
     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")
@@ -131,5 +130,4 @@ tasks.shadowJar {
     fun relocate(name: String) = relocate(name, "$baseGroup.deps.$name")
 }
 
-tasks.assemble.get().dependsOn(tasks.remapJar)
-
+tasks.assemble.get().dependsOn(tasks.remapJar)
\ No newline at end of file
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java b/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java
new file mode 100644
index 0000000..a6b2a3e
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java
@@ -0,0 +1,66 @@
+package de.hype.bbsentials.forge;
+
+import com.google.common.collect.Lists;
+import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.chat.Chat;
+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 Islands getCurrentIsland() {
+        try {
+            String string = MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-b").getDisplayName().getString();
+            if (!string.startsWith("Area: ")) {
+                Chat.sendPrivateMessageToSelfError("Could not get Area data. Are you in Skyblock?");
+            }
+            else {
+                return Islands.getByDisplayName(string.replace("Area: ", "").trim());
+            }
+        } catch (Exception e) {
+        }
+        return null;
+    }
+
+    public int getPlayerCount() {
+        return Integer.parseInt(MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!B-a").getDisplayName().getString().trim().replaceAll("[^0-9]", ""));
+    }
+
+    public String getServer() {
+        return MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-c").getDisplayName().getString().replace("Server:", "").trim();
+    }
+
+    public boolean isOnMegaServer() {
+        return getServer().toLowerCase().startsWith("mega");
+    }
+
+    public boolean isOnMiniServer() {
+        return getServer().toLowerCase().startsWith("mini");
+    }
+
+    public int getMaximumPlayerCount() {
+        boolean mega = isOnMegaServer();
+        Islands island = getCurrentIsland();
+        if (island == null) return 100;
+        if (island.equals(Islands.HUB)) {
+            if (mega) return 80;
+            else return 24;
+        }
+        return 24;
+    }
+
+    public List<String> getPlayers() {
+        List<String> list = Lists.newArrayList();
+        Iterator var2 = MinecraftClient.getInstance().getNetworkHandler().getPlayerList().iterator();
+        while (var2.hasNext()) {
+            PlayerListEntry playerListEntry = (PlayerListEntry) var2.next();
+            String playerName = playerListEntry.getProfile().getName();
+            if (!playerName.startsWith("!")) {
+                list.add(playerName);
+            }
+        }
+        return list;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/Commands.java b/forge/src/main/java/de/hype/bbsentials/forge/Commands.java
new file mode 100644
index 0000000..a5af004
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/Commands.java
@@ -0,0 +1,313 @@
+package de.hype.bbsentials.forge;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+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.forge.chat.Chat;
+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;
+import net.fabricmc.fabric.api.event.Event;
+import net.minecraft.command.CommandSource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class Commands implements MCCommand {
+    Event<ClientCommandRegistrationCallback> event = ClientCommandRegistrationCallback.EVENT;
+    public void registerMain(){
+        event.register((dispatcher, registryAccess) -> {
+            dispatcher.register(ClientCommandManager.literal("creport")
+                    .then(ClientCommandManager.argument("Player_Name", StringArgumentType.string())
+                            .executes((context) -> {
+                                String playerName = StringArgumentType.getString(context, "Player_Name");
+                                BBsentials.getConfig().sender.addSendTask("/creport " + playerName, 0);
+                                BBsentials.getConfig().addReported(playerName);
+                                return 1;
+                            })));
+        });//creport helper → no double report during same launch
+        event.register((dispatcher, registryAccess) -> {
+            miningEvent(dispatcher, "goblinraid", MiningEvents.GOBLIN_RAID);
+        });/*goblinraid*/
+        event.register((dispatcher, registryAccess) -> {
+            miningEvent(dispatcher, "2xpowder", MiningEvents.DOUBLE_POWDER);
+        });/*2xpowder*/
+        event.register((dispatcher, registryAccess) -> {
+            miningEvent(dispatcher, "bettertogether", MiningEvents.BETTER_TOGETHER);
+        });/*b2g*/
+        event.register((dispatcher, registryAccess) -> {
+            miningEvent(dispatcher, "raffle", MiningEvents.RAFFLE);
+        });/*raffle*/
+        event.register((dispatcher, registryAccess) -> {
+            miningEvent(dispatcher, "gonewiththewind", MiningEvents.GONE_WITH_THE_WIND);
+        });/*gonewiththewind*/
+        event.register((dispatcher, registryAccess) -> {
+            miningEvent(dispatcher, "mithrilgourmand", MiningEvents.MITHRIL_GOURMAND);
+        });/*gonewiththewind*/
+        event.register((dispatcher, registryAccess) -> {
+            dispatcher.register(ClientCommandManager.literal("chchest")
+                    .then(ClientCommandManager.argument("Item", StringArgumentType.string())
+                            .suggests((context, builder) -> {
+                                String[] items = new String[]{"PrehistoricEgg", "Pickonimbus2000", "ElectronTransmitter", "FTX3070", "RobotronReflector", "ControlSwitch", "SyntheticHeart", "SuperliteMotor", "BlueGoblinEgg", "YellowGoblinEgg", "FlawlessAmberGemstone", "FlawlessJadeGemstone", "FlawlessSapphireGemstone", "FlawlessRubyGemstone", "FlawlessAmethystGemstone", "JungleHeart", "FlawlessTopazGemstone", "FlawlessJasperGemstone"};
+                                String input = builder.getRemaining().toLowerCase();
+                                int lastSemicolonIndex = input.lastIndexOf(";");
+                                List<String> suggestions = new ArrayList<>();
+                                if (lastSemicolonIndex >= 0) {
+                                    String inputBeforeSemicolon = input.substring(0, lastSemicolonIndex + 1); // Include the semicolon
+
+                                    for (String item : items) {
+                                        suggestions.add(inputBeforeSemicolon + item);
+                                    }
+                                }
+                                return CommandSource.suggestMatching(suggestions, builder);
+                            })
+                            .then(ClientCommandManager.argument("X", IntegerArgumentType.integer())
+                                    .then(ClientCommandManager.argument("Y", IntegerArgumentType.integer())
+                                            .then(ClientCommandManager.argument("Z", IntegerArgumentType.integer())
+                                                    .then(ClientCommandManager.argument("ContactWay", StringArgumentType.string())
+                                                            .suggests(((context, builder) -> {
+                                                                return CommandSource.suggestMatching(new String[]{"\"/msg " + BBsentials.getConfig().getUsername() + " bb:party me\"", "\"/p join " + BBsentials.config.getUsername() + "\""}, builder);
+                                                            }))
+                                                            .executes((context) -> {
+                                                                        String item = StringArgumentType.getString(context, "Item");
+                                                                        int x = IntegerArgumentType.getInteger(context, "X");
+                                                                        int y = IntegerArgumentType.getInteger(context, "Y");
+                                                                        int z = IntegerArgumentType.getInteger(context, "Z");
+                                                                        String contactWay = StringArgumentType.getString(context, "ContactWay");
+
+                                                                        sendPacket(new ChChestPacket("", ChChestItems.getItem(item.split(";")), x + " " + y + " " + z, contactWay, ""));
+                                                                        return 1;
+                                                                    }
+                                                            )
+                                                    )
+                                            )
+                                    )
+                            )
+                    )
+            );
+        });/*chchest*/
+        event.register((dispatcher, registryAccess) -> {
+            dispatcher.register(
+                    ClientCommandManager.literal("bc")
+                            .then(ClientCommandManager.argument("Message to Bingo Chat", StringArgumentType.greedyString())
+                                    .executes((context) -> {
+                                        String message = StringArgumentType.getString(context, "Message to Bingo Chat");
+                                        sendPacket(new BingoChatMessagePacket("", "", message, 0));
+                                        return 1;
+                                    })
+                            )
+            );
+        });/*BincoChatShort*/
+        event.register((dispatcher, registryAccess) -> {
+            dispatcher.register(
+                    ClientCommandManager.literal("bingochat")
+                            .then(ClientCommandManager.argument("Message to Bingo Chat", StringArgumentType.greedyString())
+                                    .executes((context) -> {
+                                        String message = StringArgumentType.getString(context, "Message to Bingo Chat");
+                                        sendPacket(new BingoChatMessagePacket("", "", message, 0));
+                                        return 1;
+                                    })
+                            )
+            );
+        });/*BingoChatLong*/
+    }
+
+    public void registerRoleRequired(boolean hasDev, boolean hasAdmin, boolean hasMod, boolean hasSplasher, boolean hasBeta, boolean hasMiningEvents, boolean hasChChest) {
+        if (hasMod) {
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(
+                        ClientCommandManager.literal("bannounce")
+                                .then(ClientCommandManager.argument("message", StringArgumentType.greedyString())
+                                        .executes((context) -> {
+                                            String message = StringArgumentType.getString(context, "message");
+                                            sendPacket(new BroadcastMessagePacket("","",message));
+                                            return 1;
+                                        })
+                                )
+                );
+            });/*bAnnounce*/
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(ClientCommandManager.literal("bmute")
+                        .then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string())
+                                .then(ClientCommandManager.argument("[Duration(d/h/m/s) | 0 forever]", StringArgumentType.string())
+                                        .then(ClientCommandManager.argument("reason", StringArgumentType.greedyString())
+                                                .executes((context) -> {
+                                                    String identification = StringArgumentType.getString(context, "userId/mcusername");
+                                                    String duration = StringArgumentType.getString(context, "[Duration(d/h/m/s) | 0 forever]");
+                                                    String reason = StringArgumentType.getString(context, "reason");
+                                                    int userId = -1;
+                                                    String mcusername = "";
+                                                    if (identification.replaceAll("[\\d]", "").trim().isEmpty()) {
+                                                        userId = Integer.parseInt(identification);
+                                                    }
+                                                    else {
+                                                        mcusername = identification;
+                                                    }
+                                                    sendPacket(new PunishUserPacket(PunishUserPacket.PUNISHMENT_TYPE_MUTE, userId, mcusername, duration, reason));
+                                                    return 1;
+                                                })
+                                        )
+                                )
+                        )
+                );
+            });/*bmute*/
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(ClientCommandManager.literal("bban")
+                        .then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string())
+                                .then(ClientCommandManager.argument("[Duration(d/h/m/s) | 0 forever]", StringArgumentType.string())
+                                        .then(ClientCommandManager.argument("reason", StringArgumentType.greedyString())
+                                                .executes((context) -> {
+                                                    String identification = StringArgumentType.getString(context, "userId/mcusername");
+                                                    String duration = StringArgumentType.getString(context, "[Duration(d/h/m/s) | 0 forever]");
+                                                    String reason = StringArgumentType.getString(context, "reason");
+                                                    int userId = -1;
+                                                    String mcusername = "";
+                                                    if (identification.replaceAll("[\\d]", "").trim().isEmpty()) {
+                                                        userId = Integer.parseInt(identification);
+                                                    }
+                                                    else {
+                                                        mcusername = identification;
+                                                    }
+                                                    sendPacket(new PunishUserPacket(PunishUserPacket.PUNISHMENT_TYPE_BAN, userId, mcusername, duration, reason));
+                                                    return 1;
+                                                })
+                                        )
+                                )
+                        )
+                );
+            });/*ban*/
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(ClientCommandManager.literal("bgetinfo")
+                        .then(ClientCommandManager.argument("userId/mcusername", StringArgumentType.string())
+                                .executes((context) -> {
+                                    String identification = StringArgumentType.getString(context, "userId/mcusername");
+                                    sendPacket(new InternalCommandPacket(InternalCommandPacket.GET_USER_INFO, new String[]{identification}));
+                                    return 1;
+                                })
+                        )
+                );
+            });/*getInfo*/
+        }
+        if (hasSplasher) {
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(
+                        ClientCommandManager.literal("splashAnnounce")
+                                .then(ClientCommandManager.argument("Hub", IntegerArgumentType.integer(1, 28))
+                                        .then(ClientCommandManager.argument("location", StringArgumentType.string())
+                                                .suggests((context, builder) -> {
+                                                    return CommandSource.suggestMatching(new String[]{"kat", "bea", "guild-house"}, builder);
+                                                })
+                                                .then(ClientCommandManager.argument("lasswaste", StringArgumentType.string())
+                                                        .suggests((context, builder) -> {
+                                                            return CommandSource.suggestMatching(new String[]{"true", "false"}, builder);
+                                                        })
+                                                        .then(ClientCommandManager.argument("extramessage", StringArgumentType.greedyString())
+                                                                .executes((context) -> {
+                                                                    int hub = IntegerArgumentType.getInteger(context, "Hub");
+                                                                    String extramessage = StringArgumentType.getString(context, "extramessage");
+                                                                    String location = StringArgumentType.getString(context, "location");
+                                                                    boolean lessWaste = Boolean.parseBoolean(StringArgumentType.getString(context, "lasswaste"));
+                                                                    splashAnnounce(hub, location, extramessage, lessWaste);
+                                                                    return 1;
+                                                                })
+                                                        )
+                                                        .executes((context) -> {
+                                                            int hub = IntegerArgumentType.getInteger(context, "Hub");
+                                                            String location = StringArgumentType.getString(context, "location");
+                                                            boolean lessWaste = Boolean.parseBoolean(StringArgumentType.getString(context, "lasswaste"));
+                                                            splashAnnounce(hub, location, "", lessWaste);
+                                                            return 1;
+                                                        })
+                                                ))
+                                        .executes((context) -> {
+                                            int hub = IntegerArgumentType.getInteger(context, "Hub");
+                                            String location = "bea";
+                                            splashAnnounce(hub, location, "", true);
+                                            return 1;
+                                        })
+
+                                )
+                );
+            });/*SplashAnnounce*/
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(
+                        ClientCommandManager.literal("requestpottimes")
+                                .executes((context) -> {
+                                    sendPacket(new InternalCommandPacket(InternalCommandPacket.REQUEST_POT_DURATION, new String[0]));
+                                    return 1;
+                                })
+                );
+            });/*requestpottimes*/
+        }
+        if (hasAdmin) {
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(
+                        ClientCommandManager.literal("bshutdown")
+                                .then(ClientCommandManager.argument("Reason", StringArgumentType.greedyString())
+                                        .suggests((context, builder) -> {
+                                            return CommandSource.suggestMatching(new String[]{"Emergency Shutdown", "System Shutdown", "Other"}, builder);
+                                        })
+                                        .executes((context) -> {
+                                            String reason = StringArgumentType.getString(context, "Reason");
+                                            sendPacket(new InternalCommandPacket(InternalCommandPacket.SHUTDOWN_SERVER, new String[]{reason}));
+                                            return 1;
+                                        })
+                                )
+                );
+            });/*BBShutdown*/
+            event.register((dispatcher, registryAccess) -> {
+                dispatcher.register(
+                        ClientCommandManager.literal("bsetmotd")
+                                .then(ClientCommandManager.argument("Message", StringArgumentType.greedyString())
+                                        .suggests((context, builder) -> {
+                                            return CommandSource.suggestMatching(new String[]{""}, builder);
+                                        })
+                                        .executes((context) -> {
+                                            String message = StringArgumentType.getString(context, "Message").trim();
+                                            sendPacket(new InternalCommandPacket(InternalCommandPacket.SET_MOTD, new String[]{message}));
+                                            return 1;
+                                        })
+                                )
+                );
+            });/*BBServerMotd*/
+        }
+    }
+
+    private static void simpleCommand(CommandDispatcher<FabricClientCommandSource> dispatcher, String commandName, String[] parameters) {
+        dispatcher.register(
+                ClientCommandManager.literal(commandName)
+                        .executes((context) -> {
+                            sendPacket(new InternalCommandPacket(commandName, parameters));
+                            return 1;
+                        })
+        );
+    }
+
+    private static void miningEvent(CommandDispatcher<FabricClientCommandSource> dispatcher, String commandName, MiningEvents event) {
+        dispatcher.register(
+                ClientCommandManager.literal(commandName)
+                        .executes((context) -> {
+                            try {
+                                sendPacket(new MiningEventPacket(event,
+                                        BBsentials.config.getUsername(), Objects.requireNonNull(EnvironmentCore.utils.getCurrentIsland())));
+                            } catch (Exception e) {
+                                Chat.sendPrivateMessageToSelfError(e.getMessage());
+                            }
+                            return 1;
+                        })
+        );
+    }
+    public static <T extends AbstractPacket> void sendPacket(T packet){
+        BBsentials.connection.sendPacket(packet);
+    }
+    public void splashAnnounce(int hubNumber, String locationInHub, String extramessage, boolean lessWaste) {
+        sendPacket(new SplashNotifyPacket(0, hubNumber, BBsentials.config.getUsername(), locationInHub, EnvironmentCore.utils.getCurrentIsland(), extramessage, lessWaste));
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java b/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java
new file mode 100644
index 0000000..23f4db8
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/DebugThread.java
@@ -0,0 +1,15 @@
+package de.hype.bbsentials.forge;
+
+import java.util.List;
+
+public class DebugThread implements de.hype.bbsentials.common.client.DebugThread {
+    @Override
+    public void loop() {
+
+    }
+
+    @Override
+    public List<String> test() {
+        return List.of("");
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java b/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java
index 9a118a1..4043ba1 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java
@@ -1,6 +1,6 @@
 package de.hype.bbsentials.forge;
 
-import de.hype.bbsentials.forge.client.BBsentials;
+import de.hype.bbsentials.common.client.BBsentials;
 import de.hype.bbsentials.forge.client.CommandBBI;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
@@ -8,7 +8,6 @@ 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;
@@ -29,8 +28,8 @@ public class ExampleMod {
 
     @SubscribeEvent
     public void onEntityJoinWorld(EntityJoinWorldEvent event) {
-        clientSetup();
-        MinecraftForge.EVENT_BUS.unregister(this);
+        EnvironmentCore core = new EnvironmentCore(new BBUtils(), new FabricChat(), new MCUtils(), new Commands(), new Options(), new DebugThread());
+        BBsentials.();
     }
 }
 
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/FabricChat.java b/forge/src/main/java/de/hype/bbsentials/forge/FabricChat.java
new file mode 100644
index 0000000..f25f4ad
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/FabricChat.java
@@ -0,0 +1,37 @@
+package de.hype.bbsentials.forge;
+
+import de.hype.bbsentials.common.chat.Message;
+import de.hype.bbsentials.common.mclibraries.MCChat;
+import de.hype.bbsentials.forge.chat.Chat;
+import net.fabricmc.fabric.api.client.message.v1.ClientReceiveMessageEvents;
+import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.text.Text;
+
+public class FabricChat implements MCChat {
+    public FabricChat() {
+        init();
+    }
+    public Chat chat = new Chat();
+    public void init() {
+        // Register a callback for a custom message type
+        ClientReceiveMessageEvents.CHAT.register((message, signedMessage, sender, params, receptionTimestamp) -> {
+            chat.onEvent(new Message(Text.Serializer.toJson(message),message.getString()));
+        });
+        ClientReceiveMessageEvents.MODIFY_GAME.register((message, overlay) -> (Text.Serializer.fromJson(chat.onEvent(new Message(Text.Serializer.toJson(message),message.getString())).getJson())));
+        ClientSendMessageEvents.CHAT.register(message -> {
+            if (message.startsWith("/")) {
+                System.out.println("Sent command: " + message);
+            }
+        });
+    }
+    public void sendClientSideMessage(Message message) {
+        MinecraftClient client = MinecraftClient.getInstance();
+        if (client.player != null) {
+            client.player.sendMessage(Text.Serializer.fromJson(message.getJson()));
+        }
+    }
+    public void sendChatMessage(String message) {
+        MinecraftClient.getInstance().getNetworkHandler().sendChatMessage(message);
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/MCUtils.java b/forge/src/main/java/de/hype/bbsentials/forge/MCUtils.java
new file mode 100644
index 0000000..0a0800b
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/MCUtils.java
@@ -0,0 +1,45 @@
+package de.hype.bbsentials.forge;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+
+import java.io.File;
+
+public class MCUtils implements de.hype.bbsentials.common.mclibraries.MCUtils {
+    public boolean isWindowFocused() {
+        return MinecraftClient.getInstance().isWindowFocused();
+    }
+
+    public File getConfigPath() {
+        return FabricLoader.getInstance().getConfigDir().toFile();
+    }
+
+    public String getUsername() {
+        return MinecraftClient.getInstance().player.getName().getString();
+    }
+
+    public String getMCUUID() {
+        return MinecraftClient.getInstance().player.getUuid().toString();
+    }
+
+
+    public void playsound(String eventName) {
+        MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance
+                .master(SoundEvent.of(new Identifier(eventName)), 1.0F, 1.0F));
+    }
+    public int getPotTime() {
+        int remainingDuration = 0;
+        StatusEffectInstance potTimeRequest = MinecraftClient.getInstance().player.getStatusEffect(StatusEffects.STRENGTH);
+        if (potTimeRequest != null) {
+            if (potTimeRequest.getAmplifier() >= 7) {
+                remainingDuration = (int) (potTimeRequest.getDuration() / 20.0);
+            }
+        }
+        return remainingDuration;
+    }
+}
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/Options.java b/forge/src/main/java/de/hype/bbsentials/forge/Options.java
new file mode 100644
index 0000000..bdf0861
--- /dev/null
+++ b/forge/src/main/java/de/hype/bbsentials/forge/Options.java
@@ -0,0 +1,14 @@
+package de.hype.bbsentials.forge;
+
+import de.hype.bbsentials.common.api.ISimpleOption;
+import net.minecraft.client.MinecraftClient;
+
+public class Options implements de.hype.bbsentials.common.mclibraries.Options {
+    public void setFov(int value) {
+        ((ISimpleOption) (Object) MinecraftClient.getInstance().options.getFov()).set(value);
+    }
+    public void setGamma(double value) {
+        ((ISimpleOption) (Object) MinecraftClient.getInstance().options.getGamma()).set(value);
+    }
+}
+
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java b/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java
index 9b0ce86..8441624 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/Temphook.java
@@ -1,6 +1,5 @@
 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;
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
index ec81c52..6b12ba1 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java
@@ -1,6 +1,5 @@
 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;
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
deleted file mode 100644
index 87dc13b..0000000
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/BBsentials.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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/Commands/CommandBBServer.java b/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java
index 3254d1c..7c94a27 100644
--- 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
@@ -1,6 +1,5 @@
 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;
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
index 804815c..d42970f 100644
--- 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
@@ -1,6 +1,5 @@
 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;
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
index f7e4260..3d8106b 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java
@@ -1,7 +1,6 @@
 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;
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a7c9e4c..0332fee 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -23,6 +23,6 @@ plugins {
 }
 
 
-rootProject.name = "BBsentials All"
+rootProject.name = "BBsentialsAll"
 
 include(":common", ":fabric", ":forge")