From 4156949e7db95defda469c80b9f0b3120d488e23 Mon Sep 17 00:00:00 2001
From: pietru <jabartek2004.bob@gmail.com>
Date: Mon, 21 Oct 2024 23:18:17 +0200
Subject: [PATCH] update

---
 build.gradle                                  | 32 ++++++++++---------
 gradle.properties                             |  3 +-
 .../pietru/omni_power/ui/CustomScreen.java    |  6 +++-
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3490624..7b75ce3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,9 @@ repositories {
         name "Cosmic Reach"
         url "https://github.com/CRModders/CosmicArchive/raw/main/versions/pre-alpha"
         patternLayout {
-            artifact "/Cosmic Reach-[revision].jar"
+            //artifact "/Cosmic Reach-[revision].jar"
+            artifact "/[revision]/[classifier]/Cosmic Reach-[revision].jar"
+            artifact "/[revision]/[classifier]/Cosmic Reach-Server-[revision].jar"
         }
         // This is required in Gradle 6.0+ as metadata file (ivy.xml) is mandatory
         metadataSources {
@@ -16,7 +18,7 @@ repositories {
         }
 
         content {
-            includeGroup "finalforeach"
+            includeModule "finalforeach", "cosmicreach"
         }
     }
 
@@ -67,10 +69,9 @@ configurations {
 
 dependencies {
     // Cosmic Reach jar
-    cosmicreach "finalforeach:cosmicreach:${cosmic_reach_version}"
+    cosmicreach "finalforeach:cosmicreach:${cosmic_reach_version}:${jar_type}"
 
     // Cosmic Quilt
-    //quiltMod "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}"
     implementation "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}"
 
     //quiltMod "quilt-mod:fluxapi:0.5.8r2"
@@ -130,20 +131,21 @@ application {
 }
 
 // Sets up all the Quilt Mods
-def String getQuiltModLocations(Configuration config) {
-    StringBuilder sb = new StringBuilder()
-    for (obj in config.allDependencies) {
-        sb.append(File.pathSeparator + config.files(obj)[0])
-    }
-    return sb.toString()
-}
+//def String getQuiltModLocations(Configuration config) {
+//    StringBuilder sb = new StringBuilder()
+//    for (obj in config.allDependencies) {
+//        sb.append(File.pathSeparator + config.files(obj)[0])
+//    }
+//    return sb.toString()
+//}
 
 applicationDefaultJvmArgs = [
-        "-Dloader.skipMcProvider=true", // Stops Quilt from attempting to find mappings, and all the other Minecraft stuff
+        //"-Dloader.skipMcProvider=true", // Stops Quilt from attempting to find mappings, and all the other Minecraft stuff
+        "-Dloader.development=true", // Allows stuff to be found through the classpath
         "-Dloader.gameJarPath=" + configurations.cosmicreach.asPath, // Defines path to Cosmic Reach
-        "-Dloader.addMods=" +
-                jar.archiveFile.get().asFile + // Add the jar of this project
-                getQuiltModLocations(configurations.quiltMod) // Adds the jars of any Quilt mods added
+//        "-Dloader.addMods=" +
+//                jar.archiveFile.get().asFile + // Add the jar of this project
+//                getQuiltModLocations(configurations.quiltMod) // Adds the jars of any Quilt mods added
 ]
 
 
diff --git a/gradle.properties b/gradle.properties
index e6f4d32..7d51bbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,8 @@ group=net.pietru
 id=omni_power
 
 # Dependency Versions
-cosmic_reach_version=0.3.1
+cosmic_reach_version=0.3.2-pre2
 cosmic_quilt_version=2.0.2
+jar_type=client
 
 #fluxapi_version=0.6.0
\ No newline at end of file
diff --git a/src/main/java/net/pietru/omni_power/ui/CustomScreen.java b/src/main/java/net/pietru/omni_power/ui/CustomScreen.java
index 7a05593..57b0df2 100644
--- a/src/main/java/net/pietru/omni_power/ui/CustomScreen.java
+++ b/src/main/java/net/pietru/omni_power/ui/CustomScreen.java
@@ -124,7 +124,7 @@ public class CustomScreen extends BaseItemScreen {
         }
     }
 
-    static {
+    public static void load_base_ui_components() {
         //Table table, CustomScreen screen
         components.put("row",(table,screen,data)->{
             table.row();
@@ -186,4 +186,8 @@ public class CustomScreen extends BaseItemScreen {
             table.add(new_table);
         });
     }
+
+    static {
+        load_base_ui_components();
+    }
 }
\ No newline at end of file