summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAizistral2022-08-26 16:22:03 +0200
committerAizistral2022-08-26 16:22:03 +0200
commit4a94a6b7de2994050774f9a8976d6275aa437d07 (patch)
tree4742e9464a67ad6de995abdcfcf6bdd7b1666c23 /src
parented7a31ceded5dcceb9cec18ce3d8c56a2843cdd1 (diff)
Reproduce #127
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/config/NoReportsConfig.java13
-rw-r--r--src/main/java/com/aizistral/nochatreports/core/NoChatReportingOption.java9
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java38
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java33
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java)16
-rw-r--r--src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java40
-rw-r--r--src/main/resources/nochatreports.mixins.json6
7 files changed, 151 insertions, 4 deletions
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<String> 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.<br><br>
+ *
+ * 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<CompoundTag> 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<ServerData> 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/server/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java
index 125f7ce..e151270 100644
--- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerStatus.java
+++ b/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java
@@ -1,4 +1,4 @@
-package com.aizistral.nochatreports.mixins.server;
+package com.aizistral.nochatreports.mixins.common;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -8,6 +8,7 @@ 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;
@@ -15,7 +16,8 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
@Mixin(ServerStatus.class)
-public class MixinServerStatus {
+public class MixinServerStatus implements NoChatReportingOption {
+ private boolean hasNoChatReporting;
@Inject(method = "enforcesSecureChat", at = @At("HEAD"), cancellable = true)
public void onSecureChatCheck(CallbackInfoReturnable<Boolean> info) {
@@ -24,4 +26,14 @@ public class MixinServerStatus {
}
}
+ @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<JsonElement> 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<ServerStatus> info, JsonObject jsonObj, ServerStatus status) {
+ if (!jsonObj.has("noChatReporting")) return;
+ ((NoChatReportingOption)status).setNoChatReporting(GsonHelper.getAsBoolean(jsonObj, "noChatReporting"));
+ }
+
+}
diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json
index 10f0fd2..80f4f21 100644
--- a/src/main/resources/nochatreports.mixins.json
+++ b/src/main/resources/nochatreports.mixins.json
@@ -5,6 +5,8 @@
"compatibilityLevel": "JAVA_17",
"verbose": true,
"mixins": [
+ "common.MixinServerStatus",
+ "common.MixinServerStatusSerializer",
"server.MixinPlayer",
"server.MixinServerboundChatPacket",
"server.MixinServerGamePacketListenerImpl",
@@ -26,7 +28,9 @@
"client.MixinJoinMultiplayerScreen",
"client.MixinGuiMessageTag",
"client.MixinToastComponent",
- "client.MixinRealmsConnect"
+ "client.MixinRealmsConnect",
+ "client.MixinServerData",
+ "client.MixinServerStatusPinger$1"
],
"server": [
"server.MixinDedicatedServer"