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) diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java index 2b8ed28..6c072a1 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java +++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/ClientPlayNetworkHandlerMixin.java @@ -7,15 +7,8 @@ import land.chipmunk.chipmunkmod.listeners.Listener; import land.chipmunk.chipmunkmod.listeners.ListenerManager; import land.chipmunk.chipmunkmod.modules.*; import land.chipmunk.chipmunkmod.modules.custom_chat.CustomChat; -import net.minecraft.client.MinecraftClient; import net.minecraft.command.CommandRegistryAccess; import net.minecraft.command.CommandSource; -import net.minecraft.network.encryption.NetworkEncryptionUtils; -import net.minecraft.network.message.LastSeenMessagesCollector; -import net.minecraft.network.message.MessageBody; -import net.minecraft.network.message.MessageChain; -import net.minecraft.network.message.MessageSignatureData; -import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket; import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket; import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; import net.minecraft.network.packet.s2c.play.GameMessageS2CPacket; @@ -31,8 +24,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import java.time.Instant; - @Mixin(value = net.minecraft.client.network.ClientPlayNetworkHandler.class, priority = 1001) public class ClientPlayNetworkHandlerMixin { @Final @@ -42,10 +33,6 @@ public class ClientPlayNetworkHandlerMixin { @Shadow private DynamicRegistryManager.Immutable combinedDynamicRegistries; @Shadow - private LastSeenMessagesCollector lastSeenMessagesCollector; - @Shadow - private MessageChain.Packer messagePacker; - @Shadow private CommandDispatcher commandDispatcher; @Inject(method = "onGameJoin", at = @At("TAIL")) @@ -118,29 +105,18 @@ public class ClientPlayNetworkHandlerMixin { @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true) private void sendChatMessage(String chatText, CallbackInfo ci) { final CommandManager commandManager = CommandManager.INSTANCE; - - final String secret = String.valueOf(Chat.secret); - if (chatText.startsWith(commandManager.prefix)) { commandManager.executeCommand(chatText.substring(commandManager.prefix.length())); - - ci.cancel(); - } else if (!chatText.startsWith("/") && !chatText.startsWith(secret)) { - CustomChat.INSTANCE.chat(chatText); - ci.cancel(); + return; } - if (chatText.startsWith(secret)) { - final String content = chatText.substring(secret.length()); - - Instant instant = Instant.now(); - long l = NetworkEncryptionUtils.SecureRandomUtil.nextLong(); - LastSeenMessagesCollector.LastSeenMessages lastSeenMessages = this.lastSeenMessagesCollector.collect(); - MessageSignatureData messageSignatureData = this.messagePacker.pack(new MessageBody(content, instant, l, lastSeenMessages.lastSeen())); - MinecraftClient.getInstance().getNetworkHandler().sendPacket(new ChatMessageC2SPacket(content, instant, l, messageSignatureData, lastSeenMessages.update())); - - ci.cancel(); + if (Chat.NEXT_CHAT_PLAYER.get()) { + Chat.NEXT_CHAT_PLAYER.set(false); + return; } + + CustomChat.INSTANCE.chat(chatText); + ci.cancel(); } } diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/TextFieldWidgetMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/TextFieldWidgetMixin.java deleted file mode 100644 index c56b682..0000000 --- a/src/main/java/land/chipmunk/chipmunkmod/mixin/TextFieldWidgetMixin.java +++ /dev/null @@ -1,20 +0,0 @@ -package land.chipmunk.chipmunkmod.mixin; - -import net.minecraft.client.gui.widget.TextFieldWidget; -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.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TextFieldWidget.class) -public class TextFieldWidgetMixin { - @Shadow private int maxLength; - - @Inject(method = "setMaxLength", at = @At("HEAD"), cancellable = true) - private void setMaxLength (int length, CallbackInfo ci) { - this.maxLength = Integer.MAX_VALUE; - - ci.cancel(); - } -} diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java b/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java index 2f56502..26f6957 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java +++ b/src/main/java/land/chipmunk/chipmunkmod/modules/Chat.java @@ -4,15 +4,15 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.network.ClientPlayNetworkHandler; public class Chat { - public static double secret = Math.random(); + public static final ThreadLocal NEXT_CHAT_PLAYER = ThreadLocal.withInitial(() -> false); public static void sendChatMessage (String message) { sendChatMessage(message, false); } public static void sendChatMessage (String message, boolean usePlayerChat) { if (message == null) return; - final ClientPlayNetworkHandler networkHandler = MinecraftClient.getInstance().getNetworkHandler(); + if (usePlayerChat) NEXT_CHAT_PLAYER.set(true); - if (usePlayerChat) networkHandler.sendChatMessage(secret + message); - else networkHandler.sendChatMessage(message); + final ClientPlayNetworkHandler networkHandler = MinecraftClient.getInstance().getNetworkHandler(); + networkHandler.sendChatMessage(message); } } diff --git a/src/main/resources/chipmunkmod.mixins.json b/src/main/resources/chipmunkmod.mixins.json index 7110ff0..e2d09e8 100644 --- a/src/main/resources/chipmunkmod.mixins.json +++ b/src/main/resources/chipmunkmod.mixins.json @@ -13,8 +13,7 @@ "MinecraftClientAccessor", "StringHelperMixin", "ElderGuardianAppearanceParticleMixin", - "SoundSystemMixin", - "TextFieldWidgetMixin" + "SoundSystemMixin" ], "injectors": { "defaultRequire": 1