diff options
| author | Aizistral | 2024-05-07 16:55:12 +0200 |
|---|---|---|
| committer | Aizistral | 2024-05-07 16:55:12 +0200 |
| commit | da686a10a44a6266fa18b5fd9d5443bd20a470dd (patch) | |
| tree | c4c3b9864e77a414afd9b0bb6231d53d6105f5d8 /src/main/java/com | |
| parent | 8a375213b3705f9a3f4da7168add669eaaac6398 (diff) | |
Partially fix mixins
Diffstat (limited to 'src/main/java/com')
3 files changed, 14 insertions, 16 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java index 1c1a57b..544ad61 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java @@ -34,10 +34,8 @@ public class MixinChatComponent { } @ModifyVariable(method = "addMessage(Lnet/minecraft/network/chat/Component;" - + "Lnet/minecraft/network/chat/MessageSignature;ILnet/minecraft/client/GuiMessageTag;Z)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ComponentRenderUtils;" - + "wrapComponents(Lnet/minecraft/network/chat/FormattedText;ILnet/minecraft/client/gui/Font;" - + ")Ljava/util/List;", ordinal = 0, shift = Shift.AFTER), argsOnly = true) + + "Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/GuiMessageTag;)V", + at = @At(value = "HEAD"), argsOnly = true) private synchronized GuiMessageTag modifyGUITag(GuiMessageTag tag) { if (!NCRConfig.getEncryption().showEncryptionIndicators() || !this.lastMessageEncrypted) return tag; @@ -53,10 +51,9 @@ public class MixinChatComponent { } @ModifyArg(index = 0, method = "addMessage(Lnet/minecraft/network/chat/Component;" - + "Lnet/minecraft/network/chat/MessageSignature;ILnet/minecraft/client/GuiMessageTag;Z)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ComponentRenderUtils;" - + "wrapComponents(Lnet/minecraft/network/chat/FormattedText;I" - + "Lnet/minecraft/client/gui/Font;)Ljava/util/List;", ordinal = 0)) + + "Lnet/minecraft/network/chat/MessageSignature;Lnet/minecraft/client/GuiMessageTag;)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/components/ChatComponent;" + + "logChatMessage(Lnet/minecraft/client/GuiMessage;)V", ordinal = 0, shift = Shift.BEFORE)) private FormattedText modifyGUIMessage(FormattedText msg) { if (NCRConfig.getCommon().enableDebugLog()) { NCRCore.LOGGER.info("Adding chat message, structure: " + diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index f94c8a6..44ef782 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -73,14 +73,14 @@ public abstract class MixinChatScreen extends Screen { } @Inject(method = "handleChatInput", at = @At("HEAD"), cancellable = true) - private void onHandleChatInput(String string, boolean bl, CallbackInfoReturnable<Boolean> info) { + private void onHandleChatInput(String string, boolean bl, CallbackInfo info) { if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ALWAYS) && !ServerSafetyState.allowChatSigning()) { if (this.minecraft.getConnection().getConnection().isEncrypted()) { if (!this.normalizeChatMessage(string).isEmpty()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); ServerSafetyState.scheduleSigningAction(NCRClient::resendLastChatMessage); ServerSafetyState.setAllowChatSigning(true); - info.setReturnValue(true); + info.cancel(); } } } @@ -99,21 +99,21 @@ public abstract class MixinChatScreen extends Screen { if (encrypt.length() > 0) { int maxEncryptedLength = MESSAGE_MAX_LENGTH - noencrypt.length(); - info.setReturnValue(noencrypt + getEncrypted(e, encrypt, maxEncryptedLength)); + info.setReturnValue(noencrypt + this.getEncrypted(e, encrypt, maxEncryptedLength)); } }); } } - + private String getEncrypted(Encryptor<?> e, String encrypt, int maxLength) { while (encrypt.length() > 0) { String encrypted = e.encrypt("#%" + encrypt); if (encrypted.length() <= maxLength) return encrypted; - + encrypt = encrypt.substring(0, encrypt.length() - 1); } - + return ""; } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index 240620d..87be749 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -8,6 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.gui.RealmsWarningScreen; import com.mojang.realmsclient.RealmsMainScreen; +import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.network.chat.CommonComponents; @@ -20,8 +21,8 @@ public class MixinTitleScreen extends Screen { throw new IllegalStateException("Can't touch this"); } - @Inject(method = "realmsButtonClicked", at = @At("HEAD"), cancellable = true) - private void onRealmsButtonClicked(CallbackInfo info) { + @Inject(method = "method_55814", at = @At("HEAD"), cancellable = true) + private void onRealmsButtonClicked(Button button, CallbackInfo info) { if (RealmsWarningScreen.shouldShow()) { this.minecraft.setScreen(new RealmsWarningScreen(new TitleScreen(), new RealmsMainScreen(this))); info.cancel(); |
