Add support for ignored dependencies.

Add support for loading a custom Branch Config.
Add support for Modrinth api dependencies.
Add Admin option to update dependencies Modrinth mods in a branch config.

Author: kyrptonaught

.github/workflows/build.yml

@@ -4,25 +4,25 @@
 # against bad commits.
 
 name: build
-on: [push]
+on: [ push ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
+      - uses: actions/checkout@v6
+      - uses: actions/setup-java@v5
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: '21'
+          java-version: '25'
 
       - name: build
         run: mvn package
 
       - name: capture build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Artifacts
-          path: target/dist/
+          path: target/dist/

DEFAULT_BRANCHES.json

@@ -3,28 +3,28 @@
     {
       "name": "Battle 1.20.4",
       "url": "https://github.com/Legacy-Edition-Minigames/Minigames/tree/battle-1.20.4",
-      "desc": "Latest version of Battle for 1.20.4 (Recommended)"
-    },
-    {
-      "name": "LEM ToolBox Testing",
-      "url": "https://github.com/Legacy-Edition-Minigames/Minigames/tree/toolbox-testing",
-      "desc": "LEM branch for testing Toolbox [1.20.4]"
+      "desc": "Latest Version of Battle 1.0 [1.20.4] (Recommended)"
     },
     {
       "name": "Battle 1.20.1",
       "url": "https://github.com/Legacy-Edition-Minigames/Minigames/tree/battle-1.20.1",
-      "desc": "Old version of Battle for 1.20.1"
+      "desc": "Archived Version of Battle [1.20.1]"
     },
     {
       "name": "April Fools 2024",
       "url": "https://github.com/Legacy-Edition-Minigames/Minigames/tree/aprilfools/2024/battle",
-      "desc": "April Fools event from 2024 [1.20.4]"
+      "desc": "April Fools Event from 2024. (Terraria) [1.20.4]"
+    },
+    {
+      "name": "April Fools 2026",
+      "url": "https://github.com/Legacy-Edition-Minigames/Minigames/tree/aprilfools/2026/battle",
+      "desc": "April Fools Event from 2026. (MODTOOLS!!!!!) [1.20.4]"
     },
     {
-      "name": "Rewrite Testing",
+      "name": "Battle 2.0",
       "url": "https://github.com/Legacy-Edition-Minigames/Minigames/tree/rewrite",
-      "desc": "Rewrite Testing [1.21.8]"
+      "desc": "Battle 2.0 / Rewrite [26.1.2]"
     }
   ],
   "config_version": 1
-}
+}

README.md

@@ -1,8 +1,9 @@
 # LEM ToolBox
