Getting some stuff ready for architectury 11

build.gradle

@@ -18,6 +18,7 @@ buildscript {
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
+//    id "dev.architectury.loom" version "0.11.0-SNAPSHOT" apply false // TODO: Move to this as it adds alot of stuff that are useful
 }
 
 /**
@@ -145,7 +146,7 @@ subprojects { p ->
         implementation("com.googlecode.json-simple:json-simple:${rootProject.json_version}")
 
         // Theming
-        implementation("com.formdev:flatlaf:1.6.1")
+        implementation("com.formdev:flatlaf:2.2")
 
 
         if (p == project(":fabric") || p == project(":forge")) {
@@ -158,7 +159,7 @@ subprojects { p ->
             shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
             shadowMe("com.googlecode.json-simple:json-simple:${rootProject.json_version}") {}
             // Theming
-            shadowMe("com.formdev:flatlaf:1.6.1")
+            shadowMe("com.formdev:flatlaf:2.2")
         }
 
         if (p != project(":forge")) {

common/build.gradle

@@ -2,6 +2,7 @@ architectury {
     common()
 }
 
+// TODO: Remove "afterEvaluate {}" once we update architectury to 11 or higher
 afterEvaluate {
     tasks {
         remapJar {

fabric/build.gradle

@@ -6,6 +6,9 @@ architectury {
 }
 
 configurations {
+    // TODO: Add the commented things once we update architectury to 11 or higher
+//    common
+//    shadowCommon
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
@@ -90,15 +93,15 @@ task deleteResources(type: Delete) {
 }
 
 processResources {
+    dependsOn(copyAccessWidener)
     dependsOn(copyCoreResources)
     dependsOn(copyCommonResources)
-    dependsOn(copyAccessWidener)
 }
 
 runClient {
+    dependsOn(copyAccessWidener)
     dependsOn(copyCoreResources)
     dependsOn(copyCommonResources)
-    dependsOn(copyAccessWidener)
     jvmArgs "-XX:-OmitStackTraceInFastThrow"
     finalizedBy(deleteResources)
 }

fabric/src/main/resources/fabric.mod.json

@@ -5,7 +5,7 @@
 
   "name": "${mod_name}",
   "description": "${description}",
-  "authors": ${authors},
+  "authors": $authors,
 
   "contact": {
     "homepage": "${homepage}",
@@ -13,7 +13,7 @@
     "issues": "${issues}"
   },
 
-  "license": "CC0-1.0",
+  "license": "LGPL",
   "icon": "icon.png",
 
   "environment": "client",
@@ -37,7 +37,7 @@
     "fabric-lifecycle-events-v1": "*",
     "fabric-key-binding-api-v1": "*",
     "fabric-networking-api-v1": "*",
-    "minecraft": ${compatible_minecraft_versions},
+    "minecraft": $compatible_minecraft_versions,
     "java": ">=${java_version}"
   },
 

forge/build.gradle

@@ -14,6 +14,9 @@ architectury {
 }
 
 configurations {
+    // TODO: Add the commented things once we update architectury to 11 or higher
+//    common
+//    shadowCommon
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentForge.extendsFrom common

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

@@ -1,7 +1,7 @@
 
 modLoader="javafml" #//mandatory
 loaderVersion="[36,41)" # // mandatory. This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-license="GNU GPLv3"
+license="LGPL"
 issueTrackerURL="${issues}"
 
 
@@ -9,7 +9,7 @@ issueTrackerURL="${issues}"
 	modId="lod" #//mandatory
 	version= "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
 	displayName="${mod_name}" #//mandatory
-	authors=${authors}
+	authors=$authors
 	#//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 	displayURL="${homepage}"
 	description= "${description}" #//mandatory. The description text for the mod

settings.gradle

@@ -10,6 +10,6 @@ pluginManagement {
 include("common")
 include("fabric")
 include("forge")
-include("core")
+include("core") // FIXME: There is a problem with the core module that stops us from upgrading architectury
 
 rootProject.name = "DistantHorizons"