Update dependencies (new utils updates)

Author: Jonathing

settings.gradle

@@ -28,10 +28,10 @@ dependencyResolutionManagement.versionCatalogs.register('libs') {
     library 'gson', 'com.google.code.gson', 'gson'        version '2.11.0'
     library 'jopt', 'net.sf.jopt-simple',   'jopt-simple' version '6.0-alpha-3'
 
-    library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.3.0'
-    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.9'
-    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.2.1'
-    library 'utils-logging',  'net.minecraftforge', 'log-utils'       version '0.3.2'
+    library 'utils-download', 'net.minecraftforge', 'download-utils'  version '0.4.0'
+    library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.12'
+    library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.4.0'
+    library 'utils-logging',  'net.minecraftforge', 'log-utils'       version '0.5.0'
     bundle 'utils', [ 'utils-download', 'utils-hash', 'utils-data', 'utils-logging' ]
 
     library 'nulls', 'org.jetbrains', 'annotations' version '26.0.2'

src/main/java/net/minecraftforge/launcher/Constants.java

@@ -5,10 +5,13 @@
 package net.minecraftforge.launcher;
 
 import net.minecraftforge.util.data.MCJsonUtils;
+import net.minecraftforge.util.os.OS;
 
 import java.io.File;
 
-interface Constants {
-    File ASSETS_DIR = new File(MCJsonUtils.getMCDir(), "assets");
-    String RESOURCES_URL = "https://resources.download.minecraft.net/";
+final class Constants {
+    private Constants() { }
+
+    static final File ASSETS_DIR = new File(MCJsonUtils.getMCDir(OS.current()), "assets");
+    static final String RESOURCES_URL = "https://resources.download.minecraft.net/";
 }

src/main/java/net/minecraftforge/launcher/DownloadAssets.java

@@ -9,7 +9,6 @@
 import net.minecraftforge.util.data.json.MinecraftVersion;
 import net.minecraftforge.util.download.DownloadUtils;
 import net.minecraftforge.util.hash.HashFunction;
-import net.minecraftforge.util.logging.Log;
 
 import java.io.File;
 import java.util.Map;
@@ -36,17 +35,17 @@ static void download(String repo, File assetsDir, MinecraftVersion versionJson)
             String assetDest = getAssetDest(asset.hash);
             File file = new File(objectsDir, assetDest);
             if (file.exists()) {
-                Log.debug("Considering existing file with size " + file.length() + " for " + name);
+                Main.LOGGER.debug("Considering existing file with size " + file.length() + " for " + name);
                 if (file.length() == asset.size) {
-                    Log.debug("Size check succeeded. Skipping.");
+                    Main.LOGGER.debug("Size check succeeded. Skipping.");
                     continue;
                 }
             }
 
             // We need to download assets? Release the log so the consumer is aware.
-            Log.release();
+            Main.LOGGER.release();
             try {
-                Log.info("Downloading missing asset: " + name);
+                Main.LOGGER.info("Downloading missing asset: " + name);
                 DownloadUtils.downloadFile(file, repo + assetDest);
                 String newSha1 = HashFunction.SHA1.sneakyHash(file);
                 if (!newSha1.equals(asset.hash)) {

src/main/java/net/minecraftforge/launcher/Main.java

@@ -10,7 +10,7 @@
 import joptsimple.OptionSet;
 import net.minecraftforge.util.data.json.JsonData;
 import net.minecraftforge.util.data.json.MinecraftVersion;
-import net.minecraftforge.util.logging.Log;
+import net.minecraftforge.util.logging.Logger;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -24,25 +24,27 @@
 import java.util.zip.ZipFile;
 
 public final class Main {
+    static final Logger LOGGER = Logger.create();
+
     public static void main(String[] args) throws Throwable {
         long start = System.currentTimeMillis();
         Launcher launcher;
         try {
-            Log.capture();
+            LOGGER.capture();
             launcher = run(args);
         } catch (Throwable e) {
-            Log.release();
+            LOGGER.release();
             throw e;
         }
 
         long total = System.currentTimeMillis() - start;
-        if (Log.isCapturing()) {
-            Log.drop();
-            Log.INFO.print("Slime Launcher setup is up-to-date");
+        if (LOGGER.isCapturing()) {
+            LOGGER.drop();
+            LOGGER.getInfo().print("Slime Launcher setup is up-to-date");
         } else {
-            Log.INFO.print("Slime Launcher has finished setting up");
+            LOGGER.getInfo().print("Slime Launcher has finished setting up");
         }
-        Log.INFO.println(", took " + total + "ms\n");
+        LOGGER.getInfo().println(", took " + total + "ms\n");
 
         launcher.run();
     }
@@ -82,14 +84,14 @@ private static Launcher run(String[] args) throws Throwable {
             .withRequiredArg().ofType(String.class);
 
         Package pkg = Main.class.getPackage();
-        Log.info(pkg.getImplementationTitle() + " " + pkg.getImplementationVersion());
+        LOGGER.info(pkg.getImplementationTitle() + " " + pkg.getImplementationVersion());
 
         SplitArgs split = new SplitArgs(args);
 
         OptionSet options = parser.parse(split.sl);
         if (options.has(helpO)) {
-            parser.printHelpOn(Log.INFO);
-            Log.info("To pass arguments into the main class,\n" +
+            parser.printHelpOn(LOGGER.getInfo());
+            LOGGER.info("To pass arguments into the main class,\n" +
                 "add '--' after the Slime Launcher arguments,\n" +
                 "followed by your main arguments.");
             throw new IllegalArgumentException("Incomplete or invalid arguments");
@@ -109,12 +111,12 @@ private static Launcher run(String[] args) throws Throwable {
             );
         }
 
-        Log.info("Checking assets");
-        byte indent = Log.push();
+        LOGGER.info("Checking assets");
+        byte indent = LOGGER.push();
         DownloadAssets.download(assetsRepo, assets, versionJson);
-        Log.pop(indent);
+        LOGGER.pop(indent);
 
-        Log.info("Looking for main class: " + mainClass);
+        LOGGER.info("Looking for main class: " + mainClass);
         MethodHandle mainMethod;
         try {
             Class<?> main = Class.forName(mainClass);
@@ -123,7 +125,7 @@ private static Launcher run(String[] args) throws Throwable {
             throw new IllegalStateException("Could not find main class!", e);
         }
 
-        Log.info("Sanitizing Minecraft arguments");
+        LOGGER.info("Sanitizing Minecraft arguments");
         for (int i = 0; i < split.mc.length; i++) {
             split.mc[i] = split.mc[i]
                 .replace("{asset_index}", versionJson.assetIndex.id)
@@ -146,7 +148,7 @@ private Launcher(String name, MethodHandle main, String[] args) {
 
         @SuppressWarnings("ConfusingArgumentToVarargsMethod")
         private void run() throws Throwable {
-            Log.info("Launching using main class: " + this.name);
+            LOGGER.info("Launching using main class: " + this.name);
             this.main.invokeExact(this.args);
         }
     }