more changes

50 files changed, 130 insertions, 130 deletions

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 {