Undo bad 1.21 merge changes

.gitignore

@@ -12,6 +12,7 @@ bin/
 */.factorypath
 .project
 .idea/
+.run/
 classes/
 .metadata
 .vscode

dependencies.gradle

@@ -25,7 +25,6 @@ dependencies {
 
     // AE2
     compileOnly(forge.ae2)
-    compileOnly(forge.ae2wtlib)
 
     // Create
     compileOnly(forge.ponder)
@@ -35,8 +34,7 @@ dependencies {
     // KJS
     compileOnly(forge.bundles.kjs)
 
-    // Shimmer
-    // compileOnly(forge.shimmer)
+    // Rendering / Optimizations
     compileOnly(forge.sodium)
     compileOnly(forge.iris)
     compileOnly(forge.modernfix)
@@ -46,8 +44,8 @@ dependencies {
     compileOnly(forge.ftbteams)
     compileOnly(forge.ftbquests)
     compileOnly(forge.resourcefullib)
-    // compileOnly(forge.argonauts)
-    // compileOnly(forge.heracles)
+    compileOnly(forge.argonauts)
+    compileOnly(forge.heracles)
 
     // Maps
     compileOnly(forge.ftbchunks)

docs/content/Development/FAQ.md

@@ -6,16 +6,3 @@ title: "FAQ"
 
 # :material-frequently-asked-questions: Frequently Asked Questions
 
-
-## How to disable Shimmer's colored light monitor
-
-Shimmer (one of our soft-dependencies) displays information about colored lights in development environments by default.  
-You can turn it off using the command `/shimmer coloredLightMonitor` ingame.
-
-Alternatively, if you want to disable it by default, put this in your KubeJS client scripts:
-
-```js
-// Disable Shimmer's colored light monitor:
-let LightCounterRender = Java.loadClass("com.lowdragmc.shimmer.client.light.LightCounter$Render")
-LightCounterRender.enable = false
-```

gradle/forge.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-configuration = "3.1.1-neoforge"
 ldlib = "1.0.35.a"
 registrate = "MC1.21-1.3.0+67"
+configuration = "3.1.1-neoforge"
 
 jei = "19.25.1.328"
 rei = "16.0.799"
@@ -11,31 +11,25 @@ kubejs = "2101.7.2-build.336"
 rhino = "2101.2.7-build.81"
 architectury = "13.0.8"
 clothconfig = "15.0.140"
+create = "6.0.8-168"
+ponder = "1.0.64"
+flywheel = "1.0.5"
 theoneprobe = "1.21_neo-12.0.4-6"
 curios = "9.4.2+1.21.1"
 kotlinforforge = "5.7.0"
-# shimmer = "1.20.1-0.2.4"
 journeyMapApi = "2.0.0-1.21.1-SNAPSHOT"
-ftblibrary = "2101.1.12"
-ftbteams = "2101.1.2"
-ftbquests = "2101.1.8"
-ftbchunks = "2101.1.8"
+ftblibrary = "2101.1.30"
+ftbteams = "2101.1.9"
+ftbquests = "2101.1.21"
+ftbchunks = "2101.1.14"
 ccTweaked = "1.116.0"
 resourcefullib = "3.0.12"
 gamestages = "17.0.1"
 bookshelf = "21.1.56"
-ae2wtlib = "19.2.2"
+# TODO update these once there's 1.21 versions
 argonauts = "1.2.4"
-# FIXME for some reason their maven only has versions up to 1.1.10?
-# heracles = "1.1.13"
-# journeyMapApi = "1.20-1.9-SNAPSHOT"
-# ftblibrary = "2001.2.4"
-# ftbteams = "2001.3.0"
-# ftbquests = "2001.4.11"
-# ftbchunks = "2001.3.4"
-create = "6.0.8-168"
-ponder = "1.0.64"
-flywheel = "1.0.5"
+# FIXME for some reason their maven only has versions up to 1.1.10? latest on modrinth is 1.1.13
+heracles = "1.1.10"
 
 ## modrinth maven ##
 jade = "15.10.0+neoforge"
@@ -52,10 +46,6 @@ xaerosMinimap = "6306189"
 journeyMap = "6383889"
 spark = "6225208"
 observable = "5733591"
-ftblibrary-cm = "6304123"
-ftbteams-cm = "6119437"
-ftbquests-cm = "6371007"
-ftbchunks-cm = "6295696"
 
 
 [libraries]
@@ -86,18 +76,21 @@ theoneprobe         = { module = "mcjty.theoneprobe:theoneprobe", version.ref =
 curios              = { module = "top.theillusivec4.curios:curios-neoforge", version.ref = "curios" }
 kotlinforforge      = { module = "thedarkcolour:kotlinforforge-neoforge", version.ref = "kotlinforforge" }
 journeymap-api      = { module = "info.journeymap:journeymap-api-neoforge", version.ref = "journeyMapApi" }
-# shimmer             = { module = "com.lowdragmc.shimmer:Shimmer-forge", version.ref = "shimmer" }
 ftblibrary          = { module = "dev.ftb.mods:ftb-library-neoforge", version.ref = "ftblibrary" }
 ftbteams            = { module = "dev.ftb.mods:ftb-teams-neoforge", version.ref = "ftbteams" }
 ftbquests           = { module = "dev.ftb.mods:ftb-quests-neoforge", version.ref = "ftbquests" }
 ftbchunks           = { module = "dev.ftb.mods:ftb-chunks-neoforge", version.ref = "ftbchunks" }
 resourcefullib      = { module = "com.teamresourceful.resourcefullib:resourcefullib-neoforge-1.21", version.ref = "resourcefullib" }
-# gamestages          = { module = "net.darkhax.gamestages:GameStages-Forge-1.20.3", version.ref = "gamestages" }
+# Keep gamestages around so the code doesn't have to be commented out
+gamestages          = { module = "net.darkhax.gamestages:GameStages-Forge-1.20.3", version.ref = "gamestages" }
 bookshelf           = { module = "net.darkhax.bookshelf:bookshelf-neoforge-1.21.1", version.ref = "bookshelf" }
-ae2wtlib            = { module = "de.mari_023:ae2wtlib", version.ref = "ae2wtlib" }
+# Keep odyssey quests/allies around so the code doesn't have to be commented out
 # TODO update these once there's 1.21 versions
-# argonauts           = { module = "earth.terrarium.argonauts:argonauts-neoforge-1.21.1`", version.ref = "argonauts" }
-# heracles            = { module = "earth.terrarium.heracles:heracles-neoforge-1.21.1", version.ref = "heracles" }
+argonauts           = { module = "earth.terrarium.argonauts:argonauts-neoforge-1.20.4", version.ref = "argonauts" }
+heracles            = { module = "earth.terrarium.heracles:heracles-forge-1.20.1", version.ref = "heracles" }
+# these will be the new names of the projects when they finally update to 1.21
+# argonauts           = { module = "earth.terrarium.odyssey_allies:odyssey_allies-neoforge-1.21.1`", version.ref = "argonauts" }
+# heracles            = { module = "earth.terrarium.odyssey_quests:odyssey_quests-neoforge-1.21.1", version.ref = "heracles" }
 
 jade                = { module = "maven.modrinth:jade", version.ref = "jade" }
 sodium              = { module = "maven.modrinth:sodium", version.ref = "sodium" }
@@ -117,11 +110,6 @@ xaerosminimap       = { module = "curse.maven:xaeros-minimap-263420", version.re
 journeymap-forge    = { module = "curse.maven:journeymap-32274", version.ref = "journeyMap" }
 spark               = { module = "curse.maven:spark-361579", version.ref = "spark" }
 observable          = { module = "curse.maven:observable-509575", version.ref = "observable" }
-## cursemaven as a backup ##
-ftblibrary-cm       = { module = "curse.maven:ftb-library-forge-404465", version.ref = "ftblibrary-cm" }
-ftbteams-cm         = { module = "curse.maven:ftb-teams-forge-404468", version.ref = "ftbteams-cm" }
-ftbquests-cm        = { module = "curse.maven:ftb-quests-forge-289412", version.ref = "ftbquests-cm" }
-ftbchunks-cm        = { module = "curse.maven:ftb-chunks-forge-314906", version.ref = "ftbchunks-cm" }
 
 [bundles]
 jei = ["jei-common-api", "jei-neoforge-api", "jei-neoforge-impl"]

gradle/libs.versions.toml

@@ -8,7 +8,7 @@ spotless = "8.1.0"
 modDevGradle = "2.0.119"
 lombok = "8.14"
 jetbrains-annotations = "26.0.1"
-renderNurse = "0.0.12"
+renderNurse = "0.0.14"
 mixin = "0.8.7"
 
 [libraries]

gradle/scripts/jars.gradle

@@ -16,7 +16,6 @@ sourcesJar {
     }
     from delombok
 }
-jar.archiveClassifier = "dev"
 
 base {
     archivesName = "${project.name}-${libs.versions.minecraft.get()}"

gradle/scripts/moddevgradle.gradle

@@ -19,7 +19,6 @@ neoForge {
         from(file)
         publish(file)
     }
-    // I'd have it on but it just doesn't work :( (fails on some neoforge classes)
     validateAccessTransformers = true
 
     interfaceInjectionData {
@@ -135,7 +134,7 @@ neoForge {
             create("renderDocClient") {
                 client()
                 sourceSet = sourceSets.client
-                ideName = "Clean Client + RenderDoc (Requires Java 21)"
+                ideName = "Clean Client + RenderDoc"
 
                 programArguments.addAll('--username', 'screret', '--uuid', '1184eb79-5831-4f7d-b8f4-3a46fccf7a1d')
 

gradle/scripts/repositories.gradle

@@ -25,17 +25,14 @@ repositories {
         url = "https://maven.firstdark.dev/snapshots"
     }
 
-    maven { url = "https://maven.createmod.net" }
-
-
     exclusiveContent { // Create, Ponder, Flywheel
         forRepository {
             maven { url = "https://maven.createmod.net" }
         }
         filter {
             includeGroup("net.createmod.ponder")
             includeGroup("com.simibubi.create")
-            includeGroup("dev.engine-room.flywheel")
+            includeGroupAndSubgroups("dev.engine-room")
         }
     }
     exclusiveContent { // Configuration