100 files changed, 2345 insertions, 252 deletions

diff --git a/common/src/main/java/de/hype/bbsentials/common/api/Discord.java b/common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java
index 6b2f468..0093305 100644
--- a/common/src/main/java/de/hype/bbsentials/common/api/Discord.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java
@@ -1,7 +1,7 @@
-package de.hype.bbsentials.common.api;
+package de.hype.bbsentials.forge.common.api;
 
-import de.hype.bbsentials.common.chat.Chat;
-import de.hype.bbsentials.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.common.client.BBsentials;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
diff --git a/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java b/common/src/main/java/de/hype/bbsentials/forge/common/api/Formatting.java
index c8702d4..9118533 100644
--- a/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/api/Formatting.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.api;
+package de.hype.bbsentials.forge.common.api;
 
 public enum Formatting{
     BLACK("§0"),
diff --git a/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java b/common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java
index 28808d9..fcaf70e 100644
--- a/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java
@@ -1,4 +1,4 @@
-package de.hype.bbsentials.common.api;
+package de.hype.bbsentials.forge.common.api;
 
 public interface ISimpleOption {
     void set(Object value);
diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java
index 7f450bb..a9562ef 100644
--- a/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java
+++ b/common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java
@@ -1,10 +1,10 @@
-package de.hype.bbsentials.common.chat;
+package de.hype.bbsentials.forge.common.chat;
 
-import de.hype.bbsentials.common.api.Formatting;
-import de.hype.bbsentials.common.client.BBsentials;
-import de.hype.bbsentials.common.client.Config;
-import de.hype.bbsentials.common.mclibraries.EnvironmentCore;
-import de.hype.bbsentials.common.packets.packets.SplashUpdatePacket;
+import de.hype.bbsentials.forge.common.api.Formatting;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.common.client.Config;
+import de.hype.bbsentials.forge.common.mclibraries.EnvironmentCore;
+import de.hype.bbsentials.forge.common.packets.packets.SplashUpdatePacket;
 
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
@@ -22,8 +22,6 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static de.hype.bbsentials.common.client.BBsentials.*;
-
 public class Chat {
 
     public static String[] getVariabl