From 13e4e66d132eab2575b455b27c45eaa1e715f07d Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Mon, 28 Feb 2022 02:31:56 +0100 Subject: [PATCH] update gradle properties etc. --- build.gradle | 4 ++-- fabric/build.gradle | 7 ++++++- forge/src/main/resources/META-INF/mods.toml | 4 ++-- gradle.properties | 5 +++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 9c6e1ed..274a4dc 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ subprojects { minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" mappings loom.layered() { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-1.18.1:2021.12.19@zip") + parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip") } } } @@ -197,4 +197,4 @@ task buildUploadAll(group: "publishing") { } tasks.getByName("curseforge").dependsOn buildAll -publishAll.dependsOn buildAll \ No newline at end of file +publishAll.dependsOn buildAll diff --git a/fabric/build.gradle b/fabric/build.gradle index a0966b8..9bcaf1f 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -41,6 +41,10 @@ repositories { name = "FTB" url = "https://maven.saps.dev/minecraft" } + maven { + name = "CurseMaven" + url "https://www.cursemaven.com" + } } dependencies { @@ -54,7 +58,8 @@ dependencies { modImplementation "me.lucko:fabric-permissions-api:${rootProject.fabric_permissions_api}" - modCompileOnly("io.github.gunpowder:gunpowder-currency:${rootProject.gunpowder_currency_version}") { + // Rip currency on their maven and prob rip currency all together + modCompileOnly("curse.maven:gunpowdercurrency-402041:3584557") { exclude group: "com.google.guava", module:"failureaccess" } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index e9f1c84..f26f3e4 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[38,)" +loaderVersion="[39,)" license="All rights reserved" issueTrackerURL="https://github.com/Flemmli97/Flan/issues" [[mods]] @@ -15,4 +15,4 @@ modId="minecraft" mandatory=true versionRange="[1.18,)" ordering="NONE" -side="BOTH" \ No newline at end of file +side="BOTH" diff --git a/gradle.properties b/gradle.properties index ceb209f..7c029ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,14 @@ org.gradle.jvmargs=-Xmx2G minecraft_version=1.18.1 +parchment_version=1.18.1:2022.02.13 # Forge Properties -forge_version=1.18.1-39.0.14 +forge_version=1.18.1-39.0.79 # Fabric Properties # check these on https://fabricmc.net/use -loader_version=0.12.8 +loader_version=0.13.2 # Mod Properties mod_version=1.7.3