aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHacktheTime <l4bg0jb7@duck.com>2023-10-13 18:22:33 +0200
committerHacktheTime <l4bg0jb7@duck.com>2023-10-13 18:22:33 +0200
commite3d509924c44678e6c8f07bd0e33a75db894c810 (patch)
treeb3c03f3c3a96331061e8eb305ef75bbe6a33da4d
parent76acd0ddad4230728fd5db6aad0918c25138e5cb (diff)
downloadBBsentials-e3d509924c44678e6c8f07bd0e33a75db894c810.tar.gz
BBsentials-e3d509924c44678e6c8f07bd0e33a75db894c810.tar.bz2
BBsentials-e3d509924c44678e6c8f07bd0e33a75db894c810.zip
more changes
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/api/Discord.java (renamed from common/src/main/java/de/hype/bbsentials/common/api/Discord.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/api/Formatting.java (renamed from common/src/main/java/de/hype/bbsentials/common/api/Formatting.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/api/ISimpleOption.java (renamed from common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/chat/Chat.java (renamed from common/src/main/java/de/hype/bbsentials/common/chat/Chat.java)66
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/chat/Message.java (renamed from common/src/main/java/de/hype/bbsentials/common/chat/Message.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/chat/Sender.java (renamed from common/src/main/java/de/hype/bbsentials/common/chat/Sender.java)10
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/BBsentials.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java)10
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/Commands/Commands.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/Commands/Commands.java)8
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/Config.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/Config.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/CustomGson.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/CustomGson.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/DebugThread.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/SplashManager.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/SplashManager.java)10
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/SplashStatusUpdateListener.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/SplashStatusUpdateListener.java)10
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/client/ToDisplayConfig.java (renamed from common/src/main/java/de/hype/bbsentials/common/client/ToDisplayConfig.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/communication/BBsentialConnection.java (renamed from common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java)26
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProvider.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProvider.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/BBDisplayNameProviderWithCustom.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProviderWithCustom.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/AuthenticationConstants.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/AuthenticationConstants.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItem.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItem.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/ChChestItems.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItems.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/EnumUtils.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/EnumUtils.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/InternalReasonConstants.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/InternalReasonConstants.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/Islands.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/Islands.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/constants/enviromentShared/MiningEvents.java (renamed from common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/MiningEvents.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/BBUtils.java (renamed from common/src/main/java/de/hype/bbsentials/common/mclibraries/BBUtils.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/EnvironmentCore.java (renamed from common/src/main/java/de/hype/bbsentials/common/mclibraries/EnvironmentCore.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCChat.java (renamed from common/src/main/java/de/hype/bbsentials/common/mclibraries/MCChat.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCCommand.java (renamed from common/src/main/java/de/hype/bbsentials/common/mclibraries/MCCommand.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/MCUtils.java (renamed from common/src/main/java/de/hype/bbsentials/common/mclibraries/MCUtils.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/mclibraries/Options.java (renamed from common/src/main/java/de/hype/bbsentials/common/mclibraries/Options.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/AbstractPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/AbstractPacket.java)12
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/EnviromentPacketConfig.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/EnviromentPacketConfig.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/Packet.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/Packet.java)2
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketManager.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/PacketManager.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/PacketUtils.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/PacketUtils.java)10
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BingoChatMessagePacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/BingoChatMessagePacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/BroadcastMessagePacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/BroadcastMessagePacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/ChChestPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisconnectPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/DisconnectPacket.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/DisplayTellrawMessagePacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/DisplayTellrawMessagePacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InternalCommandPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/InternalCommandPacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/InvalidCommandFeedbackPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/InvalidCommandFeedbackPacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/MiningEventPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/MiningEventPacket.java)8
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PartyPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/PartyPacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/PunishUserPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/PunishUserPacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/RequestConnectPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/RequestConnectPacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashNotifyPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashNotifyPacket.java)6
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SplashUpdatePacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashUpdatePacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/SystemMessagePacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/SystemMessagePacket.java)4
-rw-r--r--common/src/main/java/de/hype/bbsentials/forge/common/packets/packets/WelcomeClientPacket.java (renamed from common/src/main/java/de/hype/bbsentials/common/packets/packets/WelcomeClientPacket.java)4
-rw-r--r--common/src/main/resources/bbsentials.mixins.json16
-rw-r--r--common/src/main/resources/fabric.mod.json45
-rw-r--r--fabric/build.gradle16
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/BBUtils.java6
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/BBsentialsConfigScreemFactory.java4
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/Commands.java16
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/DebugThread.java2
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/FabricChat.java6
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/MCUtils.java2
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/ModInitialiser.java12
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/Options.java4
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ItemRendererMixin.java2
-rw-r--r--fabric/src/main/java/de/hype/bbsentials/fabric/mixins/SimpleOptionMixin.java2
-rw-r--r--fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.pngbin5537 -> 0 bytes
-rw-r--r--fabric/src/main/resources/assets/public_bbsentials_cert.crtbin1431 -> 0 bytes
-rw-r--r--fabric/src/main/resources/logo.pngbin2092 -> 0 bytes
-rw-r--r--fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wavbin201240 -> 0 bytes
-rw-r--r--fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wavbin274068 -> 0 bytes
-rw-r--r--fabric/src/main/resources/sounds/mixkit-long-pop-2358.wavbin226002 -> 0 bytes
-rw-r--r--fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wavbin184244 -> 0 bytes
-rw-r--r--fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wavbin276320 -> 0 bytes
-rw-r--r--forge/build.gradle127
-rw-r--r--forge/gradle.properties20
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/ExampleMod.java36
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/Temphook.java18
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/chat/Chat.java580
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/chat/Sender.java100
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/BBsentials.java42
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/CommandBBI.java87
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/Command2xPowder.java29
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBAnnounce.java36
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBServer.java41
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBBan.java36
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBC.java36
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBMute.java35
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBetterTogether.java29
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandBingoChat.java35
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandChChest.java48
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoblinRaid.java29
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandGoneWithTheWind.java29
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandRaffle.java29
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandSplashAnnounce.java50
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Commands/CommandsOLD.java38
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/client/Config.java198
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/communication/BBsentialConnection.java341
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinGuiMainMenu.java16
-rw-r--r--forge/src/main/java/de/hype/bbsentials/forge/mixin/MixinRenderItem.java30
-rw-r--r--forge/src/main/resources/mcmod.info18
-rw-r--r--forge/src/main/resources/mixins.bbsentials.json11
-rw-r--r--settings.gradle26
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/