From 1ccbf35b9cecfa4c64c8f35607506bb29eadc495 Mon Sep 17 00:00:00 2001
From: adryd <me@adryd.com>
Date: Tue, 28 Nov 2023 22:48:38 -0500
Subject: [PATCH] jut assume its good lol

---
 gradle.properties                             |  8 +++----
 .../sneaky/mixin/MixinLegacyQueryHandler.java | 23 +++----------------
 .../mixin/MixinServerLoginNetworkHandler.java |  4 ++--
 src/main/resources/fabric.mod.json            |  2 +-
 4 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index c1ed620..27c4c1f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Fabric Properties
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.1
-loader_version=0.14.22
+minecraft_version=1.20.3-pre4
+yarn_mappings=1.20.3-pre4+build.2
+loader_version=0.14.25
 
 # Mod Properties
-mod_version = 1.0.11
+mod_version = 1.0.12
 maven_group = com.adryd
 archives_base_name = sneaky
diff --git a/src/main/java/com/adryd/sneaky/mixin/MixinLegacyQueryHandler.java b/src/main/java/com/adryd/sneaky/mixin/MixinLegacyQueryHandler.java
index e7cfec9..772fe4e 100644
--- a/src/main/java/com/adryd/sneaky/mixin/MixinLegacyQueryHandler.java
+++ b/src/main/java/com/adryd/sneaky/mixin/MixinLegacyQueryHandler.java
@@ -25,7 +25,7 @@
 @Mixin(LegacyQueryHandler.class)
 public abstract class MixinLegacyQueryHandler extends ChannelInboundHandlerAdapter {
     @Shadow
-    protected static void reply(ChannelHandlerContext ctx, ByteBuf buf) {
+    private static void reply(ChannelHandlerContext ctx, ByteBuf buf) {
     }
 
     @Shadow
@@ -33,35 +33,18 @@ protected static void reply(ChannelHandlerContext ctx, ByteBuf buf) {
     private QueryableServer server;
 
     @Shadow
-    protected static ByteBuf createBuf(ByteBufAllocator allocator, String string) {
+    private static ByteBuf createBuf(ByteBufAllocator allocator, String string) {
         return null;
     }
 
     @Shadow
-    protected static String getResponse(QueryableServer server) {
+    private static String getResponse(QueryableServer server) {
         return null;
     }
 
     @Unique
     private final QueryableServer sneakyMetadata = new LegacyPingMetadata();
 
-    @Unique
-    private String get13PingData(SocketAddress addr) {
-        ;
-        if (Config.INSTANCE.getHideServerPingData() && !IPList.INSTANCE.canPing(addr)) {
-            return String.format(Locale.ROOT, "%s§%d§%d", "A Minecraft Server", 0, 20);
-        }
-        return String.format(Locale.ROOT, "%s§%d§%d", this.server.getServerMotd(), this.server.getCurrentPlayerCount(), this.server.getMaxPlayerCount());
-    }
-
-    @Unique
-    private String get14to16PingData(SocketAddress addr) {
-        if (Config.INSTANCE.getHideServerPingData() && !IPList.INSTANCE.canPing(addr)) {
-            return String.format(Locale.ROOT, "§1\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, this.server.getVersion(), "A Minecraft Server", 0, 20);
-        }
-        return String.format(Locale.ROOT, "§1\u0000%d\u0000%s\u0000%s\u0000%d\u0000%d", 127, this.server.getVersion(), this.server.getServerMotd(), this.server.getCurrentPlayerCount(), this.server.getMaxPlayerCount());
-    }
-
     @Inject(method = "channelRead", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/handler/LegacyQueryHandler;getResponseFor1_2(Lnet/minecraft/network/QueryableServer;)Ljava/lang/String;"))
     private void send13Ping(ChannelHandlerContext ctx, Object msg, CallbackInfo ci) {
         QueryableServer pingData = this.sneakyMetadata;
diff --git a/src/main/java/com/adryd/sneaky/mixin/MixinServerLoginNetworkHandler.java b/src/main/java/com/adryd/sneaky/mixin/MixinServerLoginNetworkHandler.java
index 7ee6c7c..01960c8 100644
--- a/src/main/java/com/adryd/sneaky/mixin/MixinServerLoginNetworkHandler.java
+++ b/src/main/java/com/adryd/sneaky/mixin/MixinServerLoginNetworkHandler.java
@@ -20,11 +20,11 @@
 class MixinServerLoginNetworkHandler {
     @Shadow
     @Final
-    private ClientConnection connection;
+    ClientConnection connection;
 
     @Shadow
     @Final
-    private MinecraftServer server;
+    MinecraftServer server;
 
     @Shadow
     @Nullable
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 3dda43d..ab25172 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -28,7 +28,7 @@
 
   "depends": {
     "fabricloader": ">=0.14.19",
-    "minecraft": "1.20.2",
+    "minecraft": ">=1.20.2",
     "java": ">=17"
   },
   "suggests": {