From 683c8c9a7a8e0051ca3dd8fb96c7e5994b09fd17 Mon Sep 17 00:00:00 2001 From: MartinSVK12 <37455793+MartinSVK12@users.noreply.github.com> Date: Sat, 21 Sep 2024 16:31:17 +0200 Subject: [PATCH] Fixed nightly example mod. --- build.gradle | 85 +++++++++++++----------- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 8 ++- 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/build.gradle b/build.gradle index c38ffa3..e52c506 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,30 @@ plugins { - id 'babric-loom' version '1.4.+' + id 'fabric-loom' version '1.7.bta' id 'java' } +import org.gradle.internal.os.OperatingSystem + +project.ext.lwjglVersion = "3.3.1" + +switch (OperatingSystem.current()) { + case OperatingSystem.LINUX: + project.ext.lwjglNatives = "natives-linux" + break + case OperatingSystem.WINDOWS: + project.ext.lwjglNatives = "natives-windows" + break + case OperatingSystem.MAC_OS: + project.ext.lwjglNatives = "natives-macos" +} + group = project.mod_group archivesBaseName = project.mod_name version = project.mod_version loom { - gluedMinecraftJar() noIntermediateMappings() - customMinecraftManifest.set("https://nightly.betterthanadventure.net/bta-${project.bta_version}-manifest.json") + customMinecraftMetadata.set("https://nightly.betterthanadventure.net/bta-${project.bta_version}-manifest.json") } repositories { @@ -24,6 +38,10 @@ repositories { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + maven { + name = 'signalumMaven' + url = 'https://maven.thesignalumproject.net/infrastructure' + } ivy { url = "https://github.com/Better-than-Adventure" patternLayout { @@ -33,25 +51,9 @@ repositories { metadataSources { artifact() } } ivy { - url = "https://github.com/Turnip-Labs" - patternLayout { - artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar" - m2compatible = true - } - metadataSources { artifact() } - } - ivy { - url = "https://github.com/Turnip-Labs" - patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" - m2compatible = true - } - metadataSources { artifact() } - } - ivy { - url = "https://github.com/Turnip-Labs" + url = "https://nightly.betterthanadventure.net" patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-bta-[revision].jar" + artifact "/bta-[revision]-client.jar" m2compatible = true } metadataSources { artifact() } @@ -64,22 +66,6 @@ repositories { } metadataSources { artifact() } } - ivy { - url = "https://github.com/MartinSVK12" - patternLayout { - artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar" - m2compatible = true - } - metadataSources { artifact() } - } - ivy { - url = "https://nightly.betterthanadventure.net" - patternLayout { - artifact "/bta-[revision]-client.jar" - m2compatible = true - } - metadataSources { artifact() } - } } dependencies { @@ -87,7 +73,7 @@ dependencies { mappings loom.layered() {} modRuntimeOnly "objects:client:43db9b498cb67058d2e12d394e6507722e71bb45" // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar - modImplementation "fabric-loader:fabric-loader:${project.loader_version}" + modImplementation "babric:fabric-loader:${project.loader_version}" // Nightly builds are highly unstable, it is very likely that even these base mods might not work! // Uncomment at your own risk. @@ -96,7 +82,7 @@ dependencies { // If you do not need Halplibe you can comment this line out or delete this line //modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}" - //modImplementation "ModMenu:ModMenu:${project.mod_menu_version}" + //modImplementation "ModMenu:ModMenu:2.0.6" implementation "org.slf4j:slf4j-api:1.8.0-beta4" implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0" @@ -109,6 +95,22 @@ dependencies { implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion}") include(implementation("org.apache.commons:commons-lang3:3.12.0")) + + modImplementation("com.github.zarzelcow:legacy-lwjgl3:1.0.1") + implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion") + + runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives" + runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives" + implementation "org.lwjgl:lwjgl::$lwjglNatives" + implementation "org.lwjgl:lwjgl-assimp::$lwjglNatives" + implementation "org.lwjgl:lwjgl-glfw::$lwjglNatives" + implementation "org.lwjgl:lwjgl-openal::$lwjglNatives" + implementation "org.lwjgl:lwjgl-opengl::$lwjglNatives" + implementation "org.lwjgl:lwjgl-stb::$lwjglNatives" } java { @@ -127,6 +129,11 @@ jar { } } +configurations.configureEach { + // Removes LWJGL2 dependencies + exclude group: "org.lwjgl.lwjgl" +} + processResources { inputs.property "version", version diff --git a/gradle.properties b/gradle.properties index 3e8c3e5..fd301cd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ org.gradle.jvmargs=-Xmx2G # BTA -bta_version=nightly-2024-04-14 +bta_version=nightly-2024-09-21 # Loader -loader_version=0.15.6-babric.4-bta +loader_version=0.15.6-babric.6-bta # Nightly builds are highly unstable, it is very likely that even these base mods might not work! # Uncomment at your own risk. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b8..0d18421 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 46d2434..00837f5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { repositories { + gradlePluginPortal() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' } - gradlePluginPortal() maven { name = 'Jitpack' url = 'https://jitpack.io' @@ -13,5 +13,9 @@ pluginManagement { name = 'Babric' url = 'https://maven.glass-launcher.net/babric' } + maven { + name = 'signalumMaven' + url = 'https://maven.thesignalumproject.net/infrastructure' + } } -} \ No newline at end of file +}