From bdcea5746cc78806dcf360f7e96d6dd673df9086 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Sun, 15 Sep 2024 08:06:46 -0400 Subject: [PATCH] Update Stuff --- Fabric/build.gradle.kts | 4 +++- Fabric/src/main/resources/fabric.mod.json | 2 +- Forge/build.gradle.kts | 4 +++- Forge/src/main/resources/META-INF/mods.toml | 2 +- build.gradle.kts | 2 +- gradle.properties | 16 +++++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Fabric/build.gradle.kts b/Fabric/build.gradle.kts index f430642..879758f 100644 --- a/Fabric/build.gradle.kts +++ b/Fabric/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") } architectury { @@ -36,6 +36,8 @@ dependencies { "common"(project(":Common", "namedElements")) { isTransitive = false } "shadowBundle"(project(":Common", "transformProductionFabric")) + modLocalRuntime("me.djtheredstoner:DevAuth-fabric:${project.properties["devauth_version"]}") + modApi("net.potionstudios:Oh-The-Biomes-Weve-Gone-Fabric:${project.properties["bwg_version"]}") { isTransitive = false } modRuntimeOnly("com.github.glitchfiend:TerraBlender-fabric:$minecraftVersion-${project.properties["terrablender_version"]}") modRuntimeOnly("corgitaco.corgilib:Corgilib-Fabric:$minecraftVersion-${project.properties["corgilib_version"]}") diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json index 0a7ea95..1f452fc 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/Fabric/src/main/resources/fabric.mod.json @@ -29,6 +29,6 @@ "depends": { "fabric": "*", "minecraft": ">=1.20.1", - "biomeswevegone": ">=1.1.2-Beta" + "biomeswevegone": ">=1.2.3" } } \ No newline at end of file diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts index 1dcebb9..010a803 100644 --- a/Forge/build.gradle.kts +++ b/Forge/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("com.github.johnrengelman.shadow") + id("com.gradleup.shadow") } architectury { @@ -49,6 +49,8 @@ dependencies { "common"(project(":Common", "namedElements")) { isTransitive = false } "shadowBundle"(project(":Common", "transformProductionForge")) + modLocalRuntime("me.djtheredstoner:DevAuth-forge-latest:${project.properties["devauth_version"]}") + modApi("net.potionstudios:Oh-The-Biomes-Weve-Gone-Forge:${project.properties["bwg_version"]}") { isTransitive = false } implementation("com.eliotlash.mclib:mclib:20") forgeRuntimeLibrary("com.eliotlash.mclib:mclib:20") diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml index dfdc603..7a87a00 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -29,6 +29,6 @@ side = "BOTH" [[dependencies.woodwevegot]] modId = "biomeswevegone" mandatory = true -versionRange = "[1.1.2-Beta,)" +versionRange = "[1.2.3,)" ordering = "AFTER" side = "BOTH" diff --git a/build.gradle.kts b/build.gradle.kts index 5ce3500..2ddb4fc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI plugins { id("architectury-plugin") version "3.4-SNAPSHOT" id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false - id("com.github.johnrengelman.shadow") version "8.1.1" apply false + id("com.gradleup.shadow") version "8.3.1" apply false java idea `maven-publish` diff --git a/gradle.properties b/gradle.properties index 7634ab3..3339977 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,20 +6,22 @@ archives_base_name=All-The-Wood-Weve-Got mod_version=1.0.0-Indev maven_group=net.potionstudios -fabric_loader_version=0.16.3 +fabric_loader_version=0.16.5 fabric_api_version=0.92.2 -forge_version=47.3.7 +forge_version=47.3.10 neoforge_version=47.1.106 use_neoforge=false parchment=2023.09.03 -bwg_version=1.1.2-Beta +devauth_version=1.2.1 + +bwg_version=1.2.3 terrablender_version=3.0.1.7 -geckolib_version=4.4.7 -corgilib_version=4.0.3.0 -ohthetreesyoullgrow_version=1.3.0 +geckolib_version=4.4.9 +corgilib_version=4.0.3.2 +ohthetreesyoullgrow_version=1.3.1 -WTHIT=8.15.0 +WTHIT=8.15.2 badPackets=0.4.3 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..0aaefbc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME