More 1.20.6 work; currently blocked only by regutils

Author: lukebemish

build.gradle

@@ -4,6 +4,7 @@ plugins {
     alias libs.plugins.architectury.loom apply false
     alias libs.plugins.registrationutils apply false
     alias libs.plugins.nexuspublish
+    alias libs.plugins.idea.ext
 }
 
 managedVersioning {

buildSrc/src/main/groovy/convention.shared.gradle

@@ -8,7 +8,7 @@ plugins {
 version = rootProject.version
 group = rootProject.group
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 java.withSourcesJar()
 
 sourceSets {
@@ -58,7 +58,6 @@ configurations {
     compileOnlyApi.extendsFrom sharedCompileOnly
 }
 
-
 dependencies {
     allCompileOnly libs.jetbrains.annotations
     allCompileOnly libs.autoservice

common/build.gradle

@@ -4,7 +4,14 @@ plugins {
     alias libs.plugins.mdg
 }
 
-modsDotGroovy.multiplatform.expose()
+modsDotGroovy{
+    multiplatform.expose()
+    gather {
+        projectProperty 'mod_id'
+        projectProperty 'mod_name'
+        projectProperty 'mod_author'
+    }
+}
 
 configurations {
     for (def sourceSet in ['main', 'extension', 'transform']) {

common/src/extension/groovy/org/groovymc/cgl/api/codec/NightConfigOps.groovy

@@ -49,7 +49,7 @@ abstract class NightConfigOps extends ObjectOps implements CommentingOps<Object>
             return DataResult.error({->"mergeToMap called with not a map: " + map}, map)
         }
         DataResult<String> stringResult = this.getStringValue(key)
-        Optional<DataResult.PartialResult<String>> badResult = stringResult.error()
+        Optional<DataResult.Error<String>> badResult = stringResult.error()
         if (badResult.isPresent())
             return DataResult.error({->"key is not a string: " + key}, map)
         return stringResult.flatMap{
@@ -77,7 +77,7 @@ abstract class NightConfigOps extends ObjectOps implements CommentingOps<Object>
     Object createMap(Stream<Pair<Object, Object>> map) {
         final Config result = newConfig()
         map.iterator().each {
-            String key = this.getStringValue(it.getFirst()).getOrThrow(false, {})
+            String key = this.getStringValue(it.getFirst()).getOrThrow()
             result.set(key, it.getSecond())
         }
         return result

common/src/extension/groovy/org/groovymc/cgl/api/codec/ObjectOps.groovy

@@ -1,12 +1,10 @@
 package org.groovymc.cgl.api.codec
 
-
 import com.mojang.datafixers.util.Pair
 import com.mojang.serialization.DataResult
 import com.mojang.serialization.DynamicOps
 import com.mojang.serialization.MapLike
 import groovy.transform.CompileStatic
-import org.codehaus.groovy.runtime.NullObject
 
 import java.util.function.BiConsumer
 import java.util.function.Consumer
@@ -27,7 +25,7 @@ class ObjectOps implements DynamicOps<Object> {
 
     @Override
     Object empty() {
-        return NullObject.nullObject
+        return null
     }
 
     @Override
@@ -36,7 +34,7 @@ class ObjectOps implements DynamicOps<Object> {
             return convertMap(outOps, input)
         if (input instanceof List)
             return convertList(outOps, input)
-        if (input == NullObject.nullObject)
+        if (input == null)
             return outOps.empty()
         if (input instanceof Boolean)
             return outOps.createBoolean(input)
@@ -94,7 +92,7 @@ class ObjectOps implements DynamicOps<Object> {
             return DataResult.error({->"mergeToMap called with not a map: " + map}, map)
         }
         DataResult<String> stringResult = this.getStringValue(key)
-        Optional<DataResult.PartialResult<String>> badResult = stringResult.error()
+        Optional<DataResult.Error<String>> badResult = stringResult.error()
         if (badResult.isPresent())
             return DataResult.error({->"key is not a string: " + key}, map)
         return stringResult.flatMap{
@@ -113,19 +111,15 @@ class ObjectOps implements DynamicOps<Object> {
         if (!(input instanceof Map))
             return DataResult.error {->"Not a map: " + input}
         return DataResult.success(((Map)input).entrySet().stream().map {
-            return Pair.of(it.key, it.value instanceof NullObject ? null : it.value)
+            return Pair.of(it.key, it.value)
         })
     }
 
     @Override
     DataResult<Consumer<BiConsumer<Object, Object>>> getMapEntries(Object input) {
         if (!(input instanceof Map))
             return DataResult.error {->"Not a map: " + input}
-        return DataResult.<Consumer<BiConsumer<Object, Object>>>success({BiConsumer<Object, Object> it ->
-            for (final Map.Entry<Object,Object> entry : ((Map)input).entrySet()) {
-                it.accept(entry.key, entry.value instanceof NullObject ? null : entry.value)
-            }
-        } as Consumer<BiConsumer<Object, Object>>)
+        return DataResult.<Consumer<BiConsumer<Object, Object>>>success((Consumer<BiConsumer<Object, Object>>) ((Map) input)::forEach)
     }
 
     @Override
@@ -135,20 +129,18 @@ class ObjectOps implements DynamicOps<Object> {
             return DataResult.<MapLike<Object>>success(new MapLike<Object>() {
                 @Override
                 Object get(Object key) {
-                    Object found = map.get(key)
-                    return found instanceof NullObject ? null : found
+                    return map.get(key)
                 }
 
                 @Override
                 Object get(String key) {
-                    Object found = map.get(key)
-                    return found instanceof NullObject ? null : found
+                    return map.get(key)
                 }
 
                 @Override
                 Stream<Pair<Object, Object>> entries() {
                     map.entrySet().stream().map {
-                        return Pair.of(it.key, it.value instanceof NullObject ? null : it.value)
+                        return Pair.of(it.key, it.value)
                     }
                 }
 
@@ -165,7 +157,7 @@ class ObjectOps implements DynamicOps<Object> {
     Object createMap(Stream<Pair<Object, Object>> map) {
         final Map result = [:]
         map.iterator().each {
-            result.put(this.getStringValue(it.getFirst()).getOrThrow(false, {}), it.getSecond())
+            result.put(this.getStringValue(it.getFirst()).getOrThrow(), it.getSecond())
         }
         return result
     }
@@ -176,7 +168,7 @@ class ObjectOps implements DynamicOps<Object> {
         {
             @SuppressWarnings("unchecked")
             List list = input as List
-            return DataResult.success(list.stream().map {it instanceof NullObject ? null : it})
+            return DataResult.success(list.stream())
         }
         return DataResult.error {->"Not a list: " + input}
     }
@@ -186,7 +178,7 @@ class ObjectOps implements DynamicOps<Object> {
         if (input instanceof List) {
             return DataResult.<Consumer<Consumer<Object>>>success({Consumer<Object> it ->
                 for (final Object element : input) {
-                    it.accept(element instanceof NullObject ? null : element)
+                    it.accept(element)
                 }
             } as Consumer<Consumer<Object>>)
         }

common/src/extension/groovy/org/groovymc/cgl/api/extension/brigadier/ArgumentExtensions.groovy

@@ -311,14 +311,14 @@ final class ArgumentExtensions {
     ) Closure closure) {
         argument(self, name, ColorArgument.color(), defaultGetter(), closure)
     }
-    static <S, T extends ArgumentBuilder<S, T>> T component(ArgumentBuilder<S, T> self, String name, @DelegatesTo(
+    static <S, T extends ArgumentBuilder<S, T>> T component(ArgumentBuilder<S, T> self, String name, CommandBuildContext context, @DelegatesTo(
             type = 'com.mojang.brigadier.builder.RequiredArgumentBuilder<S,net.minecraft.network.chat.Component>',
             strategy = DELEGATE_FIRST
     ) @ClosureParams(
             value = FromString,
             options = 'org.groovymc.cgl.api.extension.brigadier.ArgumentGetter<S,net.minecraft.network.chat.Component>'
     ) Closure closure) {
-        argument(self, name, ComponentArgument.textComponent(), defaultGetter(), closure)
+        argument(self, name, ComponentArgument.textComponent(context), defaultGetter(), closure)
     }
     static <S, T extends ArgumentBuilder<S, T>> T uuid(ArgumentBuilder<S, T> self, String name, @DelegatesTo(
             type = 'com.mojang.brigadier.builder.RequiredArgumentBuilder<S,java.util.UUID>',

fabric/build.gradle

@@ -1,4 +1,4 @@
-import org.groovymc.modsdotgroovy.core.Platform
+import org.groovymc.modsdotgroovy.types.core.Platform
 import org.groovymc.modsdotgroovy.gradle.tasks.AbstractGatherPlatformDetailsTask
 
 plugins {
@@ -75,11 +75,9 @@ afterEvaluate {
     configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
 
     dependencies {
-        compileOnly reg.loaderSpecific()
-        localRuntime reg.loaderSpecific()
-        testCompileOnly reg.loaderSpecific()
-        transformCompileOnly reg.loaderSpecific()
-        extensionCompileOnly reg.loaderSpecific()
+        compileOnly reg.common()
+        localRuntime reg.joined()
+        testCompileOnly reg.common()
         transformCompileOnly reg.common()
         extensionCompileOnly reg.common()
     }

gradle/libs.versions.toml

@@ -6,23 +6,24 @@ parchment_mappings = "2024.05.01"
 neoforge = "20.6.76-beta"
 
 fabric_loader = "0.15.10"
-fabric_api = "0.92.0+1.20.4"
+fabric_api = "0.100.0+1.20.6"
 
-mdg = "2.0.0-beta.25"
+mdg = "2.0.0-beta.27"
 autoservice = "1.1.1"
 nexuspublish = "2.0.0"
+idea_ext = "1.1.8"
 
 architectury_loom = "1.6.397"
 
 jetbrains_annotations = "24.1.0"
 
 managedversioning = "1.2.19"
-registrationutils = "1.20.2-0.1.2"
+registrationutils = "1.20.2-0.2.1"
 enhancedgroovy = "0.2.0"
 
 groovybundler = "2.1.4"
 groovyduvet = "3.1.6"
-gml = "6.0.0"
+gml = "6.0.1"
 
 jankson = "1.2.3"
 nightconfig = "3.6.7"
@@ -56,4 +57,4 @@ mdg = { id = "org.groovymc.modsdotgroovy", version.ref = "mdg" }
 architectury_loom = { id = "dev.architectury.loom", version.ref = "architectury_loom" }
 registrationutils = { id = "com.matyrobbrt.mc.registrationutils", version.ref = "registrationutils" }
 nexuspublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexuspublish" }
-
+idea_ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "idea_ext" }

neoforge/build.gradle

@@ -1,4 +1,4 @@
-import org.groovymc.modsdotgroovy.core.Platform
+import org.groovymc.modsdotgroovy.types.core.Platform
 import org.groovymc.modsdotgroovy.gradle.tasks.AbstractGatherPlatformDetailsTask
 
 plugins {
@@ -61,12 +61,10 @@ afterEvaluate {
     configurations.extensionCompileClasspath.extendsFrom configurations.minecraftNamedCompile
 
     dependencies {
-        compileOnly reg.loaderSpecific()
-        localRuntime reg.loaderSpecific()
-        testCompileOnly reg.loaderSpecific()
-        testRuntimeOnly reg.loaderSpecific()
-        transformCompileOnly reg.loaderSpecific()
-        extensionCompileOnly reg.loaderSpecific()
+        compileOnly reg.common()
+        localRuntime reg.joined()
+        testCompileOnly reg.common()
+        testRuntimeOnly reg.joined()
         transformCompileOnly reg.common()
         extensionCompileOnly reg.common()
     }
@@ -88,12 +86,14 @@ loom {
             setConfigName("NeoForge Client")
             ideConfigGenerated(true)
             runDir("run")
+            source(sourceSets.test)
         }
         server {
             server()
             setConfigName("NeoForge Server")
             ideConfigGenerated(true)
             runDir("run")
+            source(sourceSets.test)
         }
     }
 }

neoforge/src/main/groovy/org/groovymc/cgl/impl/neoforge/CGLNeoForge.groovy

@@ -15,7 +15,7 @@ import org.jetbrains.annotations.ApiStatus
 class CGLNeoForge {
     CGLNeoForge() {
         CommonGroovyLibrary.LOGGER.info('CGL NeoForge initialised')
-        forgeBus.addListener(AddReloadListenerEvent) { event ->
+        gameBus.addListener(AddReloadListenerEvent) { event ->
             event.addListener(new ScriptResourceListener())
         }
     }