From 4a94a6b7de2994050774f9a8976d6275aa437d07 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 26 Aug 2022 16:22:03 +0200 Subject: Reproduce #127 --- .../nochatreports/config/NoReportsConfig.java | 13 ++++++- .../nochatreports/core/NoChatReportingOption.java | 9 +++++ .../mixins/client/MixinServerData.java | 38 ++++++++++++++++++++ .../mixins/client/MixinServerStatusPinger$1.java | 33 ++++++++++++++++++ .../mixins/common/MixinServerStatus.java | 39 +++++++++++++++++++++ .../mixins/common/MixinServerStatusSerializer.java | 40 ++++++++++++++++++++++ .../mixins/server/MixinServerStatus.java | 27 --------------- 7 files changed, 171 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/aizistral/nochatreports/core/NoChatReportingOption.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java delete mode 100644 src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java (limited to 'src/main/java/com/aizistral') diff --git a/src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java index 90059c1..f8a853d 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java @@ -44,7 +44,7 @@ public class NoReportsConfig { convertToGameMessage = false, showServerSafety = true, hideRedChatIndicators = true, hideYellowChatIndicators = true, hideGrayChatIndicators = true, hideWarningToast = true, alwaysHideReportButton = false, disableTelemetry = true, showReloadButton = true, - whitelistAllServers = false; + whitelistAllServers = false, includeQueryData = true; protected List whitelistedServers; protected static NoReportsConfig getInstance() { @@ -281,4 +281,15 @@ public class NoReportsConfig { return getInstance().whitelistAllServers; } + /** + * @return True if server should include extra query data to help clients know that your server + * is secure.

