diff --git a/build.gradle b/build.gradle index 9c133e3a8..3b74df4e5 100644 --- a/build.gradle +++ b/build.gradle @@ -43,24 +43,41 @@ architectury { minecraft = rootProject.minecraft_version } +// Stuff for access wideners +def mcVersionToAcsessWidenerVersion = [ + "1_17_1": "1_17", + "1_18_1": "1_18", + "1_18_2": "1_18" +] // Use this as sometimes multiple versions use the same access wideners +def acsessWidenerVersion = mcVersionToAcsessWidenerVersion.get(minecraft_version.replace(".", "_")) + subprojects { p -> apply plugin: "dev.architectury.loom" loom { silentMojangMappingsLicense() - def mcVersionToAcsessWidenerVersion = [ - "1_17_1": "1_17", - "1_18_1": "1_18", - "1_18_2": "1_18" - ] - - def acsessWidenerVersion = mcVersionToAcsessWidenerVersion.get(minecraft_version.replace(".", "_")) - - def acsessWidenerLocation = "${rootDir}/common/src/main/resources/${acsessWidenerVersion}.lod.accesswidener" + // Set what accesswidener to use + def acsessWidenerLocation = "src/main/resources/${acsessWidenerVersion}.lod.accesswidener" accessWidenerPath.set(project(":common").file(acsessWidenerLocation)) - accessWidenerPath.set(project(":fabric").file(acsessWidenerLocation)) - accessWidenerPath.set(project(":forge").file(acsessWidenerLocation)) + } + + jar { + // Copy the correct accesswidener to the jar + copy { + from(project(":common").file("src/main/resources")) + include "${acsessWidenerVersion}.lod.accesswidener" + into(file(p.file("build/resources/main"))) + rename "${acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener" +// into(file(p.file("build/resources/main"))) + } + + // Requred to run the standalone jar + manifest { + attributes 'Implementation-Title': rootProject.archives_base_name, + 'Implementation-Version': rootProject.mod_version, + 'Main-Class': 'com.seibel.lod.core.JarMain' + } } configurations { @@ -91,14 +108,6 @@ subprojects { p -> shadowMe(project(":core")) { transitive false } } } - - jar { - manifest { - attributes 'Implementation-Title': rootProject.archives_base_name, - 'Implementation-Version': rootProject.mod_version, - 'Main-Class': 'com.seibel.lod.core.JarMain' - } - } } allprojects { p -> diff --git a/fabric/build.gradle b/fabric/build.gradle index 27abbbea7..a51bde9a7 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -41,7 +41,7 @@ dependencies { addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version)) // Mod Menu - addMod("com.terraformersmc:modmenu:${rootProject.modmenu_version}", 2) + modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") // Starlight addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight) diff --git a/gradle.properties b/gradle.properties index 52e0deedf..1188a0d96 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,4 +18,4 @@ toml_version=3.6.4 manifold_version=2022.1.7 ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: -mcVer=1.18.1 \ No newline at end of file +mcVer=1.18.2 \ No newline at end of file