more changes

18 files changed, 28 insertions, 28 deletions

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 5dca4ac..d0442cc 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.common.chat.Chat;
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.chat.Chat;
+import de.hype.bbsentials.forge.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.common.mclibraries.BBUtils {
+public class BBUtils implements de.hype.bbsentials.forge.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 a723284..64775db 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.common.client.BBsentials;
-import de.hype.bbsentials.common.constants.enviromentShared.Islands;
+import de.hype.bbsentials.forge.common.client.BBsentials;
+import de.hype.bbsentials.forge.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 e23d76b..d4f1369 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.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 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 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 1752492..eaf4f61 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.common.client.DebugThread {
+public class DebugThread implements de.hype.bbsentials.forge.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 0244181..8e538a6 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.common.chat.Chat;
-import de.hype.bbsentials.common.chat.Message;
-import de.hype.bbsentials.common.mclibraries.MCChat;
+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 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 149b72a..5230f2e 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.common.mclibraries.MCUtils {
+public class MCUtils implements de.hype.bbsentials.forge.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 2e7b4fe..7769582 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.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 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 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.common.client.BBsentials.*;
+import static de.hype.bbsentials.forge.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 3d7cbe3..4d519bb 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.common.api.ISimpleOption;
+import de.hype.bbsentials.forge.common.api.ISimpleOption;
 import net.minecraft.client.MinecraftClient;
 
-public class Options implements de.hype.bbsentials.common.mclibraries.Options {
+public class Options implements de.hype.bbsentials.forge.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 0c6a2bb..2207c5a 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.common.client.BBsentials;
+import de.hype.bbsentials.forge.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 711ac09..64c90b2 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.common.api.ISimpleOption;
+import de.hype.bbsentials.forge.common.api.ISimpleOption;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.SimpleOption;
 import org.spongepowered.asm.mixin.Final;
diff --git a/fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png b/fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png
deleted file mode 100644
index 7929d1a..0000000
--- a/fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png
+++ /dev/null
diff --git a/fabric/src/main/resources/assets/public_bbsentials_cert.crt b/fabric/src/main/resources/assets/public_bbsentials_cert.crt
deleted file mode 100644
index 723fc34..0000000
--- a/fabric/src/main/resources/assets/public_bbsentials_cert.crt
+++ /dev/null
diff --git a/fabric/src/main/resources/logo.png b/fabric/src/main/resources/logo.png
deleted file mode 100644
index 407312a..0000000
--- a/fabric/src/main/resources/logo.png
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav b/fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav
deleted file mode 100644
index d079479..0000000
--- a/fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav b/fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav
deleted file mode 100644
index f118ac5..0000000
--- a/fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav b/fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav
deleted file mode 100644
index 4bed79a..0000000
--- a/fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav b/fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav
deleted file mode 100644
index 582445e..0000000
--- a/fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav
+++ /dev/null
diff --git a/fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav b/fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav
deleted file mode 100644
index 37800c9..0000000
--- a/fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav
+++ /dev/null