more changes

35 files changed, 343 insertions, 1696 deletions

diff --git a/LICENSE b/LICENSE
index f6fc0e7..c002562 100644
--- a/LICENSE
+++ b/LICENSE
@@ -5,15 +5,15 @@ Copyright (c) 2023 hackthetime
 
 The Code is under the CC BY-NC-ND 4.0 license however with modifications listed below:
 
-Copying and changing code for own projects is allowed as long as you dont do so to abuse the Systems in place.
-If you have credits somehwere and you used a signicant amount of Code (or get a request) of this project you have to link to it. If used next to no code dont bother.
-There are some restricted areas which are not allowed to be modifed/removed etc. Those will be marked with start and end.
-Modifying this code to gain a personal advantage by abusing a feature unintentionally is STRICTLY forbidden. Sharing such modifications is not allowed either. All modifications have to be pull requested after they have been fully implemented and work like exspected
+Copying and changing code for own projects is allowed as long as you don't do so to abuse the Systems in place.
+If you have credits somewhere and you used a significant amount of Code (or get a request) of this project you have to link to it. If used next to no code don't bother.
+There are some restricted areas which are not allowed to be modified/removed etc. Those will be marked with start and end.
+Modifying this code to gain a personal advantage by abusing a feature unintentionally is STRICTLY forbidden. Sharing such modifications is not allowed either. All modifications have to be pull requested after they have been fully implemented and work like expected
 
 Summary:
-No monetarysations
-Sharing modified versions is disallowed. (If you want to do so feel free to make a pull reqeust and ask)
-You need to give credit f you use it. (If u used next to no code, have no credits build in as well as havent gotten a request too include it dont bother adding it).
+No commercial use even of code snippets of this software. (No selling mods for money. donations are allowed but no force, needs to be opensource)
+Sharing modified versions is disallowed. (If you want to do so feel free to make a pull request and ask)
+You need to give credit if you used code of it. (If u used next to no code, dont have credits build in as well as haven't gotten a request too include it don't bother adding it).
 
 Too contributors:
-I may monetarise this mod in the future by allowing donations and will deffinetely allow donations for the Server costs.
+I may allow donations in the future and will definitely allow donations for the Server costs. I will never make set a requirement too pay though.
diff --git a/README.md b/README.md
index b9688a0..eb719d4 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,20 @@
 # BBsentials1.20
-The BBsentials mod for the newer versions of the game.
 THIS MOD IS NOT AFFILIATED WITH BINGO BREWERS ANYMORE since indigo had a problem with me focusing
 on 1.20 and refusing to collaborate with me on request. 
 
 The mod is availibel on modrinth https://modrinth.com/mod/bbsentials
 
 Worked on by 
-Hype_the_Time alias HacktheTime (Developer)
+Hype_the_Time/hackthetime (Main Developer)
+
 Contributors:
-hannibal2
+
+hannibal2 (never made a push but was very helpful with questions and did some parts of the code)
 
 IMPORTANT:
-This mod is currently for 1.20.2 Fabric.
+While this mod is supported for both 1.20.2 and 1.8.9 some features may be one version only. My (hackthetime) focus is on 1.20.2. Due too that some things may not be done in 1.8.9 by my personally.
 
+1.20.2
 I recommend using Fabulously Optimized together with this mod.
 Some Features require at least Cit Resewn which is included there.
 
