diff options
| author | Sarun Intaralawan | 2025-06-26 22:22:51 +0700 |
|---|---|---|
| committer | GitHub | 2025-06-26 08:22:51 -0700 |
| commit | 345eec8470293d3473d5663583a1a7e005f9f4de (patch) | |
| tree | 054d7ad586929eb8180e846e587753c3cd06d9b4 /src/main/java | |
| parent | 08cff6fe2a571500895e0edbb93682df8c46a553 (diff) | |
1.21.6 port (#520)
* fix: replace `parseCommand` invoker with calls to `CommandDispatcher`
* fix: use new rendering methods
* fix: replace calls to `Component.Serializer.toJson` with low-level calls
Referenced from internal use in Minecraft
* fix: fix mixin injection points
* fix: change package for `SubscribeEvent`
* fix: correct metadata
* Fix Safe Server Status communication
* Clean up debug logs in `MixinJsonByteBufCodec`
* Fix compilation error
* Fix `MixinTitleScreen` compilation warning
* Fix `AdaptiveWarningScreen` text not rendering
* Revert "Fix `MixinTitleScreen` compilation warning"
This reverts commit 06bcd03ea91f2bff90cace3e72661c9eda069f1c.
---------
Co-authored-by: Aizistral <admin@aizistral.com>
Diffstat (limited to 'src/main/java')
15 files changed, 146 insertions, 151 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java index 6b6e26f..ddc2ded 100644 --- a/src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java @@ -1,14 +1,12 @@ package com.aizistral.nochatreports.common.core; import com.aizistral.nochatreports.common.mixins.client.MixinServerData; -import com.aizistral.nochatreports.common.mixins.common.MixinServerStatus; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.protocol.status.ServerStatus; /** - * Implemented by {@link MixinServerStatus} on {@link ServerStatus} class and {@link MixinServerData} - * on {@link ServerData} class. + * Implemented by {@link MixinServerData} on {@link ServerData} class. * * @author fxmorin (original implementation) * @author Aizistral (current version) diff --git a/src/main/java/com/aizistral/nochatreports/common/core/ServerStatusCache.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerStatusCache.java new file mode 100644 index 0000000..675c9a8 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerStatusCache.java @@ -0,0 +1,18 @@ +package com.aizistral.nochatreports.common.core; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +//@Environment(EnvType.CLIENT) +public class ServerStatusCache { + private static ThreadLocal<Boolean> preventsReports = new ThreadLocal<>(); + + public static boolean doesPreventReports() { + return preventsReports.get(); + } + + public static void setPreventsReports(boolean doesPreventReports) { + preventsReports.set(doesPreventReports); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java index a3a0925..e9d81e9 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java @@ -10,6 +10,7 @@ import net.minecraft.client.gui.components.Checkbox.OnValueChange; import net.minecraft.client.gui.components.MultiLineLabel; import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.multiplayer.WarningScreen; import net.minecraft.network.chat.Component; public abstract class AdaptiveWarningScreen extends Screen { @@ -38,6 +39,7 @@ public abstract class AdaptiveWarningScreen extends Screen { protected void init() { this.clearWidgets(); super.init(); + this.message = MultiLineLabel.create(this.font, this.content, this.width - (this.hugeGUI() ? 65 : 100)); int i = (this.message.getLineCount() + 1) * this.getLineHeight(); if (this.check != null) { @@ -60,11 +62,11 @@ public abstract class AdaptiveWarningScreen extends Screen { super.render(graphics, i, j, f); this.renderTitle(graphics); int k = this.width / 2 - this.message.getWidth() / 2; - this.message.renderLeftAligned(graphics, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFF); + this.message.renderLeftAligned(graphics, k, this.hugeGUI() ? 35 : 70, this.getLineHeight(), 0xFFFFFFFF); } private void renderTitle(GuiGraphics graphics) { - graphics.drawString(this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFF); + graphics.drawString(this.font, this.title, 25, this.hugeGUI() ? 15 : 30, 0xFFFFFFFF); } private boolean hugeGUI() { diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java index 54714c9..e112227 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java @@ -6,7 +6,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -37,7 +37,7 @@ public class AdvancedImageButton extends ImageButton { @Override public void renderWidget(GuiGraphics graphics, int mouseX, int mouseY, float delta) { - graphics.blitSprite(RenderType::guiTextured, this.getCurrentTexture(), this.getX(), this.getY(), this.width, this.height); + graphics.blitSprite(RenderPipelines.GUI_TEXTURED, this.getCurrentTexture(), this.getX(), this.getY(), this.width, this.height); if (this.isHovered) if (this.tooltip instanceof AdvancedWidgetTooltipHolder holder && holder.hasCustomRender()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java index 99e776f..17e1523 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java @@ -101,9 +101,6 @@ public class AdvancedTooltip extends Tooltip { Vector2ic vector2ic = clientTooltipPositioner.positionTooltip(graphics.guiWidth(), graphics.guiHeight(), i, j, n, o); int p = vector2ic.x(); int q = vector2ic.y(); - graphics.pose().pushPose(); - int r = 400; - graphics.pose().translate(0.0f, 0.0f, 400.0f); int maxWidth = 0; @@ -114,9 +111,7 @@ public class AdvancedTooltip extends Tooltip { } } - graphics.renderTooltip(screen.font, splitTooltip(screen.minecraft, component), p + maxWidth , q, null); - - graphics.pose().popPose(); + graphics.setTooltipForNextFrame(screen.font, splitTooltip(screen.minecraft, component), p + maxWidth , q, null); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java index 9daefde..ae353dd 100644 --- a/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedWidgetTooltipHolder.java @@ -26,11 +26,11 @@ public class AdvancedWidgetTooltipHolder extends WidgetTooltipHolder { } @Override // ideally tooltip shouldn't control it's own render like this, but for now it does - public void refreshTooltipForNextRenderPass(boolean hovered, boolean focused, ScreenRectangle screenRectangle) { + public void refreshTooltipForNextRenderPass(GuiGraphics guiGraphics, int i, int j, boolean hovered, boolean focused, ScreenRectangle screenRectangle) { if (this.hasCustomRender()) return; - super.refreshTooltipForNextRenderPass(hovered, focused, screenRectangle); + super.refreshTooltipForNextRenderPass(guiGraphics, i, j, hovered, focused, screenRectangle); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java index ddca5ee..9ac1282 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/AccessorClientPacketListener.java @@ -1,17 +1,21 @@ package com.aizistral.nochatreports.common.mixins.client; -import com.mojang.brigadier.ParseResults; +import com.mojang.brigadier.CommandDispatcher; import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.client.multiplayer.ClientSuggestionProvider; import net.minecraft.world.entity.player.ProfileKeyPair; import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(ClientPacketListener.class) public interface AccessorClientPacketListener { - @Invoker("parseCommand") - public ParseResults<SharedSuggestionProvider> invokeParseCommand(String string); + @Accessor("commands") + public CommandDispatcher<ClientSuggestionProvider> getCommands(); + + @Accessor("suggestionsProvider") + public ClientSuggestionProvider getClientSuggestionProvider(); @Invoker("setKeyPair") public void invokeSetKeyPair(ProfileKeyPair profileKeyPair); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index 8f8af4f..849650d 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -4,12 +4,16 @@ import java.time.Instant; import java.util.Base64; import java.util.UUID; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonParseException; +import com.mojang.serialization.JsonOps; +import net.minecraft.network.chat.ComponentSerialization; import org.spongepowered.asm.mixin.Final; 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.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -107,8 +111,10 @@ public class MixinChatListener { // Debug never dies if (NCRConfig.getCommon().enableDebugLog()) { + Gson GSON = new GsonBuilder().disableHtmlEscaping().create(); + NCRCore.LOGGER.info("Received message: {}, from: {}, signature: {}", - Component.Serializer.toJson(playerChatMessage.decoratedContent(), RegistryAccess.EMPTY), + GSON.toJson(ComponentSerialization.CODEC.encodeStart(RegistryAccess.EMPTY.createSerializationContext(JsonOps.INSTANCE), playerChatMessage.decoratedContent()).getOrThrow(JsonParseException::new)), playerChatMessage.link().sender(), Base64.getEncoder().encodeToString(playerChatMessage.signature() != null ? playerChatMessage.signature().bytes() : new byte[0])); } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java index 98d672f..eaeae1b 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java @@ -1,18 +1,15 @@ package com.aizistral.nochatreports.common.mixins.client; 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; import com.aizistral.nochatreports.common.core.ServerSafetyLevel; import com.aizistral.nochatreports.common.core.ServerSafetyState; -import com.mojang.brigadier.ParseResults; import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl; import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.network.chat.SignableCommand; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; @@ -34,7 +31,7 @@ public abstract class MixinClientPacketListener { if (packet instanceof ServerboundChatPacket chat) { ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); // asume unintrusive until further notice } else if (packet instanceof ServerboundChatCommandPacket command) { - if (!SignableCommand.of(accessor.invokeParseCommand(command.command())).arguments().isEmpty()) { + if (!SignableCommand.of(accessor.getCommands().parse(command.command(), accessor.getClientSuggestionProvider())).arguments().isEmpty()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.UNINTRUSIVE); } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java index 278eb83..c85c02e 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java @@ -10,7 +10,7 @@ import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList; import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.RenderPipelines; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -47,16 +47,16 @@ public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { yOffset = NCRConfig.getClient().getVerifiedIconOffsetY(); GlStateManager._enableBlend(); - graphics.blitSprite(RenderType::guiTextured, VERIFIED_ICON, k + l - 35 + xOffset, j - 1 + yOffset, 14, 14); + graphics.blitSprite(RenderPipelines.GUI_TEXTURED, VERIFIED_ICON, k + l - 35 + xOffset, j - 1 + yOffset, 14, 14); GlStateManager._disableBlend(); int t = n - k; int u = o - j; if (t >= l - 35 + xOffset && t <= l - 22 + xOffset && u >= 0 + yOffset && u <= 11 + yOffset) { - this.screen.setTooltipForNextRenderPass(Lists.transform(FontHelper.wrap(this.minecraft.font, + graphics.setTooltipForNextFrame(Lists.transform(FontHelper.wrap(this.minecraft.font, Language.getInstance().getOrDefault("gui.nochatreports.verified_server"), 250).stream() .map(Component::literal).collect(Collectors.toCollection(() -> - new ArrayList<Component>())), Component::getVisualOrderText)); + new ArrayList<Component>())), Component::getVisualOrderText), n, o); } } } diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java index 204a237..4bb64ed 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java @@ -14,6 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.config.NCRConfig; import com.aizistral.nochatreports.common.core.ServerDataExtension; +import com.aizistral.nochatreports.common.core.ServerStatusCache; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket; @@ -23,6 +24,7 @@ import net.minecraft.network.protocol.status.ServerStatus; /** * This one ensures "preventsChatReports" property is transferred from {@link ServerStatus} to * {@link ServerData} when handling status response. + * * @author fxmorin (original implementation) * @author Aizistral (current version) * @author pietro-lopes (fixed https://github.com/Aizistral-Studios/No-Chat-Reports/issues/481) @@ -43,7 +45,16 @@ public abstract class MixinServerStatusPinger$1 { at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;" + "description()Lnet/minecraft/network/chat/Component;")) private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) { - boolean preventsReports = ((ServerDataExtension) (Object) packet.status()).preventsChatReports(); + ServerStatus status = packet.status(); + boolean preventsReports = ServerStatusCache.doesPreventReports(); + + if (status.version().isPresent()) { + ServerStatus.Version version = status.version().get(); + + if (version.protocol() < 759 && version.protocol() > 0) { + preventsReports = true; + } + } if (this.nochatreports$serverData == null) { NCRCore.LOGGER.error("Failed to capture ServerData instance in MixinServerStatusPinger$1!"); diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinFriendlyByteBuf.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinFriendlyByteBuf.java deleted file mode 100644 index 3ebed25..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinFriendlyByteBuf.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.aizistral.nochatreports.common.mixins.common; - -import org.spongepowered.asm.mixin.Final; -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; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.core.ServerDataExtension; -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.mojang.serialization.Codec; -import com.mojang.serialization.DataResult; -import com.mojang.serialization.JsonOps; - -import io.netty.handler.codec.DecoderException; -import io.netty.handler.codec.EncoderException; -import net.minecraft.Util; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket; -import net.minecraft.network.protocol.status.ServerStatus; -import net.minecraft.util.GsonHelper; - -@SuppressWarnings({ "unchecked", "rawtypes" }) -@Mixin(FriendlyByteBuf.class) -public abstract class MixinFriendlyByteBuf { - @Shadow @Final - private static Gson GSON; - - @Inject(method = "readJsonWithCodec", at = @At("HEAD"), cancellable = true) - private void onReadJsonWithCodec(Codec codec, CallbackInfoReturnable info) throws Throwable { - if (codec == ServerStatus.CODEC) { - info.cancel(); - - JsonElement jsonElement = GsonHelper.fromJson(GSON, this.readUtf(), JsonElement.class); - DataResult dataResult = codec.parse(JsonOps.INSTANCE, jsonElement); - Object result = dataResult.getOrThrow(string -> new DecoderException("Failed to decode json: " + string)); - - if (jsonElement.getAsJsonObject().has("preventsChatReports")) { - ((ServerDataExtension) result).setPreventsChatReports(jsonElement.getAsJsonObject() - .get("preventsChatReports").getAsBoolean()); - } - - info.setReturnValue(result); - } - } - - @Inject(method = "writeJsonWithCodec", at = @At("HEAD"), cancellable = true) - private void onWriteJsonWithCodec(Codec codec, Object object, CallbackInfo info) throws Exception { - if (!NCRConfig.getCommon().addQueryData()) - return; - - if (codec == ServerStatus.CODEC) { - info.cancel(); - - DataResult<JsonElement> dataResult = codec.encodeStart(JsonOps.INSTANCE, object); - JsonElement element = dataResult.getOrThrow(string -> new EncoderException("Failed to encode: " + string + " " + object)); - - element.getAsJsonObject().addProperty("preventsChatReports", true); - - this.writeUtf(GSON.toJson(element)); - } - } - - @Shadow - public abstract String readUtf(); - - @Shadow - public abstract FriendlyByteBuf writeUtf(String string); -} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java new file mode 100644 index 0000000..d1a4c5d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinJsonByteBufCodec.java @@ -0,0 +1,81 @@ +package com.aizistral.nochatreports.common.mixins.common; + +import org.spongepowered.asm.mixin.Final; +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; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerStatusCache; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import io.netty.buffer.ByteBuf; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.Utf8String; +import net.minecraft.network.codec.ByteBufCodecs; + +@Mixin(targets = "net.minecraft.network.codec.ByteBufCodecs$35") +public class MixinJsonByteBufCodec { + @Shadow @Final + private static Gson GSON; + + // This seems to just be a character limit so not important + // @Shadow @Final + // private int val$p_422673_; + + @Inject(method = "encode(Lio/netty/buffer/ByteBuf;Lcom/google/gson/JsonElement;)V", at = @At("HEAD"), cancellable = true) + private void onEncode(ByteBuf buf, JsonElement element, CallbackInfo info) { + if (!NCRConfig.getCommon().addQueryData() || !this.isServerStatusElement(element)) + return; + + info.cancel(); + + if (NCRConfig.getCommon().enableDebugLog()) { + NCRCore.LOGGER.info("Adding chat report prevention status to ServerStatus packet."); + } + + JsonObject object = element.getAsJsonObject(); + object.addProperty("preventsChatReports", true); + + String string = GSON.toJson(object); + Utf8String.write(buf, string, 32767); + } + + @Inject(method = "decode(Lio/netty/buffer/ByteBuf;)Lcom/google/gson/JsonElement;", at = @At("RETURN"), cancellable = true) + private void onDecode(ByteBuf buf, CallbackInfoReturnable<JsonElement> info) { + JsonElement element = info.getReturnValue(); + + if (!this.isServerStatusElement(element)) + return; + + JsonObject object = element.getAsJsonObject(); + boolean preventsReports = object.has("preventsChatReports") && object.get("preventsChatReports").getAsBoolean(); + + if (NCRConfig.getCommon().enableDebugLog()) { + NCRCore.LOGGER.info("Received chat report prevention status from ServerStatus packet: " + preventsReports); + } + + ServerStatusCache.setPreventsReports(preventsReports); + } + + private boolean isServerStatusElement(JsonElement element) { + if (!element.isJsonObject()) + return false; + + JsonObject object = element.getAsJsonObject(); + + if (!object.has("version") || !object.get("version").isJsonObject()) + return false; + + JsonObject version = object.get("version").getAsJsonObject(); + + return version.has("name") && version.has("protocol"); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java deleted file mode 100644 index e7efd26..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.aizistral.nochatreports.common.mixins.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.core.ServerDataExtension; - -import net.minecraft.network.protocol.status.ServerStatus; - -@Mixin(ServerStatus.class) -public class MixinServerStatus implements ServerDataExtension { - - /** - * Special additional variable that allows the client to know whether server prevents chat reports - * upon pinging it. - */ - - private boolean preventsChatReports; - - @Override - public boolean preventsChatReports() { - var self = (ServerStatus) (Object) this; - - if (self.version().isPresent() && self.version().get().protocol() < 759 - && self.version().get().protocol() > 0) - return true; - - return this.preventsChatReports; - } - - @Override - public void setPreventsChatReports(boolean prevents) { - this.preventsChatReports = prevents; - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java index 307efaa..5e6e205 100644 --- a/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerCommonPacketListenerImpl.java @@ -1,9 +1,8 @@ package com.aizistral.nochatreports.common.mixins.server; +import io.netty.channel.ChannelFutureListener; import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Final; 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; @@ -11,16 +10,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.aizistral.nochatreports.common.NCRCore; import com.aizistral.nochatreports.common.config.NCRConfig; -import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket; import net.minecraft.network.protocol.game.ClientboundSystemChatPacket; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.network.ServerCommonPacketListenerImpl; import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.server.network.ServerPlayerConnection; @Mixin(ServerCommonPacketListenerImpl.class) public abstract class MixinServerCommonPacketListenerImpl { @@ -61,9 +56,9 @@ public abstract class MixinServerCommonPacketListenerImpl { * @author Aizistral */ - @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V", + @Inject(method = "Lnet/minecraft/server/network/ServerCommonPacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;Lio/netty/channel/ChannelFutureListener;)V", at = @At("HEAD"), cancellable = true) - private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { + private void onSend(Packet<?> packet, @Nullable ChannelFutureListener channelFutureListener, CallbackInfo info) { Object self = this; if (self instanceof ServerGamePacketListenerImpl listener) { @@ -73,7 +68,7 @@ public abstract class MixinServerCommonPacketListenerImpl { } if (NCRConfig.getCommon().convertToGameMessage()) { - if (packet instanceof ClientboundPlayerChatPacket chat && packetSendListener != null) { + if (packet instanceof ClientboundPlayerChatPacket chat && channelFutureListener != null) { info.cancel(); listener.send(chat); } |