+
 [![forthebadge](https://forthebadge.com/images/badges/made-with-java.svg)](https://forthebadge.com)
 
 # **Important Notice**
 
 ## This project is currently undergoing a complete rewrite, not all features from the old version are available yet!
 
-Feel free to test it, but don't expect a fully finished experience yet. [Latest Build](https://nightly.link/Legacy-Edition-Minigames/ToolBox/workflows/build/java/Artifacts.zip)
+Feel free to test it, but don't expect a fully finished experience yet. [Latest Build](https://nightly.link/Legacy-Edition-Minigames/ToolBox/workflows/build/java/Artifacts.zip)

pom.xml

@@ -6,20 +6,20 @@
 
     <groupId>net.kyrptonaught</groupId>
     <artifactId>ToolBox2.0</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
     <packaging>jar</packaging>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.13.1</version>
+            <version>2.13.2</version>
         </dependency>
     </dependencies>
 
@@ -52,4 +52,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

src/main/java/net/kyrptonaught/ToolBox/AutoHash.java

@@ -15,25 +15,43 @@ public static void autoHash() {
         String toolboxJson = FileHelper.readFile(Path.of("toolbox.json"));
         BranchConfig config = ConfigLoader.parseToolboxConfig(toolboxJson);
 
+        autoHash(config);
+
+        FileHelper.writeFile(Path.of("toolbox.json"), ConfigLoader.serializeToolboxInstall(config));
+    }
+
+    public static void autoHash(BranchConfig config) {
         for (BranchConfig.Dependency dependency : config.dependencies) {
-            if (dependency.gitRepo) {
+            if (dependency.type == BranchConfig.TYPE.GIT) {
                 String apiCall = GithubHelper.convertRepoToApiCall(dependency.url);
                 JsonObject response = FileHelper.download(apiCall, JsonObject.class);
                 String hash = response.getAsJsonObject("commit").getAsJsonPrimitive("sha").getAsString();
                 dependency.autoGeneratedHash = hash;
                 System.out.println("Generated Git Hash for " + dependency.getDisplayName() + ": " + hash);
+            } else if (dependency.type == BranchConfig.TYPE.MODRINTH) {
+                JsonObject urlOBJ = ConfigLoader.gson.fromJson(dependency.url, JsonObject.class);
+                String version = urlOBJ.get("version").getAsString();
+
+                String url = FileHelper.download("https://api.modrinth.com/v2/version/" + version, JsonObject.class).getAsJsonArray("files").get(0).getAsJsonObject().get("url").getAsString();
+                urlOBJ.addProperty("url", url);
+                dependency.url = urlOBJ.toString();
+                dependency.autoGeneratedHash = hash(url);
             } else {
-                try (InputStream in = FileHelper.openFileOrURL(dependency.url)) {
-                    byte[] data = in.readAllBytes();
-                    String hash = FileHelper.hashFile(data);
-                    dependency.autoGeneratedHash = hash;
-                    System.out.println("Generated Hash for " + dependency.getDisplayName() + ": " + hash);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+                dependency.autoGeneratedHash = hash(dependency.url);
             }
         }
+    }
 
-        FileHelper.writeFile(Path.of("toolbox.json"), ConfigLoader.serializeToolboxInstall(config));
+    private static String hash(String url) {
+        try (InputStream in = FileHelper.openFileOrURL(url)) {
+            byte[] data = in.readAllBytes();
+            String hash = FileHelper.hashFile(data);
+            System.out.println("Generated Hash for " + url + ": " + hash);
+            return hash;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
     }
-}
+}

src/main/java/net/kyrptonaught/ToolBox/Automation.java

@@ -63,8 +63,8 @@ public static void installServer() {
         if (name != null) serverInfo.setName(name);
         serverInfo.setPath();
 
-        int allocatedRam = CMDArgsParser.getNewServerRam();
-        if (allocatedRam < 1) allocatedRam = 3;
+        String allocatedRam = CMDArgsParser.getNewServerRam();
+        if (allocatedRam.isBlank()) allocatedRam = "3";
         serverInfo.setRAMArgs(allocatedRam);
 
         Installer.installAndCheckForUpdates(serverInfo);
@@ -84,4 +84,4 @@ public static void installServer() {
             Menu.setState(State.EXISTING_INSTALL, serverInfo);
         }
     }
-}
+}

src/main/java/net/kyrptonaught/ToolBox/CMDArgsParser.java

@@ -71,13 +71,14 @@ public static boolean installServer() {
         return containsArgs("--installServer");
     }
 
-    public static int getNewServerRam() {
+    public static String getNewServerRam() {
         for (int i = 0; i < args.length - 1; i++) {
             if (args[i].equalsIgnoreCase("--newServerRam") && !args[i + 1].startsWith("--")) {
-                return Integer.parseInt(args[i + 1]);
+                return args[i + 1];
             }
         }
-        return 3;
+
+        return "3";
     }
 
     public static BranchesConfig.BranchInfo getNewServerBranch() {
@@ -113,4 +114,4 @@ public static boolean doesNewServerAgreeToEULA() {
     public static boolean unattendedInstall() {
         return containsArgs("--unattendedInstall");
     }
-}
+}

src/main/java/net/kyrptonaught/ToolBox/Executer.java

@@ -35,7 +35,8 @@ public static void startServer(InstalledServerInfo serverInfo) {
     public static void updateServer(InstalledServerInfo serverInfo) {
         String url = GithubHelper.convertRepoToToolboxConfig(serverInfo.getBranchInfo().url);
         BranchConfig branch = ConfigLoader.parseToolboxConfig(FileHelper.download(url));
+        if (serverInfo.customInstall) AutoHash.autoHash(branch);
         serverInfo.updateBranchConfig(branch);
         Installer.installAndCheckForUpdates(serverInfo);
     }
-}
+}

src/main/java/net/kyrptonaught/ToolBox/IO/GithubHelper.java

@@ -6,10 +6,11 @@ public static String convertRepoToZipball(String repo) {
     }
 
     public static String convertRepoToToolboxConfig(String repo) {
+        if (repo.startsWith("file://")) return repo;
         return repo.replace("github.com", "raw.githubusercontent.com").replace("tree/", "") + "/.toolbox/toolbox.json";
     }
 
     public static String convertRepoToApiCall(String repo) {
         return repo.replace("github.com", "api.github.com/repos").replace("/tree/", "/branches/");
     }
-}
+}

