update
Some checks failed
/ Auto-Build-App (push) Failing after 2m45s

This commit is contained in:
pietru 2024-10-21 23:18:17 +02:00
parent 5f0ae1d9ef
commit 4156949e7d
3 changed files with 24 additions and 17 deletions

View file

@ -8,7 +8,9 @@ repositories {
name "Cosmic Reach" name "Cosmic Reach"
url "https://github.com/CRModders/CosmicArchive/raw/main/versions/pre-alpha" url "https://github.com/CRModders/CosmicArchive/raw/main/versions/pre-alpha"
patternLayout { 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 // This is required in Gradle 6.0+ as metadata file (ivy.xml) is mandatory
metadataSources { metadataSources {
@ -16,7 +18,7 @@ repositories {
} }
content { content {
includeGroup "finalforeach" includeModule "finalforeach", "cosmicreach"
} }
} }
@ -67,10 +69,9 @@ configurations {
dependencies { dependencies {
// Cosmic Reach jar // Cosmic Reach jar
cosmicreach "finalforeach:cosmicreach:${cosmic_reach_version}" cosmicreach "finalforeach:cosmicreach:${cosmic_reach_version}:${jar_type}"
// Cosmic Quilt // Cosmic Quilt
//quiltMod "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}"
implementation "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}" implementation "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}"
//quiltMod "quilt-mod:fluxapi:0.5.8r2" //quiltMod "quilt-mod:fluxapi:0.5.8r2"
@ -130,20 +131,21 @@ application {
} }
// Sets up all the Quilt Mods // Sets up all the Quilt Mods
def String getQuiltModLocations(Configuration config) { //def String getQuiltModLocations(Configuration config) {
StringBuilder sb = new StringBuilder() // StringBuilder sb = new StringBuilder()
for (obj in config.allDependencies) { // for (obj in config.allDependencies) {
sb.append(File.pathSeparator + config.files(obj)[0]) // sb.append(File.pathSeparator + config.files(obj)[0])
} // }
return sb.toString() // return sb.toString()
} //}
applicationDefaultJvmArgs = [ 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.gameJarPath=" + configurations.cosmicreach.asPath, // Defines path to Cosmic Reach
"-Dloader.addMods=" + // "-Dloader.addMods=" +
jar.archiveFile.get().asFile + // Add the jar of this project // jar.archiveFile.get().asFile + // Add the jar of this project
getQuiltModLocations(configurations.quiltMod) // Adds the jars of any Quilt mods added // getQuiltModLocations(configurations.quiltMod) // Adds the jars of any Quilt mods added
] ]

View file

@ -9,7 +9,8 @@ group=net.pietru
id=omni_power id=omni_power
# Dependency Versions # Dependency Versions
cosmic_reach_version=0.3.1 cosmic_reach_version=0.3.2-pre2
cosmic_quilt_version=2.0.2 cosmic_quilt_version=2.0.2
jar_type=client
#fluxapi_version=0.6.0 #fluxapi_version=0.6.0

View file

@ -124,7 +124,7 @@ public class CustomScreen extends BaseItemScreen {
} }
} }
static { public static void load_base_ui_components() {
//Table table, CustomScreen screen //Table table, CustomScreen screen
components.put("row",(table,screen,data)->{ components.put("row",(table,screen,data)->{
table.row(); table.row();
@ -186,4 +186,8 @@ public class CustomScreen extends BaseItemScreen {
table.add(new_table); table.add(new_table);
}); });
} }
static {
load_base_ui_components();
}
} }