From a97c047566e842f45fc49af4c8a90fe5acaaad51 Mon Sep 17 00:00:00 2001 From: amyavi <144570677+amyavi@users.noreply.github.com> Date: Sun, 6 Apr 2025 00:39:33 -0300 Subject: [PATCH] refactor: use ModifyConstant for infinite chat mixin --- .../chipmunkmod/mixin/ChatScreenMixin.java | 56 +++---------------- 1 file changed, 8 insertions(+), 48 deletions(-) diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java index b49a90f..f448864 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java +++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java @@ -6,15 +6,12 @@ import land.chipmunk.chipmunkmod.data.ChomeNSBotCommand; import land.chipmunk.chipmunkmod.modules.ChomeNSBotCommandSuggestions; import land.chipmunk.chipmunkmod.util.BotValidationUtilities; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.ChatInputSuggestor; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.text.MutableText; -import net.minecraft.text.Text; +import net.minecraft.client.gui.screen.ChatScreen; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import javax.net.ssl.HttpsURLConnection; @@ -26,49 +23,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -@Mixin(value = net.minecraft.client.gui.screen.ChatScreen.class) -public abstract class ChatScreenMixin extends Screen { - @Shadow - private String originalChatText; - - @Shadow - private int messageHistoryIndex; - - @Shadow - protected TextFieldWidget chatField; - - @Shadow - ChatInputSuggestor chatInputSuggestor; - - @Shadow - protected abstract void onChatFieldUpdate(String chatText); - - protected ChatScreenMixin(Text title) { - super(title); - } - +@Mixin(value = ChatScreen.class) +public abstract class ChatScreenMixin { // infinite chat - @Inject(method = "init", at = @At("HEAD"), cancellable = true) - protected void init(CallbackInfo ci) { - final MinecraftClient client = MinecraftClient.getInstance(); - - this.messageHistoryIndex = client.inGameHud.getChatHud().getMessageHistory().size(); - this.chatField = new TextFieldWidget(client.advanceValidatingTextRenderer, 4, this.height - 12, this.width - 4, 12, Text.translatable("chat.editBox")) { - protected MutableText getNarrationMessage() { - return super.getNarrationMessage().append(ChatScreenMixin.this.chatInputSuggestor.getNarration()); - } - }; - this.chatField.setMaxLength(Integer.MAX_VALUE); - this.chatField.setDrawsBackground(false); - this.chatField.setText(this.originalChatText); - this.chatField.setChangedListener(this::onChatFieldUpdate); - this.chatField.setFocusUnlocked(false); - this.addSelectableChild(this.chatField); - this.chatInputSuggestor = new ChatInputSuggestor(this.client, this, this.chatField, this.textRenderer, false, false, 1, 10, true, -805306368); - this.chatInputSuggestor.setCanLeave(false); - this.chatInputSuggestor.refresh(); - - ci.cancel(); + @ModifyConstant(method = "init", constant = @Constant(intValue = 256)) + protected int init$maxLength(final int old) { + return Integer.MAX_VALUE; } @Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)