2024.7.1: Fix CurseForge and modrinth integration to support neoforge…

… and quilt
danieldieeins · Jul 18, 2024 · 98f8913 · 98f8913
1 parent c5c9d5e
commit 98f8913
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/application-main/pom.xml b/application-main/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <artifactId>application-main</artifactId>
-    <version>2024.7</version>
+    <version>2024.7.1f</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>

diff --git a/application-main/src/main/java/com/zyneonstudios/Main.java b/application-main/src/main/java/com/zyneonstudios/Main.java
@@ -32,7 +32,7 @@ public static void main(String[] args) {
         splash = new ZyneonSplash();
         splash.setVisible(true);
         FileUtil.deleteFolder(new File(getDirectoryPath()+"temp/"));
-        version = "2024.7";
+        version = "2024.7.1f";
         ArrayList<String> arguments = new ArrayList<>();
         String name = "Transitum";
         architecture = getArchitecture();

diff --git a/...in/java/com/zyneonstudios/application/integrations/curseforge/ZCurseForgeIntegration.java b/...in/java/com/zyneonstudios/application/integrations/curseforge/ZCurseForgeIntegration.java
@@ -168,6 +168,14 @@ public void install(int version) {
                             modloader = "Fabric";
                             mlversion = id.replace("fabric-","");
                             instance.set("modpack.fabric",mlversion);
+                        } else if(id.startsWith("quilt-")) {
+                            modloader = "Quilt";
+                            mlversion = id.replace("quilt-","");
+                            instance.set("modpack.quilt",mlversion);
+                        } else if(id.startsWith("neoforge-")) {
+                            modloader = "NeoForge";
+                            mlversion = id.replace("neoforge-","");
+                            instance.set("modpack.neoforge",mlversion);
                         }
                     }
                 }

diff --git a/...c/main/java/com/zyneonstudios/application/integrations/modrinth/ZModrinthIntegration.java b/...c/main/java/com/zyneonstudios/application/integrations/modrinth/ZModrinthIntegration.java
@@ -100,6 +100,14 @@ public void install(String version) {
                     modloader = "Fabric";
                     mlversion = modrinth.getString("dependencies.fabric-loader");
                     instance.set("modpack.fabric",mlversion);
+                } else if(modrinth.getString("dependencies.neoforge")!=null) {
+                    modloader = "NeoForge";
+                    mlversion = modrinth.getString("dependencies.neoforge");
+                    instance.set("modpack.neoforge",mlversion);
+                } else if(modrinth.getString("dependencies.quilt-loader")!=null) {
+                    modloader = "Quilt";
+                    mlversion = modrinth.getString("dependencies.quilt-loader");
+                    instance.set("modpack.quilt",mlversion);
                 }
                 logger.log("[MODRINTH] (INTEGRATION) Found "+modloader+" ("+mlversion+") for Minecraft "+minecraft+"!");
                 instance.set("modpack.minecraft",minecraft);

diff --git a/...in/src/main/java/com/zyneonstudios/application/integrations/zyndex/ZyndexIntegration.java b/...in/src/main/java/com/zyneonstudios/application/integrations/zyndex/ZyndexIntegration.java
@@ -281,6 +281,16 @@ public static File convert(File oldInstanceFile) {
                 instance.set("instance.versions.forge", instance.getString("modpack.forge.version"));
             }
 
+            //VERSIONS - QUILT
+            if (instance.get("modpack.quilt") != null) {
+                instance.set("instance.versions.quilt", instance.getString("modpack.quilt"));
+            }
+
+            //VERSIONS - NEOFORGE
+            if (instance.get("modpack.neoforge") != null) {
+                instance.set("instance.versions.neoforge", instance.getString("modpack.neoforge"));
+            }
+
             //VERSIONS - GAME
             instance.set("instance.versions.minecraft", instance.getString("modpack.minecraft"));
 

diff --git a/application-main/src/main/resources/content.zip b/application-main/src/main/resources/content.zip
diff --git a/application-ui/content/start.html b/application-ui/content/start.html
@@ -96,7 +96,7 @@ <h3 id="notification-actions"><a class="button">Restart</a><a class="button">Dyn
                 <div class="flex">
                     <div>
                         <h1>Zyneon Application</h1>
-                        <h3>2024.7 - Transitum</h3>
+                        <h3>2024.7.1 - Transitum</h3>
                     </div>
                     <div>
                         <div class="card">