summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAizistral2023-02-23 14:59:51 +0100
committerAizistral2023-02-23 14:59:51 +0100
commit06939aa51721e8524bc3f581270b38088775b516 (patch)
tree817d439a8ed923ee2e6fadf876209c581541214c /src
parent22d70398048e76c4bfa072b81b7c04fe3dcd04a3 (diff)
Change interaction point for server ping data
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinFriendlyByteBuf.java73
-rw-r--r--src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatusSerializer.java54
-rw-r--r--src/main/resources/mixins/common/nochatreports.mixins.json2
3 files changed, 74 insertions, 55 deletions
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
new file mode 100644
index 0000000..97fa96d
--- /dev/null
+++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinFriendlyByteBuf.java
@@ -0,0 +1,73 @@
+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 Exception {
+ if (codec == ServerStatus.CODEC) {
+ info.cancel();
+
+ JsonElement jsonElement = GsonHelper.fromJson(GSON, this.readUtf(), JsonElement.class);
+ DataResult dataResult = codec.parse(JsonOps.INSTANCE, jsonElement);
+ Object result = Util.getOrThrow(dataResult, 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 = Util.getOrThrow(dataResult, 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/MixinServerStatusSerializer.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatusSerializer.java
deleted file mode 100644
index 300c047..0000000
--- a/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatusSerializer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.aizistral.nochatreports.common.mixins.common;
-
-import java.lang.reflect.Type;
-
-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 com.aizistral.nochatreports.common.config.NCRConfig;
-import com.aizistral.nochatreports.common.core.ServerDataExtension;
-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;
-
-/**
- * Handles "preventsChatReports" property during serialization and deserialization of {@link ServerStatus}.
- *
- * @author fxmorin (original implementation)
- * @author Aizistral (current version)
- */
-
-@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 (!NCRConfig.getCommon().addQueryData())
- return;
-
- ((JsonObject) info.getReturnValue()).addProperty("preventsChatReports", 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 element, Type type, JsonDeserializationContext context,
- CallbackInfoReturnable<ServerStatus> info, JsonObject json, ServerStatus status) {
- if (!json.has("preventsChatReports"))
- return;
-
- ((ServerDataExtension) status).setPreventsChatReports(GsonHelper.getAsBoolean(json, "preventsChatReports"));
- }
-
-}
diff --git a/src/main/resources/mixins/common/nochatreports.mixins.json b/src/main/resources/mixins/common/nochatreports.mixins.json
index c324b01..88b41ee 100644
--- a/src/main/resources/mixins/common/nochatreports.mixins.json
+++ b/src/main/resources/mixins/common/nochatreports.mixins.json
@@ -6,7 +6,7 @@
"verbose": true,
"mixins": [
"common.MixinServerStatus",
- "common.MixinServerStatusSerializer",
+ "common.MixinFriendlyByteBuf",
"server.MixinServerboundChatPacket",
"server.MixinServerGamePacketListenerImpl",
"server.MixinPlayerList",