inital 1.21.1

Author: Waterpicker

.gitignore

@@ -20,6 +20,6 @@ classes/
 *.launch
 
 ## Datagen .cache folder
-forge/src/main/generated/resources/.cache
+neoforge/src/main/generated/resources/.cache
 fabric/src/main/generated/resources/.cache
 common/src/main/generated/resources/.cache

build.gradle.kts

@@ -4,11 +4,11 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
 
 plugins {
     id("architectury-plugin") version "3.4-SNAPSHOT"
-    id("dev.architectury.loom") version "1.9-SNAPSHOT" apply false
+    id("dev.architectury.loom") version "1.13-SNAPSHOT" apply false
     id("com.gradleup.shadow") version "8.3.6" apply false
     java
     idea
-    kotlin("jvm") version "2.1.10"
+    kotlin("jvm") version "2.1.20"
     `maven-publish`
 }
 
@@ -53,6 +53,7 @@ subprojects {
         maven("https://maven.neoforged.net/releases")
         maven("https://maven.jt-dev.tech/releases")
         maven("https://maven.jt-dev.tech/snapshots")
+        maven("https://cursemaven.com")
     }
 
     @Suppress("UnstableApiUsage")
@@ -69,12 +70,12 @@ subprojects {
     java {
         withSourcesJar()
 
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     tasks.withType<JavaCompile>().configureEach {
-        options.release.set(17)
+        options.release.set(21)
     }
 
     publishing {

common/build.gradle.kts

@@ -12,8 +12,8 @@ sourceSets.main.get().resources.srcDir("src/main/generated/resources")
 dependencies {
     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("earth.terrarium.botarium:botarium-common-$minecraftVersion:${project.properties["botarium_version"]}")
+//    modCompileOnly("generations.gg.generations.core:Generations-Core-common:${project.properties["generations-core_version"]}") { isChanging = true }
+    modImplementation("curse.maven:generations-core-860936:7303086")
     modCompileOnly("tech.jt-dev:MoreStructureProcessors-common:${project.properties["moreprocessors_version"]}") { isChanging = true }
 
     //Cobblemon

fabric/build.gradle.kts

@@ -42,9 +42,8 @@ dependencies {
     modLocalRuntime("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 }
-    modRuntimeOnly("dev.architectury:architectury-fabric:${project.properties["architectury_version"]}")
-    modRuntimeOnly("earth.terrarium.botarium:botarium-fabric-$minecraftVersion:${project.properties["botarium_version"]}")
+//    modApi("generations.gg.generations.core:Generations-Core-fabric:${project.properties["generations-core_version"]}") { isChanging = true }
+    modApi("curse.maven:generations-core-860936:7303086")
 
     //Cobblemon
     modApi("com.cobblemon:fabric:${project.properties["cobblemon_version"]}")

forge/gradle.properties

@@ -1,32 +1,29 @@
 org.gradle.jvmargs=-Xmx3G -Ddevauth.enabled=true
 
-minecraft_version=1.20.1
+minecraft_version=1.21.1
 
 archives_base_name=Generations-Structures
-mod_version=1.0.0
+mod_version=1.1.0
 maven_group=generations.gg.generations.structures.generationsstructures
 
-fabric_loader_version=0.16.10
-fabric_api_version=0.92.4
+fabric_loader_version=0.17.2
+fabric_api_version=0.116.6
 
-forge_version=47.4.0
-neoforge_version=47.1.106
+neoforge_version=21.1.84
 
-use_neoforge=false
-
-parchment=2023.09.03
+parchment=2024.11.17
 
 generations-core_version=1.0.0-maven
 architectury_version=9.2.14
 botarium_version=2.3.4
 devauth_version=1.2.1
-cobblemon_version=1.5.2+1.20.1
-moreprocessors_version=1.2.1
+cobblemon_version=1.7.0+1.21.1
+moreprocessors_version=2.0.1
 
-terrablender_version=3.0.1.7
-BOP_version=19.0.0.94
-GlitchCore_version=0.0.1.1
-BWG_version=1.5.8
+terrablender_version=4.1.0.7
+BOP_version=21.1.0.13
+GlitchCore_version=21.10.0.4
+BWG_version=2.5.2
 
 # Publishing
 github_token=xxx

gradle.properties

@@ -9,7 +9,7 @@ plugins {
 
 architectury {
     platformSetupLoomIde()
-    forge()
+    neoForge()
 }
 
 val minecraftVersion = project.properties["minecraft_version"] as String
@@ -33,11 +33,11 @@ configurations {
 loom {
     accessWidenerPath.set(project(":common").loom.accessWidenerPath)
 
-    forge {
-        convertAccessWideners.set(true)
-        extraAccessWideners.add(loom.accessWidenerPath.get().asFile.name)
-        mixinConfig("GenerationsStructures-common.mixins.json")
-    }
+//    forge {
+//        convertAccessWideners.set(true)
+//        extraAccessWideners.add(loom.accessWidenerPath.get().asFile.name)
+//        mixinConfig("GenerationsStructures-common.mixins.json")
+//    }
 
     runs.create("data") {
         data()
@@ -62,27 +62,26 @@ dependencies {
     modLocalRuntime("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 }
-    modImplementation("dev.architectury:architectury-forge:${project.properties["architectury_version"]}")
-    modRuntimeOnly("earth.terrarium.botarium:botarium-forge-$minecraftVersion:${project.properties["botarium_version"]}")
+//    modApi("generations.gg.generations.core:Generations-Core-forge:${project.properties["generations-core_version"]}@jar") { isChanging = true }
+    modApi(implementation("curse.maven:generations-core-860936:7305007"))
 
     //Cobblemon
-    implementation("thedarkcolour:kotlinforforge:4.11.0")
-    modApi("com.cobblemon:forge:${project.properties["cobblemon_version"]}")
+    implementation("thedarkcolour:kotlinforforge-neoforge:5.5.0")
+    modApi("com.cobblemon:neoforge:${project.properties["cobblemon_version"]}")
 
-    modApi("tech.jt-dev:MoreStructureProcessors-forge:${project.properties["moreprocessors_version"]}") { isChanging = true }
+    modApi("tech.jt-dev:MoreStructureProcessors-neoforgeforge:${project.properties["moreprocessors_version"]}") { isChanging = true }
 
     //BiomeMod Integration
-    modLocalRuntime("com.github.glitchfiend:TerraBlender-forge:$minecraftVersion-${project.properties["terrablender_version"]}")
-    modCompileOnly("com.github.glitchfiend:BiomesOPlenty-forge:$minecraftVersion-${project.properties["BOP_version"]}")
-    modLocalRuntime("com.github.glitchfiend:GlitchCore-forge:$minecraftVersion-${project.properties["GlitchCore_version"]}")
+    modLocalRuntime("com.github.glitchfiend:TerraBlender-neoforge:$minecraftVersion-${project.properties["terrablender_version"]}")
+    modCompileOnly("com.github.glitchfiend:BiomesOPlenty-neoforge:$minecraftVersion-${project.properties["BOP_version"]}")
+    modLocalRuntime("com.github.glitchfiend:GlitchCore-neoforge:$minecraftVersion-${project.properties["GlitchCore_version"]}")
     modRuntimeOnly(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    modApi("net.potionstudios:Oh-The-Biomes-Weve-Gone-Forge:${project.properties["BWG_version"]}")
+    modApi("net.potionstudios:Oh-The-Biomes-Weve-Gone-NeoForge:${project.properties["BWG_version"]}")
     implementation("com.eliotlash.mclib:mclib:20")
     forgeRuntimeLibrary("com.eliotlash.mclib:mclib:20")
 
     //WorldEdit
-    modLocalRuntime("curse.maven:worldedit-225608:4586218")
+    modLocalRuntime("curse.maven:worldedit-225608:5830452")
 }
 
 tasks {

forge/build.gradle.kts neoforge/build.gradle.ktsforge/build.gradle.kts renamed to neoforge/build.gradle.kts

@@ -0,0 +1 @@
+loom.platform=neoforge