feat: replace domains that forward handles

Author: RedVortexDev

src/main/java/dev/dfonline/codeclient/hypercube/HypercubeConstants.java

@@ -5,4 +5,5 @@
  */
 public class HypercubeConstants {
     public static String SERVER_ADDRESS = "mcdiamondfire.com";
+    public static String SUBDOMAIN_SERVER_ADDRESS = "diamondfire.games";
 }

src/main/java/dev/dfonline/codeclient/mixin/render/hud/MTitleScreen.java

@@ -17,8 +17,12 @@ public class MTitleScreen {
     @Inject(method = "init", at = @At("RETURN"))
     public void onInit(CallbackInfo ci) {
         if (CodeClient.startupToast != null) {
-            // UNSECURE_SERVER_WARNING so the toast stays longer, there is no visual difference.
-            CodeClient.MC.getToastManager().add(new SystemToast(SystemToast.Type.UNSECURE_SERVER_WARNING, CodeClient.startupToast.title(), CodeClient.startupToast.description()));
+            CodeClient.MC.getToastManager().add(SystemToast.create(
+                    CodeClient.MC,
+                    SystemToast.Type.PACK_LOAD_FAILURE,
+                    CodeClient.startupToast.title(),
+                    CodeClient.startupToast.description())
+            );
             CodeClient.startupToast = null;
         }
 

src/main/java/dev/dfonline/codeclient/mixin/screen/MMultiplayerScreen.java

@@ -14,41 +14,52 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
 @Mixin(MultiplayerScreen.class)
 public abstract class MMultiplayerScreen {
     @Unique
-    private static final String[] unofficialDFAddresses = {"mcdiamondfire.net", "luke.cash", "reason.codes", "boobs.im"};
+    private static final String[] UNOFFICIAL_DF_ADDRESSES = {"mcdiamondfire.net", "luke.cash", "reason.codes", "boobs.im", "mcdiamondfire.games"};
+    @Unique
+    private static final Pattern UNOFFICIAL_DF_ADDRESS_PATTERN = Pattern.compile("(?<prefix>\\w+\\.)?(?<address>" + String.join("|", UNOFFICIAL_DF_ADDRESSES) + ")(?<suffix>:\\d+)?");
+    @Unique
+    private static final String[] PLOT_SUBDOMAIN_ADDRESSES = {"mcdiamondfire.games"};
+    @Unique
+    private static final List<String> OFFICIAL_SUBDOMAINS = List.of("node1", "node2", "node3", "node4", "node5", "node6", "node7", "beta", "dev", "dev2", "dev3", "events");
+
 
     @Shadow
     private ServerList serverList;
 
     @Inject(method = "connect(Lnet/minecraft/client/network/ServerInfo;)V", at = @At("HEAD"))
     public void connect(ServerInfo entry, CallbackInfo ci) {
-        var addressPattern = String.join("|", unofficialDFAddresses);
-        var regex = Pattern.compile("(?<prefix>\\w+\\.)?(" + addressPattern + ")(?<suffix>:\\d+)?");
-        var matcher = regex.matcher(entry.address);
+        var matcher = UNOFFICIAL_DF_ADDRESS_PATTERN.matcher(entry.address);
 
         if (!matcher.matches()) return;
 
-        CodeClient.MC.getToastManager().add(new SystemToast(
-                SystemToast.Type.UNSECURE_SERVER_WARNING,
+        CodeClient.MC.getToastManager().add(SystemToast.create(
+                CodeClient.MC,
+                SystemToast.Type.PACK_LOAD_FAILURE,
                 Text.translatable("codeclient.toast.unofficial_address.title"),
                 Text.translatable("codeclient.toast.unofficial_address")
         ));
 
         var prefix = matcher.group("prefix");
-        // This check is needed for domains that use a subdomain for the diamondfire redirect, such as `df.domain.tld`,
-        // which would turn the IP to `df.mcdiamondfire.com` instead of `mcdiamondfire.com`.
-        if (prefix == null ||
-                // 'dev3' does not exist, but is there for future proofing.
-                !List.of("node1", "node2", "node3", "node4", "node5", "node6", "node7", "beta", "dev", "dev2", "dev3", "events").contains(prefix)
-        ) prefix = "";
+        boolean isSubdomainAddress = Arrays.asList(PLOT_SUBDOMAIN_ADDRESSES).contains(matcher.group("address"));
+        if (prefix == null || (!isSubdomainAddress && !OFFICIAL_SUBDOMAINS.contains(prefix.substring(0, prefix.length() - 1)))) {
+            prefix = "";
+        }
+        String address = HypercubeConstants.SERVER_ADDRESS;
+        if (isSubdomainAddress) {
+            address = HypercubeConstants.SUBDOMAIN_SERVER_ADDRESS;
+        }
         var suffix = matcher.group("suffix");
-        if (suffix == null) suffix = "";
-        entry.address = prefix + HypercubeConstants.SERVER_ADDRESS + suffix;
+        if (suffix == null) {
+            suffix = "";
+        }
+        entry.address = prefix + address + suffix;
 
         serverList.saveFile();
     }