@@ -23,22 +25,12 @@ I worked together with ic22487, and he included a costume Splash Hub texture in
 (https://hypixel.net/threads/0-19-1-hypixel-for-1-8-1-12-and-1-20.4174260/)
 If you don't want to use a Full texturepack there are texturepacks with only the hub ui and another with only Splash hub over in the release Section.
 
-**Do not expect any kind of support during Bingo times since those moderating it are likely to sweat it too.
-If you have any kind of request**
-
-You may apply for preannouce¹ if you have a good reason. (Normally people who did something good for the community like splashes,... Specific Bingo maniacs may get it too.)
-Do this BEFORE Bingo starts! Bribing (already try) on any Side will Result in a permanent unappealable ban!
-
-
+Depenendencies:
+1.20.2: mod menu, cloth config, fabric api
 
+1.8.9: nothing
 
 
+**Do not expect any kind of support during Bingo times since those moderating it are likely to sweat it too.
+If you have any kind of request**
 
-¹ preannounce has a slight advantage in timing. (15 sec early chchest) (Splash is notified in intervals of how much time you have left. Preannounce has a slight buff here.)
-Splash announce order:
-pre with less than 10 mins
-everybody with less than 1 min splash
-everybody with less than 10 splash
-pre with less then 25 mins of splash
-everybody else with less than 25 mins remaining
-Discord and everybody
diff --git a/common/build.gradle b/common/build.gradle
index 1bc4def..a46e152 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -24,22 +24,8 @@ processResources {
 
 }
 
-def targetJavaVersion = 17
-tasks.withType(JavaCompile).configureEach {
-    // Ensure that the encoding is set to UTF-8.
-    it.options.encoding = "UTF-8"
-    if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
-        it.options.release = targetJavaVersion
-    }
-}
-
+java.toolchain.languageVersion.set(JavaLanguageVersion.of(8))
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-    def javaVersion = JavaVersion.toVersion(targetJavaVersion)
-    if (JavaVersion.current() < javaVersion) {
-        toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
-    }
     archivesBaseName = project.archives_base_name
 }
 
diff --git a/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java b/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java
index d51fcec..eaf3ee1 100644
--- a/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java
+++ b/common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java
@@ -1,13 +1,14 @@
 package de.hype.bbsentials.common.client;
 
 
+import java.util.Collections;
 import java.util.List;
 
 public interface DebugThread extends Runnable {
 
     @Override
     public default void run() {
-         loop();
+        loop();
         //place a breakpoint for only this thread here.
     }
 
@@ -15,6 +16,6 @@ public interface DebugThread extends Runnable {
     }
 
     public default List<String> test() {
-        return List.of("");
+        return Collections.singletonList("");
     }
 }
