Update Neo, and fix breaking changes related to configs (#235)

Author: pupnewfster

build.gradle

@@ -3,14 +3,14 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'org.ajoberstar.grgit.service' version '5.2.2'
-    id 'net.neoforged.gradle.userdev' version '7.0.142'//https://projects.neoforged.net/neoforged/neogradle
+    id 'net.neoforged.gradle.userdev' version '7.0.154'//https://projects.neoforged.net/neoforged/neogradle
     id 'io.freefair.lombok' version '8.6'
     id 'com.matthewprenger.cursegradle' version '1.4.0'
 }
 
 tasks.named('wrapper', Wrapper).configure {
     //Define wrapper values here so as to not have to always do so when updating gradlew.properties
-    gradleVersion = '8.8'
+    gradleVersion = '8.9'
     distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -35,10 +35,10 @@ runs {
         if (hasProperty('forge_force_ansi')) {
             //Force ansi if declared as a gradle variable, as the auto detection doesn't detect IntelliJ properly
             // or eclipse's plugin that adds support for ansi escape in console
-            jvmArguments.add("-Dterminal.ansi=${property('forge_force_ansi')}")
+            systemProperties.put('terminal.ansi', (String) property('forge_force_ansi'))
         }
 
-        modSources(sourceSets.main, sourceSets.test)
+        modSources.add((SourceSet[]) [sourceSets.main, sourceSets.test])
 
         // Recommended logging level for the console
         systemProperties.put('forge.logging.console.level', 'debug')

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.2.0
 minecraft_version=1.21
-forge_version=21.0.0-beta
+forge_version=21.0.86-beta
 
 curse_type=beta
 projectId=267602
@@ -12,6 +12,6 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
 #NeoGradle Settings
-neogradle.subsystems.parchment.minecraftVersion=1.20.6
-neogradle.subsystems.parchment.mappingsVersion=2024.06.02
+neogradle.subsystems.parchment.minecraftVersion=1.21
+neogradle.subsystems.parchment.mappingsVersion=2024.06.23
 neogradle.subsystems.conventions.sourcesets.enabled=false

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -49,8 +49,15 @@ public CTM(ModContainer modContainer, IEventBus modBus) {
         TextureTypeRegistry.scan();
 
         definitionManager = new CTMDefinitionManager();
-        ReloadableResourceManager resourceManager = (ReloadableResourceManager) Minecraft.getInstance().getResourceManager();
-        resourceManager.registerReloadListener(definitionManager.getReloadListener());
+        Minecraft minecraft = Minecraft.getInstance();
+        if (minecraft != null) {
+            //TODO
+            // Note: This can be null in datagen. We just skip adding the definition manager, as resources don't actually need
+            // to be loaded in datagen. Once: https://github.com/neoforged/NeoForge/pull/1289 is merged, we should move to using
+            // that instead
+            ReloadableResourceManager resourceManager = (ReloadableResourceManager) minecraft.getResourceManager();
+            resourceManager.registerReloadListener(definitionManager.getReloadListener());
+        }
         reloadListener = new CTMPackReloadListener();
         modBus.addListener(this::reloadListenersLate);
     }

gradlew

@@ -16,7 +16,7 @@ public class Configurations {
     public static final Configurations INSTANCE = new Configurations();
 
     public static void register(ModContainer modContainer, IEventBus modBus) {
-        modContainer.addConfig(new ModConfig(Type.CLIENT, INSTANCE.configSpec, modContainer, "ctm.toml"));
+        modContainer.registerConfig(Type.CLIENT, INSTANCE.configSpec, "ctm.toml");
         modBus.addListener(ModConfigEvent.Reloading.class, event -> {
             if (event.getConfig().getModId().equals(CTM.MOD_ID)) {
                 //Only reload when our config changes

gradlew.bat

@@ -20,6 +20,6 @@ license="GPL-2.0"
 [[dependencies.ctm]]
     modId="neoforge"
     type="required"
-    versionRange="[21.0.0-beta,)"
+    versionRange="[21.0.82-beta,)"
     ordering="NONE"
     side="BOTH"