From ac3c9aa3bba1a06b20b191298df3cca76fe1c9fc Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Thu, 23 Dec 2021 23:09:51 -0800 Subject: [PATCH] Switch back to parchment, update forge --- build.gradle | 5 ++--- gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 25b917f58..6d0dfe039 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' apply plugin: 'org.spongepowered.mixin' -// apply plugin: 'org.parchmentmc.librarian.forgegradle' +apply plugin: 'org.parchmentmc.librarian.forgegradle' boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false'); // jozu: I use a gradle workspace with both projects. @@ -39,8 +39,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17) println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) minecraft { - // mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" - mappings channel: 'official', version: "${minecraft_version}" + mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { diff --git a/gradle.properties b/gradle.properties index b0097b068..38c209086 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon = false # mod version info mod_version = 0.4a minecraft_version = 1.18.1 -forge_version = 39.0.5 +forge_version = 39.0.8 # build dependency versions forgegradle_version = 5.1.+ @@ -15,7 +15,7 @@ mixin_version = 0.8.5 librarian_version = 1.+ shadow_version = 7.1.0 cursegradle_version = 1.4.0 -parchment_version = 2021.10.31 +parchment_version = 2021.12.19 # dependency versions registrate_version = MC1.18-1.0.21