From 3cd5043cb60320795c326f26eb89a9b4e78e3e7c Mon Sep 17 00:00:00 2001 From: Aizistral Date: Mon, 28 Oct 2024 21:13:59 +0100 Subject: Remove `ServerPingerExtension` as it's unused --- .../mixins/client/MixinServerStatusPinger$1.java | 3 +- .../platform/extensions/ServerPingerExtension.java | 14 -------- .../mixins/client/MixinServerStatusPinger$1.java | 37 ---------------------- .../mixins/fabric/nochatreports-fabric.mixins.json | 3 +- 4 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java delete mode 100644 src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java (limited to 'src/main') 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 bb19ae7..204a237 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,7 +14,6 @@ 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.platform.extensions.ServerPingerExtension; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket; @@ -30,7 +29,7 @@ import net.minecraft.network.protocol.status.ServerStatus; */ @Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") -public abstract class MixinServerStatusPinger$1 implements ServerPingerExtension { +public abstract class MixinServerStatusPinger$1 { @Unique private ServerDataExtension nochatreports$serverData; diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java b/src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java deleted file mode 100644 index 061ec96..0000000 --- a/src/main/java/com/aizistral/nochatreports/common/platform/extensions/ServerPingerExtension.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.aizistral.nochatreports.common.platform.extensions; - -import com.aizistral.nochatreports.common.core.ServerDataExtension; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.multiplayer.ServerData; - -@Environment(EnvType.CLIENT) -public interface ServerPingerExtension { - - public ServerData getServerData(); - -} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java deleted file mode 100644 index c021786..0000000 --- a/src/main/java/com/aizistral/nochatreports/fabric/mixins/client/MixinServerStatusPinger$1.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.aizistral.nochatreports.fabric.mixins.client; - -import java.lang.reflect.Field; - -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 com.aizistral.nochatreports.common.NCRCore; -import com.aizistral.nochatreports.common.config.NCRConfig; -import com.aizistral.nochatreports.common.core.ServerDataExtension; -import com.aizistral.nochatreports.common.platform.extensions.ServerPingerExtension; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket; -import net.minecraft.network.protocol.status.ServerStatus; - -@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") -public class MixinServerStatusPinger$1 implements ServerPingerExtension { - @Shadow @Final - private ServerData val$data; - - @Override - public ServerData getServerData() { - return this.val$data; - } - - static { - NCRCore.LOGGER.debug("Fabric mixin into ServerStatusPinger$1 succeeded."); - } - -} - diff --git a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json index 8352ca8..7adbda9 100644 --- a/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json +++ b/src/main/resources/mixins/fabric/nochatreports-fabric.mixins.json @@ -6,8 +6,7 @@ "mixins": [ ], "client": [ - "client.MixinMinecraft", - "client.MixinServerStatusPinger$1" + "client.MixinMinecraft" ], "server": [ ], -- cgit v1.2.3