fix: DataFetcher does not respect chosen Data URL

Skytils · Sep 28, 2024 · 24d1c76 · 24d1c76
1 parent 461c11b
commit 24d1c76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 24 deletions.
diff --git a/src/main/java/gg/skytils/skytilsmod/tweaker/SkytilsTweaker.java b/src/main/java/gg/skytils/skytilsmod/tweaker/SkytilsTweaker.java
@@ -28,13 +28,14 @@
 import java.util.List;
 
 import static gg.skytils.skytilsmod.tweaker.SkytilsSecurityManager.overrideSecurityManager;
+import static gg.skytils.skytilsmod.tweaker.TweakerUtil.registerTransformerExclusions;
 import static gg.skytils.skytilsmod.tweaker.TweakerUtil.runStage;
 
 @SuppressWarnings("unused")
 public class SkytilsTweaker extends EssentialSetupTweaker {
 
     public SkytilsTweaker() throws Throwable {
-        runStage("gg.skytils.skytilsmod.tweaker.DuplicateSkytilsChecker", "checkForDuplicates");
+        DuplicateSkytilsChecker.checkForDuplicates();
         runStage("gg.skytils.skytilsmod.utils.SuperSecretSettings", "load");
         boolean isFML = System.getSecurityManager() != null && System.getSecurityManager().getClass().equals(FMLSecurityManager.class);
         if (System.getProperty("skytils.noSecurityManager") == null && (System.getSecurityManager() == null || isFML || System.getSecurityManager().getClass() == SecurityManager.class)) {
@@ -43,7 +44,15 @@ public SkytilsTweaker() throws Throwable {
             runStage("gg.skytils.skytilsmod.tweaker.SkytilsSecurityManager", "overrideSecurityManager", isFML);
             System.out.println("Current security manager: " + System.getSecurityManager());
         }
-        runStage("gg.skytils.skytilsmod.tweaker.EssentialPlatformSetup", "setup");
+        registerTransformerExclusions(
+                "kotlin.",
+                "kotlinx.",
+                "gg.skytils.asmhelper.",
+                "gg.skytils.skytilsmod.tweaker.",
+                "gg.skytils.skytilsmod.asm."
+        );
+        DependencyLoader.loadDependencies();
+        runStage("gg.skytils.skytilsmod.utils.EssentialPlatformSetup", "setup");
     }
 
 

diff --git a/...lsmod/tweaker/EssentialPlatformSetup.java → ...tilsmod/utils/EssentialPlatformSetup.java b/...lsmod/tweaker/EssentialPlatformSetup.java → ...tilsmod/utils/EssentialPlatformSetup.java
@@ -1,6 +1,6 @@
 /*
  * Skytils - Hypixel Skyblock Quality of Life Mod
- * Copyright (C) 2020-2023 Skytils
+ * Copyright (C) 2020-2024 Skytils
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published
@@ -16,11 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package gg.skytils.skytilsmod.tweaker;
+package gg.skytils.skytilsmod.utils;
 
 import gg.essential.universal.UDesktop;
 import gg.skytils.skytilsmod.Reference;
-import net.minecraft.launchwrapper.Launch;
 import org.apache.logging.log4j.LogManager;
 
 import javax.swing.*;
@@ -44,32 +43,15 @@ private static boolean trySetDataUrl(String url) {
         }
     }
 
-    @SuppressWarnings("unused")
-    public static void setup() throws Throwable {
-        boolean isDev = Launch.classLoader.findResource("net/minecraft/world/World.class") != null;
-
-        try {
-            DependencyLoader.loadDependencies();
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw t;
-        }
-
-        registerTransformerExclusions(
-                "kotlin.",
-                "kotlinx.",
-                "gg.skytils.asmhelper.",
-                "gg.skytils.skytilsmod.tweaker.",
-                "gg.skytils.skytilsmod.asm."
-        );
 
+    public static void setup() throws Throwable {
         for (final String url : dataURLCandidates) {
             if (trySetDataUrl(url)) {
                 Reference.dataUrl = url;
                 break;
             }
         }
-        LogManager.getLogger().info("Data URL: " + Reference.dataUrl);
+        LogManager.getLogger().info("Data URL: {}", Reference.dataUrl);
 
         try {
             if (Integer.parseInt(makeRequest(Reference.dataUrl + "api/version").trim()) > Reference.apiVersion) {