src/main/java/net/kyrptonaught/ToolBox/Installer.java

@@ -1,5 +1,7 @@
 package net.kyrptonaught.ToolBox;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import net.kyrptonaught.ToolBox.IO.ConfigLoader;
 import net.kyrptonaught.ToolBox.IO.FileHelper;
 import net.kyrptonaught.ToolBox.IO.GithubHelper;
@@ -102,9 +104,12 @@ private static void installDependencies(InstalledServerInfo serverInfo) {
             String hash = dependency.autoGeneratedHash;
 
             if (hash != null && (installedDependency == null || !hash.equals(installedDependency.hash))) {
-                System.out.print("downloading...");
-                installFile(serverInfo, new InstalledDependencyInfo(dependency), hash);
-                System.out.println("installed");
+                if (dependency.ignore != null && dependency.ignore) System.out.println("skipping...");
+                else {
+                    System.out.print("downloading...");
+                    installFile(serverInfo, new InstalledDependencyInfo(dependency), hash);
+                    System.out.println("installed");
+                }
             } else {
                 System.out.println("Already exists");
             }
@@ -117,16 +122,19 @@ private static void installFile(InstalledServerInfo serverInfo, InstalledDepende
         Path destination = serverInfo.getDependencyInstallPath(dependency);
         FileHelper.createDir(destination);
 
-        if (dependency.gitRepo) {
+        if (dependency.type == BranchConfig.TYPE.GIT) {
             FileHelper.download(GithubHelper.convertRepoToZipball(dependency.url), downloadPath);
+        } else if (dependency.type == BranchConfig.TYPE.MODRINTH) {
+            JsonObject urlOBJ = ConfigLoader.gson.fromJson(dependency.url, JsonObject.class);
+            FileHelper.download(urlOBJ.get("url").getAsString(), downloadPath);
         } else {
             FileHelper.download(dependency.url, downloadPath);
         }
 
         clearOldFiles(serverInfo, dependency.installedFiles);
 
         List<String> installedFiles;
-        if (dependency.unzip) {
+        if (dependency.type == BranchConfig.TYPE.ZIP) {
             installedFiles = FileHelper.unzipFile(downloadPath, destination, true);
         } else {
             installedFiles = FileHelper.copyFile(downloadPath, destination.resolve(dependency.name));
@@ -142,7 +150,7 @@ private static void replaceMissingFiles(InstalledServerInfo serverInfo, Installe
         Path destination = serverInfo.getDependencyInstallPath(dependency);
         FileHelper.createDir(destination);
 
-        if (dependency.unzip) {
+        if (dependency.type == BranchConfig.TYPE.ZIP) {
             List<String> installedFiles = new ArrayList<>(List.copyOf(dependency.installedFiles));
             if (installedFiles != null) {
                 Path unzipPath = serverInfo.getTempPath(dependency);
@@ -204,4 +212,23 @@ private static InstalledDependencyInfo getInstalledDependency(InstalledServerInf
         }
         return null;
     }
+
+    public static void checkForModrinthUpdate(BranchConfig.Dependency dependency, String gameVersion, String loader) {
+        if (dependency.type == BranchConfig.TYPE.MODRINTH) {
+            JsonObject urlOBJ = ConfigLoader.gson.fromJson(dependency.url, JsonObject.class);
+            String id = urlOBJ.get("id").getAsString();
+            String version = urlOBJ.get("version").getAsString();
+
+            JsonArray obj = FileHelper.download("https://api.modrinth.com/v2/project/" + id + "/version?game_versions=[%22" + gameVersion + "%22]&loaders=[%22" + loader.toLowerCase() + "%22]&include_changelog=false", JsonArray.class);
+            if (obj.isEmpty()) {
+                System.out.println(dependency.name + "(" + id + "): Skipping");
+                return;
+            }
+            urlOBJ.addProperty("version", obj.get(0).getAsJsonObject().get("id").getAsString());
+
+            System.out.println(dependency.name + "(" + id + "): " + version + " -> " + obj.get(0).getAsJsonObject().get("version_number").getAsString() + "(" + urlOBJ.get("version").getAsString() + ")");
+
+            dependency.url = ConfigLoader.serializeToolboxInstall(urlOBJ);
+        }
+    }
 }