Update to Generations-Core 3.0.0-Beta and Cobblemon 1.5.2

Signed-off-by: Joseph T. McQuigg <[email protected]>
GenerationsMod · Aug 31, 2024 · 0845f15 · 0845f15
1 parent 2c6f252
commit 0845f15
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     id("dev.architectury.loom") version "1.7-SNAPSHOT" apply false
     idea
     java
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "2.0.20"
 }
 
 val minecraftVersion = project.properties["minecraft_version"] as String

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     // Do NOT use other classes from fabric loader
     modImplementation("net.fabricmc:fabric-loader:${project.properties["fabric_loader_version"]}")
 
-    modCompileOnly("generations.gg.generations.core:Generations-Core-Common:${project.properties["generations-core_version"]}") { isChanging = true }
+    modCompileOnly("generations.gg.generations.core:Generations-Core-common:${project.properties["generations-core_version"]}") { isChanging = true }
     modCompileOnly("earth.terrarium.botarium:botarium-common-$minecraftVersion:${project.properties["botarium_version"]}")
 
     //Cobblemon

diff --git a/...ain/java/generations/gg/generations/structures/generationsstructures/integration/BWG.java b/...ain/java/generations/gg/generations/structures/generationsstructures/integration/BWG.java
@@ -2,7 +2,6 @@
 
 import net.minecraft.world.level.block.Block;
 import net.potionstudios.biomeswevegone.BiomesWeveGone;
-import net.potionstudios.biomeswevegone.world.level.block.BWGBlocks;
 import net.potionstudios.biomeswevegone.world.level.block.wood.BWGWood;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,7 +23,7 @@ public Block getGhostTrapdoorReplacement() {
 
     @Override
     public Block getOakLeavesReplacement() {
-        return BWGBlocks.FLOWERING_ORCHARD_LEAVES.get();
+        return BWGWood.FLOWERING_ORCHARD_LEAVES.get();
     }
 
     @Override

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -35,13 +35,13 @@ dependencies {
     modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.properties["devauth_version"]}")
 
     // Generations-Core Fabric
-    modApi("generations.gg.generations.core:Generations-Core-Fabric:${project.properties["generations-core_version"]}") { isChanging = true }
+    modApi("generations.gg.generations.core:Generations-Core-fabric:${project.properties["generations-core_version"]}") { isChanging = true }
     modRuntimeOnly("dev.architectury:architectury-fabric:${project.properties["architectury_version"]}")
     modRuntimeOnly("earth.terrarium.botarium:botarium-fabric-$minecraftVersion:${project.properties["botarium_version"]}")
 
     //Cobblemon
     modApi("com.cobblemon:fabric:${project.properties["cobblemon_version"]}")
-    modRuntimeOnly("net.fabricmc:fabric-language-kotlin:1.10.19+kotlin.1.9.23")
+    modRuntimeOnly("net.fabricmc:fabric-language-kotlin:1.12.1+kotlin.2.0.20")
 
     //BiomeMod Integration
     modApi("com.github.glitchfiend:TerraBlender-fabric:$minecraftVersion-${project.properties["terrablender_version"]}")

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -55,12 +55,12 @@ dependencies {
     modRuntimeOnly("me.djtheredstoner:DevAuth-forge-latest:${project.properties["devauth_version"]}")
 
     // Generations-Core Forge
-    modApi("generations.gg.generations.core:Generations-Core-Forge:${project.properties["generations-core_version"]}@jar") { isChanging = true }
+    modApi("generations.gg.generations.core:Generations-Core-forge:${project.properties["generations-core_version"]}@jar") { isChanging = true }
     modRuntimeOnly("dev.architectury:architectury-forge:${project.properties["architectury_version"]}")
     modRuntimeOnly("earth.terrarium.botarium:botarium-forge-$minecraftVersion:${project.properties["botarium_version"]}")
 
     //Cobblemon
-    implementation("thedarkcolour:kotlinforforge:4.10.0")
+    implementation("thedarkcolour:kotlinforforge:4.11.0")
     modApi("com.cobblemon:forge:${project.properties["cobblemon_version"]}")
 
     //BiomeMod Integration

diff --git a/...va/generations/gg/generations/structures/generationsstructures/forge/integration/BOP.java b/...va/generations/gg/generations/structures/generationsstructures/forge/integration/BOP.java
@@ -2,7 +2,7 @@
 
 import biomesoplenty.api.block.BOPBlocks;
 import biomesoplenty.core.BiomesOPlenty;
-import generations.gg.generations.core.generationscore.world.level.block.GenerationsBlocks;
+import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks;
 import generations.gg.generations.structures.generationsstructures.integration.Integration;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;

diff --git a/gradle.properties b/gradle.properties
@@ -6,25 +6,25 @@ archives_base_name=Generations-Structures
 mod_version=1.6.0-Alpha
 maven_group=generations.gg.generations.structures.generationsstructures
 
-fabric_loader_version=0.16.0
+fabric_loader_version=0.16.3
 fabric_api_version=0.92.2
 
-forge_version=47.3.5
+forge_version=47.3.7
 neoforge_version=47.1.104
 
 use_neoforge=false
 
 parchment=2023.09.03
 
-generations-core_version=2.4.0-Beta-SNAPSHOT
+generations-core_version=3.0.0-Beta-SNAPSHOT
 architectury_version=9.2.14
 botarium_version=2.3.3
 devauth_version=1.2.1
-cobblemon_version=1.4.1+1.20.1
+cobblemon_version=1.5.2+1.20.1
 
 terrablender_version=3.0.1.7
 BOP_version=18.0.0.598
-BWG_version=1.0.6-Beta
+BWG_version=1.1.2-Beta
 
 # Publishing
 github_token=xxx
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement.repositories {
 }
 
 plugins {
-    id("com.gradle.develocity") version("3.17.5")
+    id("com.gradle.develocity") version("3.18")
 }
 
 develocity.buildScan {