From 08503a6a17ae8af120817cbf3a6458f3e361268e Mon Sep 17 00:00:00 2001 From: kr1viah_ Date: Wed, 1 Oct 2025 10:17:22 +0200 Subject: [PATCH 1/4] Register handlers --- .../tools/redstone/redstonetools/malilib/config/Configs.java | 4 ++++ .../redstonetools/packets/RedstoneToolsClientPackets.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java b/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java index ad0c8793..04715a78 100644 --- a/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java +++ b/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java @@ -9,6 +9,7 @@ import fi.dy.masa.malilib.util.JsonUtils; import net.minecraft.client.MinecraftClient; import tools.redstone.redstonetools.RedstoneTools; +import tools.redstone.redstonetools.features.toggleable.AutoDustClient; import java.io.File; import java.util.ArrayList; @@ -38,7 +39,10 @@ public static class Toggles { return true; }); AUTODUST.getKeybind().setCallback((t, g) -> { + System.out.println("Current value: "); AUTODUST.setBooleanValue(!AUTODUST.getBooleanValue()); + System.out.println(AUTODUST); + System.out.println(AutoDustClient.isEnabled); return true; }); AUTOROTATE.getKeybind().setCallback((t, g) -> { diff --git a/src/client/java/tools/redstone/redstonetools/packets/RedstoneToolsClientPackets.java b/src/client/java/tools/redstone/redstonetools/packets/RedstoneToolsClientPackets.java index 370da2ec..488cb16f 100644 --- a/src/client/java/tools/redstone/redstonetools/packets/RedstoneToolsClientPackets.java +++ b/src/client/java/tools/redstone/redstonetools/packets/RedstoneToolsClientPackets.java @@ -7,6 +7,10 @@ public class RedstoneToolsClientPackets { public static void registerPackets() { + AutoDustClient.registerHandler(); + AutoRotateClient.registerHandler(); + ClickContainerClient.registerHandler(); + ClientPlayNetworking.registerGlobalReceiver(SetFeatureEnabledPayload.ID, ((payload, context) -> { String feature = payload.feature(); boolean enabled = payload.enabled(); From db23267a191996b98674895ae72be83fb6109136 Mon Sep 17 00:00:00 2001 From: kr1viah_ Date: Wed, 1 Oct 2025 17:01:47 +0200 Subject: [PATCH 2/4] Fix crash if inserted text is shorter than original text --- .../mixin/features/ChatInputSuggesterMixin.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/java/tools/redstone/redstonetools/mixin/features/ChatInputSuggesterMixin.java b/src/client/java/tools/redstone/redstonetools/mixin/features/ChatInputSuggesterMixin.java index 0a951112..1b322fab 100644 --- a/src/client/java/tools/redstone/redstonetools/mixin/features/ChatInputSuggesterMixin.java +++ b/src/client/java/tools/redstone/redstonetools/mixin/features/ChatInputSuggesterMixin.java @@ -5,6 +5,7 @@ import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -19,16 +20,20 @@ public class ChatInputSuggesterMixin { @Shadow TextFieldWidget textField; + @Unique + private boolean shouldReturn = false; + @Inject(method = "refresh", at = @At("HEAD")) private void meowww(CallbackInfo ci) { - if (!Configs.ClientData.ENABLE_MATH_VARIABLES.getBooleanValue()) return; + shouldReturn = !Configs.ClientData.ENABLE_MATH_VARIABLES.getBooleanValue() || StringUtils.insertVariablesAndMath(textField.getText()).length() < textField.getText().length(); + if (shouldReturn) return; unmodifiedCommand.add(textField.getText()); ((TextFieldAccessor)textField).setText2(StringUtils.insertVariablesAndMath(textField.getText())); } @Inject(method = "refresh", at = @At("RETURN")) private void mrawww(CallbackInfo ci) { - if (!Configs.ClientData.ENABLE_MATH_VARIABLES.getBooleanValue()) return; + if (shouldReturn) return; ((TextFieldAccessor)textField).setText2(unmodifiedCommand.getLast()); unmodifiedCommand.removeLast(); } From 995f2ce50b09f1bee90546fce03374b5db284bf3 Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Fri, 10 Oct 2025 10:43:55 +0200 Subject: [PATCH 3/4] Bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3990fc78..285a7c25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ maven_group = tools.redstone archives_base_name = redstonetools loader_version=0.16.10 -mod_version = v3.1.2 +mod_version = v3.1.3 minecraft_version=1.21.8 minecraft_version_out=1.21.8 From 0e2e73f3dd30e8fbef8c373365fd39790e249335 Mon Sep 17 00:00:00 2001 From: kr1viah_ <85935121+kr1viah@users.noreply.github.com> Date: Fri, 10 Oct 2025 10:45:56 +0200 Subject: [PATCH 4/4] Remove debug prints --- .../tools/redstone/redstonetools/malilib/config/Configs.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java b/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java index 04715a78..61ef5af4 100644 --- a/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java +++ b/src/client/java/tools/redstone/redstonetools/malilib/config/Configs.java @@ -39,10 +39,7 @@ public static class Toggles { return true; }); AUTODUST.getKeybind().setCallback((t, g) -> { - System.out.println("Current value: "); AUTODUST.setBooleanValue(!AUTODUST.getBooleanValue()); - System.out.println(AUTODUST); - System.out.println(AutoDustClient.isEnabled); return true; }); AUTOROTATE.getKeybind().setCallback((t, g) -> {