+ * + * This is true by default. + */ + + public static boolean includeQueryData() { + return getInstance().includeQueryData; + } + } diff --git a/src/main/java/com/aizistral/nochatreports/core/NoChatReportingOption.java b/src/main/java/com/aizistral/nochatreports/core/NoChatReportingOption.java new file mode 100644 index 0000000..cc87079 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/core/NoChatReportingOption.java @@ -0,0 +1,9 @@ +package com.aizistral.nochatreports.core; + +public interface NoChatReportingOption { + + boolean hasNoChatReporting(); + + void setNoChatReporting(boolean state); + +} \ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java new file mode 100644 index 0000000..13af30a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java @@ -0,0 +1,38 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.aizistral.nochatreports.core.NoChatReportingOption; +import net.minecraft.client.multiplayer.ServerData; +import net.minecraft.nbt.CompoundTag; +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 org.spongepowered.asm.mixin.injection.callback.LocalCapture; + +@Mixin(ServerData.class) +public class MixinServerData implements NoChatReportingOption { + + private boolean hasNoChatReporting; + + @Override + public boolean hasNoChatReporting() { + return this.hasNoChatReporting; + } + + @Override + public void setNoChatReporting(boolean state) { + this.hasNoChatReporting = state; + } + + @Inject(method = "write", at = @At("RETURN")) + private void onWrite(CallbackInfoReturnable cir) { + if (this.hasNoChatReporting) { + cir.getReturnValue().putBoolean("hasNoChatReporting", true); + } + } + + @Inject(method = "read", locals = LocalCapture.CAPTURE_FAILSOFT, at = @At("RETURN")) + private static void onRead(CompoundTag compound, CallbackInfoReturnable cir, ServerData serverData) { + ((NoChatReportingOption)serverData).setNoChatReporting(compound.contains("hasNoChatReporting")); + } +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java new file mode 100644 index 0000000..7f4fe89 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java @@ -0,0 +1,33 @@ +package com.aizistral.nochatreports.mixins.client; + +import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.config.NoReportsConfig; +import com.aizistral.nochatreports.core.NoChatReportingOption; +import net.minecraft.client.multiplayer.ServerData; +import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket; +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; + +@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") +public class MixinServerStatusPinger$1 { + + @Shadow @Final + private ServerData val$data; + + @Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;getPlayers()Lnet/minecraft/network/protocol/status/ServerStatus$Players;", ordinal = 0, shift = At.Shift.BEFORE)) + private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) { + boolean hasChatReporting = ((NoChatReportingOption) packet.getStatus()).hasNoChatReporting(); + ((NoChatReportingOption) this.val$data).setNoChatReporting(hasChatReporting); + + if (NoReportsConfig.isDebugLogEnabled()) { + NoChatReports.LOGGER.info("Received status response packet from server, hasNoChatReporting: {}", + hasChatReporting); + } + + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java new file mode 100644 index 0000000..e151270 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java @@ -0,0 +1,39 @@ +package com.aizistral.nochatreports.mixins.common; + +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.config.NoReportsConfig; +import com.aizistral.nochatreports.core.NoChatReportingOption; + +import net.minecraft.network.protocol.game.ClientboundServerDataPacket; +import net.minecraft.network.protocol.status.ServerStatus; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.server.network.ServerGamePacketListenerImpl; + +@Mixin(ServerStatus.class) +public class MixinServerStatus implements NoChatReportingOption { + private boolean hasNoChatReporting; + + @Inject(method = "enforcesSecureChat", at = @At("HEAD"), cancellable = true) + public void onSecureChatCheck(CallbackInfoReturnable info) { + if (NoReportsConfig.convertToGameMessage()) { + info.setReturnValue(true); + } + } + + @Override + public boolean hasNoChatReporting() { + return this.hasNoChatReporting; + } + + @Override + public void setNoChatReporting(boolean state) { + this.hasNoChatReporting = state; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java new file mode 100644 index 0000000..330200d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java @@ -0,0 +1,40 @@ +package com.aizistral.nochatreports.mixins.common; + +import com.aizistral.nochatreports.config.NoReportsConfig; +import com.aizistral.nochatreports.core.NoChatReportingOption; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonSerializationContext; +import net.minecraft.network.protocol.status.ServerStatus; +import net.minecraft.util.GsonHelper; +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 org.spongepowered.asm.mixin.injection.callback.LocalCapture; +import java.lang.reflect.Type; + +@Mixin(ServerStatus.Serializer.class) +public class MixinServerStatusSerializer { + + @Inject(method = "serialize(Lnet/minecraft/network/protocol/status/ServerStatus;" + + "Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement;", + at = @At("RETURN")) + private void onSerialize(ServerStatus serverStatus, Type type, JsonSerializationContext context, + CallbackInfoReturnable info) { + if (!NoReportsConfig.includeQueryData()) return; + ((JsonObject)info.getReturnValue()).addProperty("noChatReporting", true); + } + + @Inject(method = "deserialize(Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;" + + "Lcom/google/gson/JsonDeserializationContext;)" + + "Lnet/minecraft/network/protocol/status/ServerStatus;", + locals = LocalCapture.CAPTURE_FAILSOFT, at = @At("RETURN")) + private void onDeserialize(JsonElement jsonElement, Type arg1, JsonDeserializationContext context, + CallbackInfoReturnable info, JsonObject jsonObj, ServerStatus status) { + if (!jsonObj.has("noChatReporting")) return; + ((NoChatReportingOption)status).setNoChatReporting(GsonHelper.getAsBoolean(jsonObj, "noChatReporting")); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java deleted file mode 100644 index 125f7ce..0000000 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.aizistral.nochatreports.mixins.server; - -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.config.NoReportsConfig; - -import net.minecraft.network.protocol.game.ClientboundServerDataPacket; -import net.minecraft.network.protocol.status.ServerStatus; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -@Mixin(ServerStatus.class) -public class MixinServerStatus { - - @Inject(method = "enforcesSecureChat", at = @At("HEAD"), cancellable = true) - public void onSecureChatCheck(CallbackInfoReturnable info) { - if (NoReportsConfig.convertToGameMessage()) { - info.setReturnValue(true); - } - } - -} -- cgit v1.2.3