dftooling-ip is correctly detected as diamondfire

Author: AlignedCookie88

src/main/java/com/alignedcookie88/fireclient/FireClient.java

@@ -46,6 +46,8 @@ public class FireClient implements ModInitializer {
 
     public static String joinCommand = null;
 
+    public static boolean overrideDiamondFireDetection = false;
+
     private static boolean codeClientIntegration = false;
 
     private static final List<CommandRunnerResponse> commandRunnerResponses = new ArrayList<>();

src/main/java/com/alignedcookie88/fireclient/Utility.java

@@ -176,6 +176,9 @@ public static boolean isPlayingDiamondFire() {
         if (MinecraftClient.getInstance().isInSingleplayer())
             return false;
 
+        if (FireClient.overrideDiamondFireDetection)
+            return true;
+
         ServerInfo currentServer = MinecraftClient.getInstance().getCurrentServerEntry();
 
         if (currentServer == null)

src/main/java/com/alignedcookie88/fireclient/mixin/ClientLoginNetworkHandlerMixin.java

@@ -0,0 +1,23 @@
+package com.alignedcookie88.fireclient.mixin;
+
+import com.alignedcookie88.fireclient.FireClient;
+import net.minecraft.client.network.ClientLoginNetworkHandler;
+import net.minecraft.network.packet.s2c.login.LoginQueryRequestPayload;
+import net.minecraft.network.packet.s2c.login.LoginQueryRequestS2CPacket;
+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.CallbackInfo;
+
+@Mixin(ClientLoginNetworkHandler.class)
+public class ClientLoginNetworkHandlerMixin {
+
+    @Inject(method = "onQueryRequest", at = @At("HEAD"))
+    public void onQueryRequest(LoginQueryRequestS2CPacket packet, CallbackInfo ci) {
+        LoginQueryRequestPayload payload = packet.payload();
+        if (payload.id().getNamespace().equals("fireclient") && payload.id().getPath().equals("notif_dftooling_ip")) {
+            FireClient.LOGGER.info("Player joined via dftooling-ip!");
+            FireClient.overrideDiamondFireDetection = true;
+        }
+    }
+}

src/main/java/com/alignedcookie88/fireclient/mixin/ConnectScreenMixin.java

@@ -31,6 +31,7 @@ public void connect(MinecraftClient client, ServerAddress address, ServerInfo in
             FireClient.joinCommand = null;
         }
         original.call(client, address, info, cookieStorage);
+        FireClient.overrideDiamondFireDetection = false;
     }
 
 }

src/main/resources/fireclient.mixins.json

@@ -12,6 +12,7 @@
     "ChatHudMixin",
     "ChatScreenMixin",
     "ClientConnectionMixin",
+    "ClientLoginNetworkHandlerMixin",
     "ClientPlayerEntityMixin",
     "ConnectScreenMixin",
     "DrawContextMixin",