diff --git a/build.gradle b/build.gradle index 62dce0933..156a379b2 100644 --- a/build.gradle +++ b/build.gradle @@ -192,7 +192,6 @@ subprojects { p -> // Compression shadowMe("org.tukaani:xz:1.9") - shadowMe("org.apache.commons:commons-compress:1.21") // NightConfig (includes Toml & Json) shadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}") diff --git a/fabric/build.gradle b/fabric/build.gradle index 10abedf5c..fda3e0485 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -124,7 +124,6 @@ shadowJar { // Compression relocate 'org.tukaani', 'distanthorizons.libraries.tukaani' - relocate 'org.apache.commons.compress', 'distanthorizons.libraries.apache.commons.compress' // NightConfig (includes Toml & Json) relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig' diff --git a/forge/build.gradle b/forge/build.gradle index 07bcf04f8..01691ae01 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -6,9 +6,8 @@ buildscript { mavenCentral() } dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - classpath 'org.parchmentmc:librarian:1.+' - classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + classpath group: "".minecraftforge.gradle"" name: ""orgeGradle"" version: "".1.+"" changing: true + classpath ""rg.parchmentmc:librarian:1.+""classpath ""rg.spongepowered:mixingradle:0.7-SNAPSHOT" } } apply plugin: "net.minecraftforge.gradle" @@ -24,21 +23,21 @@ mixin { } minecraft { -// mappings channel: 'official', version: minecraft_version // Vanilla mappings - mappings channel: "parchment", version: "${rootProject.parchment_version}-${rootProject.minecraft_version}" // Parchment mappings +// mappings channel: "official", version: minecraft_version // Vanilla mappings + mappings channel: "parchment", version: "${parchment_version}-${minecraft_version}" // Parchment mappings runs { client { - workingDirectory project.file('run') + workingDirectory project.file("run") ideaModule "${rootProject.name}.${project.name}.main" - taskName 'Client' + taskName "Client" args "-mixins.config=DistantHorizons.mixins.json" } server { - workingDirectory project.file('run') + workingDirectory project.file("run") ideaModule "${rootProject.name}.${project.name}.main" - taskName 'Server' + taskName "Server" args "-mixins.config=DistantHorizons.mixins.json" } @@ -110,12 +109,12 @@ dependencies { addMod("curse.maven:TerraForged-363820:${rootProject.terraforged_version}", rootProject.enable_terraforged) - if (System.getProperty('idea.sync.active') != 'true') { - annotationProcessor 'org.spongepowered:mixin:0.8.4:processor' + if (System.getProperty("idea.sync.active") != "true") { + annotationProcessor "org.spongepowered:mixin:0.8.4:processor" } - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive false } + common(project(path: ":common")) { transitive false } + shadowCommon(project(path: ":common")) { transitive false } shadowMe(project(path: ":core")) { transitive false } shadowMe(project(path: ":api")) { transitive false } } @@ -129,20 +128,19 @@ shadowJar { exclude "architectury.common.json" configurations = [project.configurations.shadowCommon, project.configurations.shadowMe, project.configurations.customModule] - relocate 'com.seibel.lod.common', 'loaderCommon.forge.com.seibel.lod.common' + relocate "om.seibel.lod.common", "loaderCommon.forge.com.seibel.lod.common" // Compression - relocate 'org.tukaani', 'distanthorizons.libraries.tukaani' - relocate 'org.apache.commons.compress', 'distanthorizons.libraries.apache.commons.compress' + relocate "org.tukaani", "distanthorizons.libraries.tukaani" // NightConfig (includes Toml & Json) - relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig' + relocate "com.electronwill.nightconfig", "distanthorizons.libraries.electronwill.nightconfig" // Theming - relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf' + relocate "com.formdev.flatlaf", "distanthorizons.libraries.formdev.flatlaf" // svg - relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg' + relocate "com.kitfox.svg", "distanthorizons.libraries.kitfox.svg" classifier "dev-shadow" mergeServiceFiles() diff --git a/settings.gradle b/settings.gradle index f8e386e7f..273336f26 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,7 +30,7 @@ project(":api").projectDir = file('coreSubProjects/api') // Minecraft dependent sub-projects include("common") include("fabric") -//include("quilt") // Just put this here for once we need it +//include("quilt") // Just put this here for once we need it ;) //include("forge") // FIXME: Fix forge, its just annoying diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties index 6bf4a7397..5a25cf599 100644 --- a/versionProperties/1.18.2.properties +++ b/versionProperties/1.18.2.properties @@ -1,7 +1,7 @@ # 1.18.2 version based stuff java_version = 17 minecraft_version=1.18.2 -parchment_version=2022.03.13 +parchment_version=2022.11.06 compatible_minecraft_versions=["1.18.2"] accessWidenerVersion=1_18 builds_for=["fabric", "forge"]