From dba4a297e295d68980da31264b0069fe9b18a13e Mon Sep 17 00:00:00 2001 From: HacktheTime Date: Thu, 12 Oct 2023 20:17:28 +0200 Subject: preperations to have a common code and different implementations for forge and fabric to ease up maintaining both versions --- build.gradle | 97 ---- common/build.gradle | 94 ++++ .../de/hype/bbsentials/common/api/Discord.java | 70 +++ .../de/hype/bbsentials/common/api/Formatting.java | 36 ++ .../hype/bbsentials/common/api/ISimpleOption.java | 5 + .../java/de/hype/bbsentials/common/chat/Chat.java | 441 ++++++++++++++++ .../de/hype/bbsentials/common/chat/Message.java | 110 ++++ .../de/hype/bbsentials/common/chat/Sender.java | 104 ++++ .../hype/bbsentials/common/client/BBsentials.java | 247 +++++++++ .../common/client/Commands/CommandsOLD.java | 363 +++++++++++++ .../de/hype/bbsentials/common/client/Config.java | 204 ++++++++ .../hype/bbsentials/common/client/CustomGson.java | 28 + .../hype/bbsentials/common/client/DebugThread.java | 52 ++ .../bbsentials/common/client/SplashManager.java | 58 +++ .../common/client/SplashStatusUpdateListener.java | 62 +++ .../bbsentials/common/client/ToDisplayConfig.java | 96 ++++ .../common/communication/BBsentialConnection.java | 551 ++++++++++++++++++++ .../common/constants/BBDisplayNameProvider.java | 23 + .../constants/BBDisplayNameProviderWithCustom.java | 6 + .../enviromentShared/AuthenticationConstants.java | 7 + .../constants/enviromentShared/ChChestItem.java | 46 ++ .../constants/enviromentShared/ChChestItems.java | 87 ++++ .../constants/enviromentShared/EnumUtils.java | 208 ++++++++ .../enviromentShared/InternalReasonConstants.java | 14 + .../common/constants/enviromentShared/Islands.java | 47 ++ .../constants/enviromentShared/MiningEvents.java | 39 ++ .../bbsentials/common/mclibraries/BBUtils.java | 21 + .../bbsentials/common/packets/AbstractPacket.java | 67 +++ .../common/packets/EnviromentPacketConfig.java | 7 + .../de/hype/bbsentials/common/packets/Packet.java | 26 + .../bbsentials/common/packets/PacketManager.java | 53 ++ .../bbsentials/common/packets/PacketUtils.java | 103 ++++ .../packets/packets/BingoChatMessagePacket.java | 25 + .../packets/packets/BroadcastMessagePacket.java | 18 + .../common/packets/packets/ChChestPacket.java | 23 + .../common/packets/packets/DisconnectPacket.java | 23 + .../packets/DisplayTellrawMessagePacket.java | 12 + .../packets/packets/InternalCommandPacket.java | 32 ++ .../packets/InvalidCommandFeedbackPacket.java | 24 + .../common/packets/packets/MiningEventPacket.java | 25 + .../common/packets/packets/PartyPacket.java | 16 + .../common/packets/packets/PunishUserPacket.java | 24 + .../packets/packets/RequestConnectPacket.java | 20 + .../common/packets/packets/SplashNotifyPacket.java | 28 + .../common/packets/packets/SplashUpdatePacket.java | 22 + .../packets/packets/SystemMessagePacket.java | 16 + .../packets/packets/WelcomeClientPacket.java | 18 + .../assets/bbsentials/textures/item/splash_hub.png | Bin 0 -> 5537 bytes .../resources/assets/public_bbsentials_cert.crt | Bin 0 -> 1431 bytes common/src/main/resources/bbsentials.mixins.json | 16 + common/src/main/resources/fabric.mod.json | 45 ++ common/src/main/resources/logo.png | Bin 0 -> 2092 bytes .../resources/sounds/mixkit-gaming-lock-2848.wav | Bin 0 -> 201240 bytes .../sounds/mixkit-interface-option-select-2573.wav | Bin 0 -> 274068 bytes .../main/resources/sounds/mixkit-long-pop-2358.wav | Bin 0 -> 226002 bytes .../resources/sounds/mixkit-sci-fi-click-900.wav | Bin 0 -> 184244 bytes .../sounds/mixkit-sci-fi-confirmation-914.wav | Bin 0 -> 276320 bytes fabric/build.gradle | 95 ++++ .../java/de/hype/bbsentials/fabric/BBUtils.java | 66 +++ .../fabric/BBsentialsConfigScreemFactory.java | 303 +++++++++++ .../java/de/hype/bbsentials/fabric/FabricChat.java | 26 + .../java/de/hype/bbsentials/fabric/MCUtils.java | 55 ++ .../de/hype/bbsentials/fabric/ModInitialiser.java | 14 + .../de/hype/bbsentials/fabric/ModMenueScreen.java | 18 + .../java/de/hype/bbsentials/fabric/Options.java | 14 + .../fabric/mixins/ClientCommandSourceMixin.java | 56 ++ .../fabric/mixins/ItemRendererMixin.java | 40 ++ .../hype/bbsentials/fabric/mixins/ScreenMixin.java | 26 + .../fabric/mixins/SimpleOptionMixin.java | 33 ++ .../assets/bbsentials/textures/item/splash_hub.png | Bin 0 -> 5537 bytes .../resources/assets/public_bbsentials_cert.crt | Bin 0 -> 1431 bytes fabric/src/main/resources/bbsentials.mixins.json | 16 + fabric/src/main/resources/fabric.mod.json | 45 ++ fabric/src/main/resources/logo.png | Bin 0 -> 2092 bytes .../resources/sounds/mixkit-gaming-lock-2848.wav | Bin 0 -> 201240 bytes .../sounds/mixkit-interface-option-select-2573.wav | Bin 0 -> 274068 bytes .../main/resources/sounds/mixkit-long-pop-2358.wav | Bin 0 -> 226002 bytes .../resources/sounds/mixkit-sci-fi-click-900.wav | Bin 0 -> 184244 bytes .../sounds/mixkit-sci-fi-confirmation-914.wav | Bin 0 -> 276320 bytes settings.gradle | 1 + src/main/java/de/hype/bbsentials/api/Discord.java | 70 --- .../java/de/hype/bbsentials/api/ISimpleOption.java | 5 - src/main/java/de/hype/bbsentials/api/Options.java | 13 - src/main/java/de/hype/bbsentials/chat/Chat.java | 466 ----------------- src/main/java/de/hype/bbsentials/chat/Message.java | 117 ----- src/main/java/de/hype/bbsentials/chat/Sender.java | 106 ---- .../java/de/hype/bbsentials/client/BBUtils.java | 66 --- .../java/de/hype/bbsentials/client/BBsentials.java | 261 ---------- .../client/BBsentialsConfigScreemFactory.java | 304 ----------- .../bbsentials/client/Commands/CommandsOLD.java | 365 ------------- .../java/de/hype/bbsentials/client/Config.java | 205 -------- .../java/de/hype/bbsentials/client/CustomGson.java | 28 - .../de/hype/bbsentials/client/DebugThread.java | 52 -- .../de/hype/bbsentials/client/ModMenueScreen.java | 18 - .../de/hype/bbsentials/client/SplashManager.java | 58 --- .../client/SplashStatusUpdateListener.java | 65 --- .../de/hype/bbsentials/client/ToDisplayConfig.java | 96 ---- .../communication/BBsentialConnection.java | 569 --------------------- .../constants/BBDisplayNameProvider.java | 23 - .../constants/BBDisplayNameProviderWithCustom.java | 6 - .../enviromentShared/AuthenticationConstants.java | 7 - .../constants/enviromentShared/ChChestItem.java | 46 -- .../constants/enviromentShared/ChChestItems.java | 87 ---- .../constants/enviromentShared/EnumUtils.java | 208 -------- .../enviromentShared/InternalReasonConstants.java | 14 - .../constants/enviromentShared/Islands.java | 47 -- .../constants/enviromentShared/MiningEvents.java | 39 -- .../mixins/ClientCommandSourceMixin.java | 56 -- .../hype/bbsentials/mixins/ItemRendererMixin.java | 40 -- .../de/hype/bbsentials/mixins/ScreenMixin.java | 26 - .../hype/bbsentials/mixins/SimpleOptionMixin.java | 33 -- .../de/hype/bbsentials/packets/AbstractPacket.java | 67 --- .../bbsentials/packets/EnviromentPacketConfig.java | 7 - .../java/de/hype/bbsentials/packets/Packet.java | 26 - .../de/hype/bbsentials/packets/PacketManager.java | 53 -- .../de/hype/bbsentials/packets/PacketUtils.java | 103 ---- .../packets/packets/BingoChatMessagePacket.java | 25 - .../packets/packets/BroadcastMessagePacket.java | 18 - .../bbsentials/packets/packets/ChChestPacket.java | 23 - .../packets/packets/DisconnectPacket.java | 23 - .../packets/DisplayTellrawMessagePacket.java | 12 - .../packets/packets/InternalCommandPacket.java | 32 -- .../packets/InvalidCommandFeedbackPacket.java | 24 - .../packets/packets/MiningEventPacket.java | 25 - .../bbsentials/packets/packets/PartyPacket.java | 16 - .../packets/packets/PunishUserPacket.java | 24 - .../packets/packets/RequestConnectPacket.java | 20 - .../packets/packets/SplashNotifyPacket.java | 28 - .../packets/packets/SplashUpdatePacket.java | 22 - .../packets/packets/SystemMessagePacket.java | 16 - .../packets/packets/WelcomeClientPacket.java | 18 - .../assets/bbsentials/textures/item/splash_hub.png | Bin 5537 -> 0 bytes .../resources/assets/public_bbsentials_cert.crt | Bin 1431 -> 0 bytes src/main/resources/bbsentials.mixins.json | 16 - src/main/resources/fabric.mod.json | 43 -- src/main/resources/logo.png | Bin 2092 -> 0 bytes .../resources/sounds/mixkit-gaming-lock-2848.wav | Bin 201240 -> 0 bytes .../sounds/mixkit-interface-option-select-2573.wav | Bin 274068 -> 0 bytes src/main/resources/sounds/mixkit-long-pop-2358.wav | Bin 226002 -> 0 bytes .../resources/sounds/mixkit-sci-fi-click-900.wav | Bin 184244 -> 0 bytes .../sounds/mixkit-sci-fi-confirmation-914.wav | Bin 276320 -> 0 bytes 141 files changed, 4470 insertions(+), 4234 deletions(-) delete mode 100644 build.gradle create mode 100644 common/build.gradle create mode 100644 common/src/main/java/de/hype/bbsentials/common/api/Discord.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/api/Formatting.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/chat/Chat.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/chat/Message.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/chat/Sender.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/Commands/CommandsOLD.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/Config.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/CustomGson.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/DebugThread.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/SplashManager.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/SplashStatusUpdateListener.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/client/ToDisplayConfig.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/communication/BBsentialConnection.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProvider.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/BBDisplayNameProviderWithCustom.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/AuthenticationConstants.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItem.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/ChChestItems.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/EnumUtils.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/InternalReasonConstants.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/Islands.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/constants/enviromentShared/MiningEvents.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/mclibraries/BBUtils.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/AbstractPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/EnviromentPacketConfig.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/Packet.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/PacketManager.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/PacketUtils.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/BingoChatMessagePacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/BroadcastMessagePacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/ChChestPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/DisconnectPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/DisplayTellrawMessagePacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/InternalCommandPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/InvalidCommandFeedbackPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/MiningEventPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/PartyPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/PunishUserPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/RequestConnectPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashNotifyPacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/SplashUpdatePacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/SystemMessagePacket.java create mode 100644 common/src/main/java/de/hype/bbsentials/common/packets/packets/WelcomeClientPacket.java create mode 100644 common/src/main/resources/assets/bbsentials/textures/item/splash_hub.png create mode 100644 common/src/main/resources/assets/public_bbsentials_cert.crt create mode 100644 common/src/main/resources/bbsentials.mixins.json create mode 100644 common/src/main/resources/fabric.mod.json create mode 100644 common/src/main/resources/logo.png create mode 100644 common/src/main/resources/sounds/mixkit-gaming-lock-2848.wav create mode 100644 common/src/main/resources/sounds/mixkit-interface-option-select-2573.wav create mode 100644 common/src/main/resources/sounds/mixkit-long-pop-2358.wav create mode 100644 common/src/main/resources/sounds/mixkit-sci-fi-click-900.wav create mode 100644 common/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav create mode 100644 fabric/build.gradle create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/BBUtils.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/BBsentialsConfigScreemFactory.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/FabricChat.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/MCUtils.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/ModInitialiser.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/ModMenueScreen.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/Options.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ClientCommandSourceMixin.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ItemRendererMixin.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/mixins/ScreenMixin.java create mode 100644 fabric/src/main/java/de/hype/bbsentials/fabric/mixins/SimpleOptionMixin.java create mode 100644 fabric/src/main/resources/assets/bbsentials/textures/item/splash_hub.png create mode 100644 fabric/src/main/resources/assets/public_bbsentials_cert.crt create mode 100644 fabric/src/main/resources/bbsentials.mixins.json create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 fabric/src/main/resources/logo.png create mode 100644 fabric/src/main/resources/sounds/mixkit-gaming-lock-2848.wav create mode 100644 fabric/src/main/resources/sounds/mixkit-interface-option-select-2573.wav create mode 100644 fabric/src/main/resources/sounds/mixkit-long-pop-2358.wav create mode 100644 fabric/src/main/resources/sounds/mixkit-sci-fi-click-900.wav create mode 100644 fabric/src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav delete mode 100644 src/main/java/de/hype/bbsentials/api/Discord.java delete mode 100644 src/main/java/de/hype/bbsentials/api/ISimpleOption.java delete mode 100644 src/main/java/de/hype/bbsentials/api/Options.java delete mode 100644 src/main/java/de/hype/bbsentials/chat/Chat.java delete mode 100644 src/main/java/de/hype/bbsentials/chat/Message.java delete mode 100644 src/main/java/de/hype/bbsentials/chat/Sender.java delete mode 100644 src/main/java/de/hype/bbsentials/client/BBUtils.java delete mode 100644 src/main/java/de/hype/bbsentials/client/BBsentials.java delete mode 100644 src/main/java/de/hype/bbsentials/client/BBsentialsConfigScreemFactory.java delete mode 100644 src/main/java/de/hype/bbsentials/client/Commands/CommandsOLD.java delete mode 100644 src/main/java/de/hype/bbsentials/client/Config.java delete mode 100644 src/main/java/de/hype/bbsentials/client/CustomGson.java delete mode 100644 src/main/java/de/hype/bbsentials/client/DebugThread.java delete mode 100644 src/main/java/de/hype/bbsentials/client/ModMenueScreen.java delete mode 100644 src/main/java/de/hype/bbsentials/client/SplashManager.java delete mode 100644 src/main/java/de/hype/bbsentials/client/SplashStatusUpdateListener.java delete mode 100644 src/main/java/de/hype/bbsentials/client/ToDisplayConfig.java delete mode 100644 src/main/java/de/hype/bbsentials/communication/BBsentialConnection.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/BBDisplayNameProvider.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/BBDisplayNameProviderWithCustom.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/AuthenticationConstants.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/ChChestItem.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/ChChestItems.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/EnumUtils.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/InternalReasonConstants.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/Islands.java delete mode 100644 src/main/java/de/hype/bbsentials/constants/enviromentShared/MiningEvents.java delete mode 100644 src/main/java/de/hype/bbsentials/mixins/ClientCommandSourceMixin.java delete mode 100644 src/main/java/de/hype/bbsentials/mixins/ItemRendererMixin.java delete mode 100644 src/main/java/de/hype/bbsentials/mixins/ScreenMixin.java delete mode 100644 src/main/java/de/hype/bbsentials/mixins/SimpleOptionMixin.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/AbstractPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/EnviromentPacketConfig.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/Packet.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/PacketManager.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/PacketUtils.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/BingoChatMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/BroadcastMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/ChChestPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/DisconnectPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/DisplayTellrawMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/InternalCommandPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/InvalidCommandFeedbackPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/MiningEventPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/PartyPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/PunishUserPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/RequestConnectPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/SplashNotifyPacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/SplashUpdatePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/SystemMessagePacket.java delete mode 100644 src/main/java/de/hype/bbsentials/packets/packets/WelcomeClientPacket.java delete mode 100644 src/main/resources/assets/bbsentials/textures/item/splash_hub.png delete mode 100644 src/main/resources/assets/public_bbsentials_cert.crt delete mode 100644 src/main/resources/bbsentials.mixins.json delete mode 100644 src/main/resources/fabric.mod.json delete mode 100644 src/main/resources/logo.png delete mode 100644 src/main/resources/sounds/mixkit-gaming-lock-2848.wav delete mode 100644 src/main/resources/sounds/mixkit-interface-option-select-2573.wav delete mode 100644 src/main/resources/sounds/mixkit-long-pop-2358.wav delete mode 100644 src/main/resources/sounds/mixkit-sci-fi-click-900.wav delete mode 100644 src/main/resources/sounds/mixkit-sci-fi-confirmation-914.wav diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 49c5e5c..0000000 --- a/build.gradle +++ /dev/null @@ -1,97 +0,0 @@ -plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' - id 'maven-publish' -} - -version = project.mod_version -group = project.maven_group - -repositories { - maven { url 'https://maven.terraformersmc.com/releases' } - maven { url "https://maven.shedaniel.me/" } - - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. -} - -dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation 'com.terraformersmc:modmenu:8.0.0' - //https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/7.2.2/modmenu-7.2.2.pom - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modApi("me.shedaniel.cloth:cloth-config-fabric:12.0.109") { - exclude(group: "net.fabricmc.fabric-api") - } -} - -processResources { - inputs.property "version", project.version - inputs.property "minecraft_version", project.minecraft_version - inputs.property "loader_version", project.loader_version - //inputs.property "discord", project.discord - filteringCharset "UTF-8" - - filesMatching("fabric.mod.json") { - expand "version": project.version, - "minecraft_version": project.minecraft_version, - "loader_version": project.loader_version - } -} - -def targetJavaVersion = 17 -tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - it.options.release = targetJavaVersion - } -} - -java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } - archivesBaseName = project.archives_base_name - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() -} - -jar { - from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } - } - manifest { - attributes 'Fabric-MixinConfigs': 'modid.mixin.json', - 'MixinConfigs': 'modid.mixin.json' - } -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - // Add repositories to publish to here. - // Notice: This block does NOT have the same function as the block in the top level. - // The repositories here will be used for publishing your artifact, not for - // retrieving dependencies. - } -} diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..3aaffbf --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,94 @@ +plugins { + id 'fabric-loom' version '1.2-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +repositories { + maven { url 'https://maven.terraformersmc.com/releases' } + maven { url "https://maven.shedaniel.me/" } + + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation 'com.terraformersmc:modmenu:8.0.0' + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modApi("me.shedaniel.cloth:cloth-config-fabric:12.0.109") { + exclude(group: "net.fabricmc.fabric-api") + } +} + +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + //inputs.property "discord", project.discord + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version + } +} + +def targetJavaVersion = 17 +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release = targetJavaVersion + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + archivesBaseName = project.archives_base_name + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}" } + } + manifest { + attributes 'Fabric-MixinConfigs': 'modid.mixin.json', + 'MixinConfigs': 'modid.mixin.json' + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/common/src/main/java/de/hype/bbsentials/common/api/Discord.java b/common/src/main/java/de/hype/bbsentials/common/api/Discord.java new file mode 100644 index 0000000..6b2f468 --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/api/Discord.java @@ -0,0 +1,70 @@ +package de.hype.bbsentials.common.api; + +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; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; + +public class Discord { + public static void sendWebhookMessage(String message) { + Thread thread = new Thread(new Runnable() { + @Override + public void run() { + sendWebhookMessageNoThread(message); + } + }); + thread.start(); + } + + + public static void sendWebhookMessageNoThread(String message) { + CloseableHttpClient httpClient = HttpClients.createDefault(); + String WEBHOOK_URL = "https://discord.com/api/v8/webhooks/1127524566407860276/" + BBsentials.getConfig().getApiKey(); + + + try { + HttpPost httpPost = new HttpPost(WEBHOOK_URL); + + StringEntity jsonEntity = new StringEntity("{\"content\": \"" + message + "\"}", StandardCharsets.UTF_8); + jsonEntity.setContentType("application/json"); + httpPost.setEntity(jsonEntity); + + CloseableHttpResponse response = httpClient.execute(httpPost); + HttpEntity responseEntity = response.getEntity(); + + if (responseEntity != null) { + InputStream inputStream = responseEntity.getContent(); + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); + + String line; + StringBuilder responseBuilder = new StringBuilder(); + while ((line = reader.readLine()) != null) { + responseBuilder.append(line); + } + + String responseString = responseBuilder.toString(); + Chat.sendPrivateMessageToSelfInfo(responseString); + } + + response.close(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + httpClient.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java b/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java new file mode 100644 index 0000000..c8702d4 --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/api/Formatting.java @@ -0,0 +1,36 @@ +package de.hype.bbsentials.common.api; + +public enum Formatting{ + BLACK("§0"), + DARK_BLUE("§1"), + DARK_GREEN("§2"), + DARK_AQUA("§3"), + DARK_RED("§4"), + DARK_PURPLE("§5"), + GOLD("§6"), + GRAY("§7"), + DARK_GRAY("§8"), + BLUE("§9"), + GREEN("§a"), + AQUA("§b"), + RED("§c"), + LIGHT_PURPLE("§d"), + YELLOW("§e"), + BOLD("§l"), + ITALIC("§o"), + UNDERLINE("§n"), + STRIKETHROUGH("§m"), + RESET("§r"), + WHITE("§f"); + + private final String code; + + Formatting(String code) { + this.code = code; + } + + @Override + public String toString() { + return code; + } +} diff --git a/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java b/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java new file mode 100644 index 0000000..28808d9 --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/api/ISimpleOption.java @@ -0,0 +1,5 @@ +package de.hype.bbsentials.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/common/chat/Chat.java new file mode 100644 index 0000000..1d7aef1 --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/chat/Chat.java @@ -0,0 +1,441 @@ +package de.hype.bbsentials.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.packets.packets.SplashUpdatePacket; +import net.minecraft.text.Text; + +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Clip; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.time.Instant; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +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[] getVariableInfo(String packageName, String className) { + List variableInfoList = new ArrayList<>(); + + // Combine the class name with the package name + String fullClassName = packageName + "." + className; + + // Load the class + Class clazz = null; + try { + clazz = Class.forName(fullClassName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + + // Extract fields of the class + Field[] fields = clazz.getDeclaredFields(); + + // Collect information for each field + for (Field field : fields) { + // Exclude transient fields + if (java.lang.reflect.Modifier.isTransient(field.getModifiers())) { + continue; + } + String variableName = field.getName(); + String variablePackageName = clazz.getPackage().getName(); + String variableClassName = clazz.getSimpleName(); + + variableInfoList.add(variableName); + } + + return variableInfoList.toArray(new String[variableInfoList.size()]); + } + + public static void setVariableValue(Object obj, String variableName, String value) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException { + if (value == null) { + // Handle null value case + sendPrivateMessageToSelfError("Invalid value: null"); + return; + } + + Class objClass = obj.getClass(); + Field field = objClass.getDeclaredField(variableName); + field.setAccessible(true); + + // Get the type of the field + Class fieldType = field.getType(); + + // Convert the value to the appropriate type + Object convertedValue = parseValue(value, fieldType); + + if (Modifier.isStatic(field.getModifiers())) { + // If the field is static + field.set(null, convertedValue); + } + else { + field.set(obj, convertedValue); + } + + // Check and output the value of the variable + sendPrivateMessageToSelfSuccess("The variable " + field.getName() + " is now: " + field.get(obj)); + } + + private static Object parseValue(String value, Class targetType) { + if (targetType == int.class || targetType == Integer.class) { + return Integer.parseInt(value); + } + else if (targetType == double.class || targetType == Double.class) { + return Double.parseDouble(value); + } + else if (targetType == float.class || targetType == Float.class) { + return Float.parseFloat(value); + } + else if (targetType == long.class || targetType == Long.class) { + return Long.parseLong(value); + } + else if (targetType == boolean.class || targetType == Boolean.class) { + return Boolean.parseBoolean(value); + } + else { + // For other types, return the original string value + return value; + } + } + + public static void getVariableValue(Object object, String variableName) throws NoSuchFieldException, IllegalAccessException { + Class objClass = object.getClass(); + Field field = objClass.getDeclaredField(variableName); + field.setAccessible(true); + sendPrivateMessageToSelfSuccess("The variable " + field.getName() + " is: " + field.get(object)); + } + + public Message onEvent(Message text) { + if (!isSpam(text.toString())) { + if (getConfig().isDetailedDevModeEnabled()) { + System.out.println("got a message: " + text.getJson()); + } + Message message = new Message(text.toString(),text.getString()); + executionService.execute(() -> processThreaded(message)); + return processNotThreaded(message); + } + return text; // Return the original message if it is spam + } + + //Handle in the messages which need to be modified here + public Message processNotThreaded(Message message) { +// if (message.isFromParty()) { +// message.replaceInJson("\"action\":\"run_command\",\"value\":\"/viewprofile", "\"action\":\"run_command\",\"value\":\"/bviewprofile " + messageUnformatted.split(">", 1)[1].trim()); +// } + if (message.isFromReportedUser()) { + sendPrivateMessageToSelfBase(Formatting.RED + "B: " + message.getUnformattedString()); + return null; + } + if (config.doPartyChatCustomMenu && message.isFromParty()) { + message.replaceInJson("/viewprofile \\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", "/socialoptions party " + message.getPlayerName() + " " + message.getUnformattedString()); + } + else if (config.doGuildChatCustomMenu && message.isFromGuild()) { + message.replaceInJson("/viewprofile \\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", "/socialoptions guild " + message.getPlayerName() + " " + message.getUnformattedString()); + } + else if (config.doAllChatCustomMenu) { + System.out.println("User: '" + message.getPlayerName() + "' | Message: " + message.getUnformattedString()); + message.replaceInJson("/socialoptions " + message.getPlayerName(), "/socialoptions sb " + message.getPlayerName() + " " + message.getUnformattedString()); + } + + return message; + } + + public void processThreaded(Message message) { + if (message.getString() != null) { + String messageUnformatted = message.getUnformattedString(); + String username = message.getPlayerName(); + if (message.isFromReportedUser()) { + + } + else if (!MCUtils.isWindowFocused()) { + if (config.doDesktopNotifications) { + if ((messageUnformatted.endsWith("is visiting Your Garden !") || messageUnformatted.endsWith("is visiting Your Island !")) && !MCUtils.isWindowFocused() && config.doDesktopNotifications) { + sendNotification("BBsentials Visit-Watcher", messageUnformatted); + } + else if (message.isMsg()) { + sendNotification("BBsentials Message Notifier", username + " sent you the following message: " + message.getMessageContent()); + } + if (message.getMessageContent().toLowerCase().contains(getConfig().getUsername().toLowerCase()) || (message.getMessageContent().toLowerCase().contains(getConfig().getNickname().toLowerCase() + " ") && getConfig().getNotifForParty().toLowerCase().equals("nick")) || getConfig().getNotifForParty().toLowerCase().equals("all")) { + sendNotification("BBsentials Party Chat Notification", username + " : " + message.getMessageContent()); + } + else { + if (message.getMessageContent().toLowerCase().contains(getConfig().getUsername().toLowerCase()) || message.getMessageContent().toLowerCase().contains(config.getNickname().toLowerCase() + " ")) { + sendNotification("BBsentials Notifier", "You got mentioned in chat! " + message.getMessageContent()); + } + } + } + } + else if (message.isServerMessage()) { + if (messageUnformatted.contains("disbanded the party")) { + lastPartyDisbandedUsername = username; + partyDisbandedMap.put(username, Instant.now()); + } + else if (message.contains("invited you to join their party")) { + if (lastPartyDisbandedUsername != null && partyDisbandedMap != null) { + Instant lastDisbandedInstant = partyDisbandedMap.get(lastPartyDisbandedUsername); + if (config.acceptReparty) { + if (lastDisbandedInstant != null && lastDisbandedInstant.isAfter(Instant.now().minusSeconds(20)) && (username.equals(lastPartyDisbandedUsername))) { + sendCommand("/p accept " + username); + } + } + } + if (!MCUtils.isWindowFocused()) { + sendNotification("BBsentials Party Notifier", "You got invited too a party by: " + username); + } + } + else if (message.startsWith("Party Members (")) { + Config.partyMembers = new ArrayList<>(); + } + else if (message.startsWith("Party Moderators:")) { + String temp = messageUnformatted.replace("Party Moderators:", "").replace(" ●", "").replaceAll("\\s*\\[[^\\]]+\\]", "").trim(); + if (temp.contains(",")) { + for (int i = 0; i < temp.split(",").length; i++) { + Config.partyMembers.add(temp.split(",")[i - 1]); + } + } + else { + Config.partyMembers.add(temp); + } + } + else if (message.startsWith("Party Members:")) { + String temp = messageUnformatted.replace("Party Members:", "").replace(" ●", "").replaceAll("\\s*\\[[^\\]]+\\]", "").trim(); + if (temp.contains(",")) { + for (int i = 0; i < temp.split(",").length; i++) { + System.out.println("Added to plist: " + (temp.split(",")[i - 1])); + Config.partyMembers.add(temp.split(",")[i - 1]); + } + } + else { + Config.partyMembers.add(temp); + } + } + else if ((message.contains("Party Leader:") && !message.contains(getConfig().getUsername())) || message.equals("You are not currently in a party.") || (message.contains("warped the party into a Skyblock Dungeon") && !message.startsWith(getConfig().getUsername()) || (!message.startsWith("The party was transferred to " + getConfig().getUsername()) && message.startsWith("The party was transferred to"))) || messageUnformatted.endsWith(getConfig().getUsername() + " is now a Party Moderator") || (message.startsWith("The party was disbanded")) || (message.contains("You have joined ") && message.contains("'s party!")) || (message.contains("Party Leader, ") && message.contains(" , summoned you to their server.")) || (message.contains("warped to your dungeon"))) { + BBsentials.getConfig().setIsLeader(false); + if (getConfig().isDetailedDevModeEnabled()) { + sendPrivateMessageToSelfDebug("Leader: " + getConfig().isLeader()); + } + } + else if (config.getPlayersInParty().length == 0 && messageUnformatted.endsWith("to the party! They have 60 seconds to accept")) { + config.setIsLeader(true); + } + else if (messageUnformatted.startsWith("You'll be partying with:")) { + List members = new ArrayList<>(); + for (String users : messageUnformatted.replace("You'll be partying with:", "").replaceAll("\\[[^\\]]*\\]","").trim().split(",")) { + if (users.contains("and ")){break;} + members.add(users); + } + Config.partyMembers=members; + } + else if (((messageUnformatted.startsWith("Party Leader: ") && messageUnformatted.endsWith(getConfig().getUsername() + " ●"))) || (message.contains(getConfig().getUsername() + " warped the party to a SkyBlock dungeon!")) || message.startsWith("The party was transferred to " + getConfig().getUsername()) || message.getUnformattedString().endsWith(" has promoted " + getConfig().getUsername() + " to Party Leader") || (message.contains("warped to your dungeon"))) { + BBsentials.getConfig().setIsLeader(true); + if (getConfig().isDetailedDevModeEnabled()) { + sendPrivateMessageToSelfDebug("Leader: " + getConfig().isLeader()); + } + } + else if (message.getUnformattedString().equals("Please type /report confirm to log your report for staff review.")) { + sendCommand("/report confirm"); + } + else if (messageUnformatted.startsWith("BUFF! You splashed yourself with")) { + if (splashStatusUpdateListener != null) { + splashStatusUpdateListener.setStatus(SplashUpdatePacket.STATUS_SPLASHING); + } + } + } + + else if (message.isFromGuild()) { + + } + else if (message.isFromParty()) { + + } + else if (message.isMsg()) { + if (messageUnformatted.endsWith("bb:party me")) { + if (BBsentials.getConfig().allowBBinviteMe()) { + sendCommand("/p " + username); + } + } + } + else { + if (message.contains("[OPEN MENU]") || message.contains("[YES]")) { + setChatPromtId(message.getJson()); + } + } + } + } + + //{"strikethrough":false,"extra":[{"strikethrough":false,"clickEvent":{"action":"run_command","value":"/viewprofile 4fa1228c-8dd6-47c4-8fe3-b04b580311b8"},"hoverEvent":{"action":"show_text","contents":{"strikethrough":false,"text":"§eClick here to view §bHype_the_Time§e's profile"}},"text":"§9Party §8> §b[MVP§2+§b] Hype_the_Time§f: "},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"text":"h:test"}],"text":""}// {"strikethrough":false,"extra":[{"strikethrough":false,"clickEvent":{"action":"run_command","value":"/viewprofile f772b2c7-bd2a-46e1-b1a2-41fa561157d6"},"hoverEvent":{"action":"show_text","contents":{"strikethrough":false,"text":"§eClick here to view §bShourtu§e's profile"}},"text":"§9Party §8> §b[MVP§c+§b] Shourtu§f: "},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"text":"Hype_the_Time TEST"}],"text":""} + //{"strikethrough":false,"extra":[{"strikethrough":false,"clickEvent":{"action":"run_command","value":"/viewprofile 4fa1228c-8dd6-47c4-8fe3-b04b580311b8"},"hoverEvent":{"action":"show_text","contents":{"strikethrough":false,"text":"§eClick here to view §bHype_the_Time§e's profile"}},"text":"§9Party §8> §b[MVP§2+§b] Hype_the_Time§f: "},{"bold":false,"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"text":"h:test"}],"text":""} + private final Map partyDisbandedMap = new HashMap<>(); + private String lastPartyDisbandedUsername = null; + + + public boolean isSpam(String message) { + if (message.contains("Mana")) return true; + if (message.contains("Status")) return true; + if (message.contains("Achievement Points")) return true; + return false; + } + + public String test() { + //put test code here + sendNotification("test", "This is an example which was run of the h:test test"); + return new String(); + } + + public static void sendPrivateMessageToSelfError(String message) { + sendPrivateMessageToSelfBase(Formatting.RED + message); + } + + public static void sendPrivateMessageToSelfFatal(String message) { + sendPrivateMessageToSelfBase(Formatting.DARK_RED + message); + } + + public static void sendPrivateMessageToSelfSuccess(String message) { + sendPrivateMessageToSelfBase(Formatting.GREEN + message); + } + + public static void sendPrivateMessageToSelfInfo(String message) { + sendPrivateMessageToSelfBase(Formatting.YELLOW + message); + } + + public static void sendPrivateMessageToSelfImportantInfo(String message) { + sendPrivateMessageToSelfBase(Formatting.GOLD + message); + } + + public static void sendPrivateMessageToSelfDebug(String message) { + sendPrivateMessageToSelfBase(Formatting.AQUA + message); + } + + private static void sendPrivateMessageToSelfBase(String message) { + MCUtils.sendClientSideMessage(Message.of(message)); + } + + public static void sendPrivateMessageToSelfText(Message message) { + MCUtils.sendClientSideMessage(message); + } + + public static void sendCommand(String s) { + getConfig().sender.addSendTask(s); + } + + public void sendNotification(String title, String text) { + executionService.execute(() -> { + try { + InputStream inputStream = getClass().getResourceAsStream("/sounds/mixkit-sci-fi-confirmation-914.wav"); + AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(inputStream); + Clip clip = AudioSystem.getClip(); + clip.open(audioInputStream); + clip.start(); + Thread.sleep(clip.getMicrosecondLength() / 1000); + clip.close(); + audioInputStream.close(); + } catch (Exception e) { + e.printStackTrace(); + } + }); + List argsList = new ArrayList<>(); + argsList.add("--title"); + argsList.add(title); + argsList.add("--passivepopup"); + argsList.add(text); + argsList.add("5"); + + try { + ProcessBuilder processBuilder = new ProcessBuilder(); + processBuilder.command("kdialog"); + processBuilder.command().addAll(argsList); + + Process process = processBuilder.start(); + process.waitFor(); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + } + + public static Text createClientSideTellraw(String tellrawInput) { + Text formattedMessage = null; + try { + formattedMessage = Text.Serializer.fromJson(tellrawInput); + } catch (Exception e) { + e.printStackTrace(); + System.out.println("Invalid Json: \n" + tellrawInput); + } + return formattedMessage; + } + + public static void setChatPromtId(String logMessage) { + String cbUUIDPattern = "/cb ([a-fA-F0-9-]+)"; + Pattern cbPattern = Pattern.compile(cbUUIDPattern); + Matcher cbMatcher = cbPattern.matcher(logMessage); + + String yesClickAction = "/chatprompt ([a-fA-F0-9-]+) YES"; + Pattern yesPattern = Pattern.compile(yesClickAction); + Matcher yesMatcher = yesPattern.matcher(logMessage); + String lastPrompt = null; + if (cbMatcher.find()) { + lastPrompt = cbMatcher.group(1); + String finalLastPrompt1 = lastPrompt; + new Thread(new Runnable() { + @Override + public void run() { + String promptCommand = "/cb " + finalLastPrompt1; + BBsentials.getConfig().setLastChatPromptAnswer(promptCommand); + if (config.isDevModeEnabled()) { + Chat.sendPrivateMessageToSelfDebug("set the last prompt action too + \"" + promptCommand + "\""); + } + try { + Thread.sleep(10 * 1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + BBsentials.getConfig().setLastChatPromptAnswer(null); + return; + } + }).start(); + } + if (yesMatcher.find()) { + lastPrompt = yesMatcher.group(1); + String finalLastPrompt = lastPrompt; + new Thread(new Runnable() { + @Override + public void run() { + String promptCommand = "/chatprompt " + finalLastPrompt + " YES"; + getConfig().setLastChatPromptAnswer(promptCommand); + if (config.isDevModeEnabled()) { + Chat.sendPrivateMessageToSelfDebug("set the last prompt action too + \"" + promptCommand + "\""); + } + try { + Thread.sleep(10 * 1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + getConfig().setLastChatPromptAnswer(null); + return; + } + }).start(); + + } + } + + public static Text replaceAllForText(Text input, String replace, String replaceWith) { + String text = Text.Serializer.toJson(input); + if (text.contains(replace)) { + text = text.replaceAll("\\w{8}-\\w{4}-\\w{4}-\\w{4}-\\w{12}", ""); + } + text = text.replace(replace, replaceWith); + Text output = Text.Serializer.fromJson(text); + return output; + } +} diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Message.java b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java new file mode 100644 index 0000000..506146f --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/chat/Message.java @@ -0,0 +1,110 @@ +package de.hype.bbsentials.common.chat; + +import de.hype.bbsentials.common.client.BBsentials; + +public class Message { + private String text; + private String unformattedString = null; + private String playerName = null; + private String string; + + public Message(String textJson,String string) { + this.text = text; + this.string=string; + } + public static Message of(String string){ + return new Message("{\"text\":\""+string+"\"}",string); + } + // + public String getJson() { + return text; + } + + public String getString() { + return string; + } + + public String getUnformattedString() { + if (unformattedString != null) return unformattedString; + unformattedString = string.replaceAll("§.", "").trim(); + return unformattedString; + } + + public String getMessageContent() { + if (isServerMessage()) return unformattedString; + return getUnformattedString().split(":", 2)[1]; + } + + Boolean guild = null; + + public boolean isFromGuild() { + if (guild != null) return guild; + guild = getUnformattedString().startsWith("Guild >"); + return guild; + } + + Boolean party = null; + + public boolean isFromParty() { + if (party != null) return party; + party = getUnformattedString().startsWith("Party >"); + return party; + } + + Boolean msg = null; + + public boolean isMsg() { + if (msg != null) return msg; + msg = getUnformattedString().startsWith("From") || getUnformattedString().startsWith("To"); + return msg; + } + + Boolean server = null; + + public boolean isServerMessage() { + if (server != null) return server; + int space = getUnformattedString().indexOf(" "); + int doublepoint = getUnformattedString().indexOf(":"); + return ((space + 2 < doublepoint)||doublepoint==-1||space==-1); + } + + public String getPlayerName() { + if (playerName != null) return playerName; + playerName = getUnformattedString(); + if (!playerName.contains(":")) { + playerName = ""; + return ""; + } + playerName = playerName.split(":", 2)[0]; + if (isMsg()) { + playerName = playerName.replaceFirst("From", "").replace("To", "").trim(); + } + if (playerName.contains(">")){ + playerName=playerName.split(">",2)[1]; + } +// playerName = playerName.replaceFirst("\\[[^\\]]*\\](?:\\s?[^\\x00-\\x7F]?\\s?\\[[^\\]]*\\])*", "").trim()// replaces every [] and unicode character before a asci character. + playerName = playerName.replaceAll("[^\\x00-\\x7F]","").replaceAll("\\[[^\\]]*\\]","").trim(); + if (playerName.matches("[^a-zA-Z0-9_-]+")) playerName = ""; + return playerName; + } + + public void replaceInJson(String replace, String replaceWith) { + text = text.replaceFirst(replace, replaceWith); + } + public boolean isFromReportedUser() { + return BBsentials.config.alreadyReported.contains(getPlayerName()) && !getPlayerName().isEmpty(); + } + + public boolean contains(String string) { + return getUnformattedString().contains(string); + } + + public boolean startsWith(String string) { + return getUnformattedString().startsWith(string); + } + + @Override + public String toString() { + return getUnformattedString(); + } +} diff --git a/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java b/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java new file mode 100644 index 0000000..3dfb13c --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/chat/Sender.java @@ -0,0 +1,104 @@ +package de.hype.bbsentials.common.chat; + +import de.hype.bbsentials.common.api.Formatting; + +import java.util.ArrayList; +import java.util.List; + +import static de.hype.bbsentials.common.chat.Chat.sendPrivateMessageToSelfInfo; +import static de.hype.bbsentials.common.chat.Chat.sendPrivateMessageToSelfText; + +public class Sender { + private final List sendQueue; + private final List sendQueueTiming; + private final List hidden; + + + public Sender() { + this.sendQueue = new ArrayList<>(); + this.sendQueueTiming = new ArrayList<>(); + this.hidden = new ArrayList<>(); + startSendingThread(); + } + + public void addSendTask(String task, double timing) { + synchronized (sendQueue) { + sendPrivateMessageToSelfText(Message.of(Formatting.GREEN + "Scheduled send-task (as " + sendQueueTiming.size() + " in line): " + task + " | Delay: " + timing)); + sendQueueTiming.add(timing); + sendQueue.add(task); + hidden.add(false); + sendQueue.notify(); // Notify the waiting thread that a new String has been added + } + } + + public void addHiddenSendTask(String task, double timing) { + synchronized (sendQueue) { + sendQueueTiming.add(timing); + sendQueue.add(task); + hidden.add(true); + + sendQueue.notify(); // Notify the waiting thread that a new String has been added + } + } + + public void addImmediateSendTask(String task) { + synchronized (sendQueue) { + sendQueueTiming.add(0, 0.0); + sendQueue.add(0, task); + hidden.add(false); + + sendQueue.notify(); // Notify the waiting thread that a new String has been added + } + } + + public void addSendTask(String task) { + addSendTask(task, 1); + } + + public void startSendingThread() { + Thread sendingThread = new Thread(new SendingRunnable()); + sendingThread.start(); + } + + private class SendingRunnable implements Runnable { + @Override + public void run() { + while (true) { + String task = getNextTask(); + if (task != null) { + send(task, sendQueueTiming.remove(0), hidden.remove(0)); + } + else { + synchronized (sendQueue) { + try { + sendQueue.wait(); // Wait for new Send + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + } + } + } + + private String getNextTask() { + synchronized (sendQueue) { + if (!sendQueue.isEmpty()) { + return sendQueue.remove(0); + } + return null; + } + } + + private void send(String toSend, double timing, boolean hidden) { + try { + Thread.sleep((long) (timing * 1000)); // Simulate the send operation + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + MC.sendChatMessage(toSend); + if (!hidden) { + sendPrivateMessageToSelfInfo("Sent Command to Server: " + toSend); + } + } + } +} diff --git a/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java b/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java new file mode 100644 index 0000000..0d5535f --- /dev/null +++ b/common/src/main/java/de/hype/bbsentials/common/client/BBsentials.java @@ -0,0 +1,247 @@ +package de.hype.bbsentials.common.client; + +import com.mojang.brigadier.arguments.StringArgumentType; +import de.hype.bbsentials.common.chat.Chat; +import de.hype.bbsentials.common.client.Commands.CommandsOLD; +import de.hype.bbsentials.common.communication.BBsentialConnection; +import de.hype.bbsentials.fabric.BBsentialsConfigScreemFactory; +import de.hype.bbsentials.fabric.Options; +import org.lwjgl.glfw.GLFW; + +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +public class BBsentials { + public static Config config; + public static BBsentialConnection connection; + public static CommandsOLD coms; + public static ScheduledExecutorService executionService = Executors.newScheduledThreadPool(1000); + public static boolean splashLobby; + private static Thread bbthread; + private static bool