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 @@