diff --git a/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java b/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java
index 76ee4bd..6dd9edb 100644
--- a/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java
+++ b/common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java
@@ -29,6 +29,7 @@ import java.security.cert.X509Certificate;
 import java.util.Arrays;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public class BBsentialConnection {
     private Socket socket;
@@ -325,7 +326,13 @@ public class BBsentialConnection {
         if (isCommandSafe(packet.bbcommand)) {
             if (showChChest(packet.items)) {
                 String tellrawText = ("{\"text\":\"BB: @username found @item in a chest at (@coords). Click here to get a party invite @extramessage\",\"color\":\"green\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"@inviteCommand\"},\"hoverEvent\":{\"action\":\"show_text\",\"contents\":[\"On clicking you will get invited to a party. Command executed: @inviteCommand\"]}}");
-                tellrawText = tellrawText.replace("@username", packet.announcerUsername).replace("@item", Arrays.stream(packet.items).map(ChChestItem::getDisplayName).toList().toString()).replace("@coords", packet.locationCoords).replace("@inviteCommand", packet.bbcommand);
+                tellrawText = tellrawText.replace("@username", packet.announcerUsername);
+                tellrawText = tellrawText.replace("@item", Arrays.stream(packet.items)
+                        .map(ChChestItem::getDisplayName)
+                        .collect(Collectors.toList())
+                        .toString());
+                tellrawText = tellrawText.replace("@coords", packet.locationCoords);
+                tellrawText = tellrawText.replace("@inviteCommand", packet.bbcommand);
                 if (!(packet.extraMessage == null || packet.extraMessage.isEmpty())) {
                     tellrawText = tellrawText.replace("@extramessage", " : " + packet.extraMessage);
                 }
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java b/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java
index a6b2a3e..3acf95e 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/BBUtils.java
@@ -2,34 +2,33 @@ 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;
+//        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;
+        return Islands.PRIVATE_ISLAND;
     }
 
     public int getPlayerCount() {
-        return Integer.parseInt(MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!B-a").getDisplayName().getString().trim().replaceAll("[^0-9]", ""));
+//        return Integer.parseInt(MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!B-a").getDisplayName().getString().trim().replaceAll("[^0-9]", ""));
+        return 0;
     }
 
     public String getServer() {
-        return MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-c").getDisplayName().getString().replace("Server:", "").trim();
+//        return MinecraftClient.getInstance().player.networkHandler.getPlayerListEntry("!C-c").getDisplayName().getString().replace("Server:", "").trim();
+        return "mini0b";
     }
 
     public boolean isOnMegaServer() {
@@ -53,14 +52,14 @@ public class BBUtils implements de.hype.bbsentials.common.mclibraries.BBUtils {
 
     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);
-            }
-        }
+//        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/client/Commands/Command2xPowder.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java
index 8044991..0914bad 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/Command2xPowder.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
 
 
 public class Command2xPowder extends CommandBase {
@@ -20,7 +20,7 @@ public class Command2xPowder extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        bbserver.sendMessage("?dwevent 2xpowder");
+        connection.sendMessage("?dwevent 2xpowder");
     }
     @Override
     public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java
index 3d2afb7..032c599 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBAnnounce.java
@@ -1,6 +1,6 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
-import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.common.chat.Chat;
 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/CommandBBServer.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java
index 7c94a27..6150b6e 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBServer.java
@@ -1,5 +1,6 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
+import de.hype.bbsentials.common.client.BBsentials;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
@@ -29,7 +30,7 @@ public class CommandBBServer extends CommandBase {
             BBsentials.connectToBBserver();
         }
         else {
-            BBsentials.bbserver.sendMessage(message);
+            BBsentials.connection.sendMessage(message);
         }
     }
 
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java
index 15d99b7..09efc8b 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBBan.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
 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/CommandBC.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java
index 0b46507..08f9bee 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBC.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
 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/CommandBMute.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java
index 3fd6390..0dab562 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBMute.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
 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/CommandBetterTogether.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java
index 78f20f8..fb3d647 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBetterTogether.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
 
 
 public class CommandBetterTogether extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandBetterTogether extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        bbserver.sendMessage("?dwevent bettertogether");
+        connection.sendMessage("?dwevent bettertogether");
     }
     @Override
     public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java
index 655cfdb..6967259 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandBingoChat.java
@@ -1,6 +1,7 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
-import de.hype.bbsentials.forge.chat.Chat;
+
+import de.hype.bbsentials.common.chat.Chat;
 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/CommandChChest.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java
index daaa1f3..3914d03 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandChChest.java
@@ -1,12 +1,12 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
-import de.hype.bbsentials.forge.chat.Chat;
+import de.hype.bbsentials.common.chat.Chat;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
 
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
 
 
 public class CommandChChest extends CommandBase {
@@ -36,9 +36,9 @@ public class CommandChChest extends CommandBase {
             String contactWay = args[4];
 
             String combinedString = "?chchest " + item + " " + x + " " + y + " " + z + " " + contactWay;
-            bbserver.sendMessage(combinedString);
+            connection.sendMessage(combinedString);
         } catch (Exception e) {
-            Chat.sendPrivateMessageToSelf("§cYour coords were invalid.");
+            Chat.sendPrivateMessageToSelfError("Your coords were invalid.");
         }
     }
     @Override
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java
index bb7d276..2b0ec28 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoblinRaid.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
 
 
 public class CommandGoblinRaid extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandGoblinRaid extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        bbserver.sendMessage("?dwevent goblinraid");
+        connection.sendMessage("?dwevent goblinraid");
     }
     @Override
     public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java
index 602e422..c079ed1 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandGoneWithTheWind.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
 
 
 public class CommandGoneWithTheWind extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandGoneWithTheWind extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        bbserver.sendMessage("?dwevent gonewiththewind");
+        connection.sendMessage("?dwevent gonewiththewind");
     }
     @Override
     public boolean canCommandSenderUseCommand(ICommandSender sender) {
diff --git a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java
index 235c538..4e17c42 100644
--- a/forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java
+++ b/forge/src/main/java/de/hype/bbsentials/forge/CommandImplementations/CommandRaffle.java
@@ -1,9 +1,9 @@
-package de.hype.bbsentials.forge.client.Commands;
+package de.hype.bbsentials.forge.CommandImplementations;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 
-import static de.hype.bbsentials.forge.client.BBsentials.bbserver;
+import static de.hype.bbsentials.common.client.BBsentials.connection;
 
 
 public class CommandRaffle extends CommandBase {
@@ -20,7 +20,7 @@ public class CommandRaffle extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        bbserver.sendMessage("?dwevent raffle");
+        connection.sendMessage("?dwevent raffle");
     }
     @Override
     public boolean canCommandS