feat(legacy): ported nextgen spigotspam disabler & fixed custom backg…

…round (#3965)
CCBlueX · Sep 21, 2024 · a1da5c4 · a1da5c4
1 parent 4e19b7d
commit a1da5c4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/exploit/Disabler.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/exploit/Disabler.kt
@@ -16,6 +16,7 @@ import net.ccbluex.liquidbounce.value.BoolValue
 import net.ccbluex.liquidbounce.value.IntegerValue
 import net.ccbluex.liquidbounce.utils.ClientUtils.displayChatMessage
 import net.ccbluex.liquidbounce.utils.PacketUtils.sendPacket
+import net.ccbluex.liquidbounce.value.TextValue
 import net.minecraft.init.Items
 import net.minecraft.item.ItemStack
 import net.minecraft.network.play.client.C0BPacketEntityAction
@@ -37,6 +38,9 @@ object Disabler : Module("Disabler", Category.EXPLOIT, hideModule = false) {
     private val verusCombat by BoolValue("VerusCombat", false)
     private val onlyCombat by BoolValue("OnlyCombat", true) { verusCombat }
 
+    val spigotSpam by BoolValue("SpigotSpam", false)
+    val message by TextValue("Message", "/skill") { spigotSpam }
+
     private var transaction = false
     var isOnCombat = false
 

diff --git a/...main/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityPlayerSP.java b/...main/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityPlayerSP.java
@@ -48,6 +48,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -220,6 +221,14 @@ private void onUpdateWalkingPlayer(CallbackInfo ci) {
         ci.cancel();
     }
 
+    @ModifyVariable(method = "sendChatMessage", at = @At("HEAD"), ordinal = 0, argsOnly = true)
+    private String handleSendMessage(String content) {
+        if (Disabler.INSTANCE.handleEvents() && Disabler.INSTANCE.getSpigotSpam()) {
+            return Disabler.INSTANCE.getMessage() + " " + content;
+        }
+        return content;
+    }
+
     @Inject(method = "swingItem", at = @At("HEAD"), cancellable = true)
     private void swingItem(CallbackInfo callbackInfo) {
         final NoSwing noSwing = NoSwing.INSTANCE;

diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/Background.kt b/src/main/java/net/ccbluex/liquidbounce/utils/Background.kt
@@ -51,8 +51,14 @@ class ImageBackground(backgroundFile: File) : Background(backgroundFile) {
     private val resourceLocation = ResourceLocation("${CLIENT_NAME.lowercase()}/background.png")
 
     override fun initBackground() {
-        val image = ImageIO.read(backgroundFile.inputStream())
-        mc.textureManager.loadTexture(resourceLocation, DynamicTexture(image))
+        mc.addScheduledTask {
+            runCatching {
+                val image = ImageIO.read(backgroundFile.inputStream())
+                mc.textureManager.loadTexture(resourceLocation, DynamicTexture(image))
+            }.onFailure {
+                it.printStackTrace()
+            }
+        }
     }
 
     override fun drawBackground(width: Int, height: Int) {