Skip to content
Merged

Dev #405

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down