diff options
| author | Aizistral | 2022-10-29 16:38:30 +0200 |
|---|---|---|
| committer | Aizistral | 2022-10-29 16:38:30 +0200 |
| commit | d081e49c2fa3208090a905dd57611e8ab3c78fa5 (patch) | |
| tree | 54f5026862240448e3c8cc07d86f4b94b13a28a0 /src/main | |
| parent | 2a8b30858140fb2856f60a093b44b4ef089bdfa0 (diff) | |
Migrate basic stuffs
Diffstat (limited to 'src/main')
12 files changed, 84 insertions, 62 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java b/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java index cd24a10..b1fc036 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/AwaitConnectionScreen.java @@ -32,7 +32,7 @@ public class AwaitConnectionScreen extends Screen { this.clearWidgets(); this.millisAwaiting = Util.getMillis(); - this.addRenderableWidget(new Button(this.width / 2 - 100, this.height / 4 + 120 + 12, 200, 20, CommonComponents.GUI_CANCEL, button -> { + this.addRenderableWidget(Button.builder(CommonComponents.GUI_CANCEL, button -> { if (NCRConfig.getCommon().enableDebugLog()) { NoChatReports.LOGGER.info("Aborted reconnect await!"); } @@ -40,7 +40,7 @@ public class AwaitConnectionScreen extends Screen { this.aborted = true; this.minecraft.setScreen(this.parent); ServerSafetyState.reset(); - })); + }).pos(this.width / 2 - 100, this.height / 4 + 120 + 12).size(200, 20).build()); } @Override diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java index 383748e..7bd6b57 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java @@ -4,8 +4,10 @@ import java.util.List; import org.spongepowered.include.com.google.common.base.Objects; +import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.config.NCRConfigEncryption; +import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.encryption.Encryption; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; @@ -87,7 +89,7 @@ public class EncryptionConfigScreen extends Screen { this.keyField.setResponder(this::onKeyUpdate); this.addWidget(this.keyField); - var button = new ImageButton(this.keyField.x + this.keyField.getWidth() - 15, this.keyField.y + 3, 12, + var button = new ImageButton(this.keyField.getX() + this.keyField.getWidth() - 15, this.keyField.getY() + 3, 12, 12, 0, 0, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> this.renderTooltip(poseStack, this.minecraft.font.split(this.validationIcon.yTexStart == 0 ? VALIDATION_OK : VALIDATION_FAILED, 250), i, j), Component.empty()); @@ -96,7 +98,7 @@ public class EncryptionConfigScreen extends Screen { this.addRenderableOnly(this.validationIcon = button); - button = new ImageButton(this.keyField.x - 22, this.keyField.y - 0, 18, 18, 0, + button = new ImageButton(this.keyField.getX() - 22, this.keyField.getY() - 0, 18, 18, 0, 28, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j), Component.empty()); @@ -105,7 +107,7 @@ public class EncryptionConfigScreen extends Screen { this.addRenderableOnly(button); - button = new ImageButton(this.keyField.x + this.keyField.getWidth() + 4, this.keyField.y - 1, 23, 20, 41, + button = new ImageButton(this.keyField.getX() + this.keyField.getWidth() + 4, this.keyField.getY() - 1, 23, 20, 41, 24, 20, ENCRYPTION_ICONS, 64, 64, btn -> { this.unfocusFields(); this.keyField.setValue(this.algorithmButton.getValue().getRandomKey()); @@ -119,13 +121,13 @@ public class EncryptionConfigScreen extends Screen { w += 25; - this.passField = new CustomEditBox(this.font, (this.width - w)/2 + 11, this.keyField.y + + this.passField = new CustomEditBox(this.font, (this.width - w)/2 + 11, this.keyField.getY() + this.keyField.getHeight() + passDescSpace + (this.hugeGUI() ? -3 : 13), w, 18, CommonComponents.EMPTY); this.passField.setMaxLength(512); this.passField.setResponder(this::onPassphraseUpdate); this.addWidget(this.passField); - button = new ImageButton(this.passField.x - 22, this.passField.y - 0, 18, 18, 0, + button = new ImageButton(this.passField.getX() - 22, this.passField.getY() - 0, 18, 18, 0, 46, 0, ENCRYPTION_ICONS, 64, 64, btn -> {}, (btn, poseStack, i, j) -> this.renderTooltip(poseStack, this.minecraft.font.split(CommonComponents.EMPTY, 250), i, j), Component.empty()); @@ -135,15 +137,14 @@ public class EncryptionConfigScreen extends Screen { this.addRenderableOnly(button); int checkWidth = this.font.width(ENCRYPT_PUBLIC); - this.encryptPublicCheck = new Checkbox(this.width / 2 - checkWidth / 2 - 8, this.passField.y + 24, checkWidth + 24, 20, + this.encryptPublicCheck = new Checkbox(this.width / 2 - checkWidth / 2 - 8, this.passField.getY() + 24, checkWidth + 24, 20, ENCRYPT_PUBLIC, NCRConfig.getEncryption().shouldEncryptPublic()); this.addRenderableWidget(this.encryptPublicCheck); - this.addRenderableWidget(new Button(this.width / 2 + 4, this.passField.y + 48, 219, 20, - CommonComponents.GUI_DONE, btn -> { - this.onDone(); - this.onClose(); - })); + this.addRenderableWidget(Button.builder(CommonComponents.GUI_DONE, btn -> { + this.onDone(); + this.onClose(); + }).pos(this.width / 2 + 4, this.passField.getY() + 48).size(219, 20).build()); CycleButton<Encryption> cycle = CycleButton.<Encryption>builder(value -> { return Component.translatable("gui.nochatreports.encryption_config.algorithm", @@ -151,7 +152,7 @@ public class EncryptionConfigScreen extends Screen { }).withValues(Encryption.getRegistered()).displayOnlyValue().withInitialValue(this.getConfig() .getAlgorithm()).withTooltip(value -> this.minecraft.font.split( Component.translatable("algorithm.nochatreports." + value.getID()), 250)) - .create(this.width / 2 - 4 - 218, this.passField.y + 48, 218, 20, CommonComponents.EMPTY, + .create(this.width / 2 - 4 - 218, this.passField.getY() + 48, 218, 20, CommonComponents.EMPTY, (cycleButton, value) -> { this.unfocusFields(); this.onAlgorithmUpdate(value); @@ -185,11 +186,11 @@ public class EncryptionConfigScreen extends Screen { this.renderBackground(poseStack); Screen.drawCenteredString(poseStack, this.font, HEADER, this.width / 2, this.hugeGUI() ? 8 : 16, 0xFFFFFF); - this.keyDesc.renderLeftAligned(poseStack, this.keyField.x - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF); + this.keyDesc.renderLeftAligned(poseStack, this.keyField.getX() - 20, (this.hugeGUI() ? 25 : FIELDS_Y_START), this.getLineHeight(), 0xFFFFFF); this.keyField.render(poseStack, i, j, f); - this.passDesc.renderLeftAligned(poseStack, this.passField.x - 20, this.keyField.y + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28), + this.passDesc.renderLeftAligned(poseStack, this.passField.getX() - 20, this.keyField.getY() + this.keyField.getHeight() + (this.hugeGUI() ? 12 : 28), this.getLineHeight(), 0xFFFFFF); this.passField.render(poseStack, i, j, f); @@ -203,16 +204,16 @@ public class EncryptionConfigScreen extends Screen { if (StringUtil.isNullOrEmpty(this.keyField.getValue()) && !this.keyField.isFocused()) { Screen.drawString(poseStack, this.font, Component.translatable("gui.nochatreports.encryption_config.default_key", - this.algorithmButton.getValue().getDefaultKey()), this.keyField.x + 4, - this.keyField.y + 5, 0x999999); + this.algorithmButton.getValue().getDefaultKey()), this.keyField.getX() + 4, + this.keyField.getY() + 5, 0x999999); } if (!this.passField.active) { - Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.x + 4, - this.passField.y + 5, 0x999999); + Screen.drawString(poseStack, this.font, PASS_NOT_ALLOWED, this.passField.getX() + 4, + this.passField.getY() + 5, 0x999999); RenderSystem.setShaderTexture(0, ENCRYPTION_ICONS); RenderSystem.enableDepthTest(); - blit(poseStack, this.passField.x - 20, this.passField.y + 3, 50, 0, 14, 13, 64, 64); + blit(poseStack, this.passField.getX() - 20, this.passField.getY() + 3, 50, 0, 14, 13, 64, 64); } } diff --git a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java index 39a7b86..1d37628 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/ExtendedWarningScreen.java @@ -1,6 +1,8 @@ package com.aizistral.nochatreports.gui; +import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.ServerSafetyState; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; @@ -53,8 +55,10 @@ public abstract class ExtendedWarningScreen extends Screen { int offset = 28; int buttonY = this.hugeGUI() ? 55 : 100; - this.addRenderableWidget(new Button(this.width / 2 - 260 + offset, buttonY + i, 150, 20, CommonComponents.GUI_PROCEED, this::onProceed)); - this.addRenderableWidget(new Button(this.width / 2 - 100 + offset, buttonY + i, 150, 20, Component.translatable("gui.nochatreports.encryption_warning.learn_more"), button -> { + this.addRenderableWidget(Button.builder(CommonComponents.GUI_PROCEED, this::onProceed) + .pos(this.width / 2 - 260 + offset, buttonY + i).size(150, 20).build()); + + this.addRenderableWidget(Button.builder(Component.translatable("gui.nochatreports.encryption_warning.learn_more"), button -> { Minecraft.getInstance().setScreen(new ConfirmLinkScreen(agree -> { if (agree) { Util.getPlatform().openUri(this.WIKI_LINK); @@ -62,8 +66,11 @@ public abstract class ExtendedWarningScreen extends Screen { Minecraft.getInstance().setScreen(this); }, this.WIKI_LINK, true)); - })); - this.addRenderableWidget(new Button(this.width / 2 + 60 + offset, buttonY + i, 150, 20, CommonComponents.GUI_BACK, this::onBack)); + }).pos(this.width / 2 - 100 + offset, buttonY + i).size(150, 20).build()); + + + this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, this::onBack) + .pos(this.width / 2 + 60 + offset, buttonY + i).size(150, 20).build()); } protected abstract void onProceed(Button button); diff --git a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java new file mode 100644 index 0000000..11bf25e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java @@ -0,0 +1,25 @@ +package com.aizistral.nochatreports.gui; + +import java.util.function.Supplier; + +import com.mojang.blaze3d.vertex.PoseStack; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; + +@Environment(EnvType.CLIENT) +public class InvisibleButton extends Button { + + public InvisibleButton() { + super(0, 0, 20, 20, Component.empty(), btn -> {}, (btn, stack, x, y) -> {}, Supplier::get); + } + + @Override + public void render(PoseStack poseStack, int i, int j, float f) { + // NO-OP + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java index 30583f7..2511ccb 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -8,7 +8,10 @@ import com.aizistral.nochatreports.core.ServerSafetyState; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; +import net.minecraft.Util; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.TitleScreen; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; @@ -44,7 +47,8 @@ public final class UnsafeServerScreen extends WarningScreen { @Override protected void initButtons(int i) { - this.addRenderableWidget(new Button(this.width / 2 - 155, 100 + i, 150, 20, CommonComponents.GUI_PROCEED, button -> { + + this.addRenderableWidget(Button.builder(CommonComponents.GUI_PROCEED, button -> { ServerAddress address = ServerSafetyState.getLastServerAddress(); if (address != null) { @@ -61,10 +65,11 @@ public final class UnsafeServerScreen extends WarningScreen { ServerSafetyState.setAllowsUnsafeServer(true); this.minecraft.setScreen(new AwaitConnectionScreen(this.joinMultiplayer)); } - })); - this.addRenderableWidget(new Button(this.width / 2 - 155 + 160, 100 + i, 150, 20, CommonComponents.GUI_BACK, button -> { + }).pos(this.width / 2 - 155, 100 + i).size(150, 20).build()); + + this.addRenderableWidget(Button.builder(CommonComponents.GUI_BACK, button -> { this.minecraft.setScreen(this.joinMultiplayer); - })); + }).pos(this.width / 2 - 155 + 160, 100 + i).size(150, 20).build()); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 3cbd89a..a325e1b 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -42,20 +42,14 @@ public class MixinChatListener { private void onEvaluateTrustLevel(PlayerChatMessage playerChatMessage, Component component, PlayerInfo playerInfo, Instant instant, CallbackInfoReturnable<ChatTrustLevel> info) { - if (this.isSenderLocalPlayer(playerChatMessage.signer().profileId())) { + if (this.isSenderLocalPlayer(playerChatMessage.link().sender())) { info.setReturnValue(ChatTrustLevel.SECURE); } else { - var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, playerInfo, instant); - - if (evaluate == ChatTrustLevel.BROKEN_CHAIN) { - info.setReturnValue(evaluate); - return; - } + var evaluate = ChatTrustLevel.evaluate(playerChatMessage, component, instant); if (evaluate == ChatTrustLevel.NOT_SECURE && NCRConfig.getClient().hideRedChatIndicators()) { info.setReturnValue(ChatTrustLevel.SECURE); - } else if ((evaluate == ChatTrustLevel.FILTERED || evaluate == ChatTrustLevel.MODIFIED) - && NCRConfig.getClient().hideYellowChatIndicators()) { + } else if (evaluate == ChatTrustLevel.MODIFIED && NCRConfig.getClient().hideYellowChatIndicators()) { info.setReturnValue(ChatTrustLevel.SECURE); } } @@ -63,9 +57,9 @@ public class MixinChatListener { // Debug never dies if (NCRConfig.getCommon().enableDebugLog()) { NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", - Component.Serializer.toStableJson(playerChatMessage.serverContent()), - playerChatMessage.signer().profileId(), - Base64.getEncoder().encodeToString(playerChatMessage.headerSignature().bytes())); + Component.Serializer.toStableJson(playerChatMessage.unsignedContent()), + playerChatMessage.link().sender(), + Base64.getEncoder().encodeToString(playerChatMessage.signature().bytes())); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java index 6b3d0f5..687bc5e 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java @@ -69,7 +69,7 @@ public class MixinChatOptionsScreen extends SimpleOptionsSubScreen { if (!NCRConfig.getClient().enableMod()) return; - if (this.onlyShowSecureChat != null && this.onlyShowSecureChat.visible && x >= (double) this.onlyShowSecureChat.x && y >= (double) this.onlyShowSecureChat.y && x < (double) (this.onlyShowSecureChat.x + this.onlyShowSecureChat.getWidth()) && y < (double) (this.onlyShowSecureChat.y + this.onlyShowSecureChat.getHeight())) { + if (this.onlyShowSecureChat != null && this.onlyShowSecureChat.visible && x >= (double) this.onlyShowSecureChat.getX() && y >= (double) this.onlyShowSecureChat.getY() && x < (double) (this.onlyShowSecureChat.getX() + this.onlyShowSecureChat.getWidth()) && y < (double) (this.onlyShowSecureChat.getY() + this.onlyShowSecureChat.getHeight())) { this.renderTooltip(poseStack, this.secureChatTooltip, x, y); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java index 7b69957..6d246ec 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client; import java.util.List; import java.util.stream.Collectors; +import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -23,7 +24,6 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.math.Matrix4f; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ImageButton; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java index b235cd7..66c7405 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client; import java.util.List; import java.util.stream.Collectors; +import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -18,7 +19,6 @@ import com.mojang.blaze3d.vertex.DefaultVertexFormat; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexFormat; -import com.mojang.math.Matrix4f; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java index 03ae009..e109907 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java @@ -15,6 +15,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.gui.InvisibleButton; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; @@ -46,12 +47,7 @@ public class MixinPlayerEntry { @Inject(method = "<init>", at = @At("RETURN")) private void onConstructed(Minecraft minecraft, SocialInteractionsScreen socialInteractionsScreen, UUID uUID, String string, Supplier<ResourceLocation> supplier, boolean reportable, CallbackInfo info) { if (NCRConfig.getClient().alwaysHideReportButton()) { - this.reportButton = new Button(0, 0, 20, 20, Component.empty(), button -> {}) { - @Override - public void render(PoseStack poseStack, int i, int j, float f) { - // NO-OP - } - }; + this.reportButton = new InvisibleButton(); this.reportButton.active = this.reportButton.visible = false; } else if (ServerSafetyState.getCurrent() == ServerSafetyLevel.SECURE && this.reportButton != null) { this.reportButton = new ImageButton(0, 0, 20, 20, 0, 0, 20, REPORT_BUTTON_LOCATION, 64, 64, button -> {}, new Button.OnTooltip() { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java index 79a6959..6cbafe2 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java @@ -5,7 +5,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.minecraft.network.chat.ChatSender; import net.minecraft.network.chat.PlayerChatMessage; import net.minecraft.server.players.PlayerList; @@ -18,7 +17,7 @@ public class MixinPlayerList { */ @Inject(method = "verifyChatTrusted", at = @At("HEAD"), cancellable = true) - private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, ChatSender chatSender, CallbackInfoReturnable<Boolean> info) { + private void onVerifyChatTrusted(PlayerChatMessage playerChatMessage, CallbackInfoReturnable<Boolean> info) { info.setReturnValue(true); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java index c6fcbe0..ec3caa8 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java @@ -12,7 +12,6 @@ import com.aizistral.nochatreports.config.NCRConfig; import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.Packet; -import net.minecraft.network.protocol.game.ClientboundPlayerChatHeaderPacket; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; import net.minecraft.server.level.ServerPlayer; @@ -34,15 +33,13 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.message().serverContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent()); } if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatHeaderPacket) { - info.cancel(); - } else if (packet instanceof ClientboundPlayerChatPacket chat) { + if (packet instanceof ClientboundPlayerChatPacket chat) { packet = new ClientboundSystemChatPacket(chat.chatType().resolve(this.player.level.registryAccess()) - .get().decorate(chat.message().serverContent()), false); + .get().decorate(chat.unsignedContent()), false); info.cancel(); this.send(packet); @@ -59,13 +56,11 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.message().serverContent()); + NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent()); } if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatHeaderPacket) { - info.cancel(); - } else if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { + if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { info.cancel(); ((ServerGamePacketListenerImpl) (Object) this).send(chat); } |
