Updated a bunch of dependencies. Swapped from Forge to NeoForge (Forge is not yet on 1.20.5, might get added back later) Got to a point where we can reload the project in IntelliJ

build-logic/src/main/kotlin/cobblemon.base-conventions.gradle.kts

@@ -33,8 +33,8 @@ license {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
 
 architectury {
@@ -44,25 +44,25 @@ architectury {
 loom {
     silentMojangMappingsLicense()
     accessWidenerPath.set(project(":common").file(ACCESS_WIDENER))
-
-    mixin {
-        defaultRefmapName.set("cobblemon-${project.name}-refmap.json")
-    }
 }
 
 dependencies {
     minecraft("net.minecraft:minecraft:${rootProject.property("mc_version")}")
-    mappings("net.fabricmc:yarn:${rootProject.property("yarn_version")}:v2")
+    mappings(loom.layered() {
+        mappings("net.fabricmc:yarn:${rootProject.property("yarn_version")}:v2")
+        mappings("dev.architectury:yarn-mappings-patch-neoforge:${rootProject.property("yarn_arch_patch_version")}")
+    })
+
 }
 
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
-        options.release.set(17)
+        options.release.set(21)
     }
 
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "17"
+        kotlinOptions.jvmTarget = "21"
     }
 
     withType<Jar> {

common/build.gradle.kts

@@ -24,12 +24,13 @@ plugins {
 }
 
 architectury {
-    common("forge", "fabric")
+    common("neoforge", "fabric")
 }
 
 repositories {
     maven(url = "${rootProject.projectDir}/deps")
     maven(url = "https://api.modrinth.com/maven")
+    maven(url = "https://maven.neoforged.net/releases")
     mavenLocal()
 }
 
@@ -41,7 +42,7 @@ dependencies {
     //Flywheel has no common dep so just pick one and don't use any platform specific code in common
     //modCompileOnly(libs.flywheelFabric)
     modApi(libs.molang)
-    modCompileOnly(libs.lambDynamicLights) { isTransitive = false }
+    //modCompileOnly(libs.lambDynamicLights) { isTransitive = false }
 
     // For Showdown
     modCompileOnly(libs.graal)

forge/gradle.properties

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

gradle.properties

@@ -5,11 +5,12 @@ org.gradle.daemon=false
 org.gradle.parallel=true
 
 # API
-mc_version = 1.20.4
-yarn_version = 1.20.4+build.3
+mc_version = 1.20.5
+yarn_version = 1.20.5+build.1
+yarn_arch_patch_version=1.20.5+build.3
 
 mod_id=cobblemon
-mod_version=1.5.0
+mod_version=1.6.0
 snapshot=true
 
 fabric.loom.multiProjectOptimisation=true

gradle/libs.versions.yml

@@ -1,7 +1,7 @@
 versions:
 
   # jetbrains
-  kotlin: 1.9.22
+  kotlin: 1.9.23
   coroutines: 1.7.3
   annotations: 23.0.0
   serialization: 1.6.2
@@ -14,16 +14,16 @@ versions:
 
   # fabric/remap
   loom: 1.6-SNAPSHOT
-  fabric-loader: 0.15.6
-  fabric-api: 0.95.4+1.20.4
-  fabric-kotlin: 1.10.18+kotlin.1.9.22
+  fabric-loader: 0.15.10
+  fabric-api: 0.97.6+1.20.5
+  fabric-kotlin: 1.10.19+kotlin.1.9.23
   architectury-plugin: 3.4-SNAPSHOT
   flywheelFabric: 0.6.9-1
   fabric-permissions-api: 0.2-SNAPSHOT
   lamb-dynamic-lights: 2.3.4+1.20.4
 
-  # forge
-  forge: 1.20.4-49.0.27
+  # neoforge
+  neoforge: 20.5.3-beta
   kotlinForForge: 4.10.0
   flywheelForge: 0.6.10-7
 
@@ -128,18 +128,14 @@ dependencies:
     version: { ref: lamb-dynamic-lights }
 
   # forge
-  forge:
-    group: net.minecraftforge
-    name: forge
-    version: { ref: forge }
+  neoforge:
+    group: net.neoforged
+    name: neoforge
+    version: { ref: neoforge }
   kotlinForForge:
     group: thedarkcolour
     name: kotlinforforge
     version: { ref: kotlinForForge }
-  flywheelForge:
-    group: com.jozufozu.flywheel
-    name: flywheel-forge-1.20.1
-    version: { ref: flywheelForge }
 
   # datastore
   mongoDriverCore:

neoforge/build.gradle.kts

@@ -19,11 +19,8 @@ architectury {
 }
 
 loom {
-    forge {
-        convertAccessWideners.set(true)
+    neoForge {
 
-        mixinConfig("mixins.cobblemon-forge.json")
-        mixinConfig("mixins.cobblemon-common.json")
     }
 }
 
@@ -31,11 +28,12 @@ repositories {
     maven(url = "${rootProject.projectDir}/deps")
     maven(url = "https://thedarkcolour.github.io/KotlinForForge/")
     maven(url = "https://api.modrinth.com/maven")
+    maven(url = "https://maven.neoforged.net/releases")
     mavenLocal()
 }
 
 dependencies {
-    forge(libs.forge)
+    neoForge(libs.neoforge)
     //Because of the JEI mapping issues if we want
     //a forge launch we gotta do some wacky stuff
     //modImplementation(libs.jeiForge)
@@ -96,6 +94,11 @@ tasks {
     }
 }
 
+//Stole from architect discord, replaces loom.forge.convertAccessWideners
+tasks.remapJar {
+    atAccessWideners.add("cobblemon-common.accesswidener")
+}
+
 
 //jar {
 //    classifier("dev")

neoforge/gradle.properties

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

neoforge/src/main/resources/META-INF/mods.toml

@@ -19,6 +19,10 @@ description='''
 #displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
 # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 #updateJSONURL="https://change.me.example.invalid/updates.json" #optional
+[[mixins]]
+config = "mixins.cobblemon-neoforge.json"
+[[mixins]]
+config = "mixins.cobblemon-common.json"
 
 [[dependencies.cobblemon]]
 modId="minecraft"

settings.gradle.kts

@@ -17,7 +17,7 @@ plugins {
 listOf(
     "common",
     "fabric",
-    "forge"
+    "neoforge"
 ).forEach { setupProject(it, file(it)) }
 
 fun setupProject(name: String, projectDirectory: File) = setupProject(name) {