all tests pass

unimined · Jul 27, 2024 · 22f35f4 · 22f35f4
1 parent 8198ec9
commit 22f35f4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 41 deletions.
diff --git a/src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/dsl/MappingDSL.kt b/src/api/kotlin/xyz/wagyourtail/unimined/api/mapping/dsl/MappingDSL.kt
@@ -29,14 +29,17 @@ class MappingDSL(val visitor: MappingVisitor) {
         }
     }
 
+    @JvmOverloads
     fun c(
         names: List<String?>,
         @DelegatesTo(ClassDSL::class, strategy = Closure.DELEGATE_FIRST)
-        block: Closure<*>
+        block: Closure<*>? = null
     ) {
         c(*names.toTypedArray()) {
-            block.delegate = this
-            block.call()
+            if (block != null) {
+                block.delegate = this
+                block.call()
+            }
         }
     }
 
@@ -57,14 +60,17 @@ class MappingDSL(val visitor: MappingVisitor) {
             }
         }
 
+        @JvmOverloads
         fun f(
             names: List<String?>,
             @DelegatesTo(FieldDSL::class, strategy = Closure.DELEGATE_FIRST)
-            block: Closure<*>
+            block: Closure<*>? = null
         ) {
             f(*names.toTypedArray()) {
-                block.delegate = this
-                block.call()
+                if (block != null) {
+                    block.delegate = this
+                    block.call()
+                }
             }
         }
 
@@ -82,14 +88,17 @@ class MappingDSL(val visitor: MappingVisitor) {
             }
         }
 
+        @JvmOverloads
         fun m(
             names: List<String?>,
             @DelegatesTo(MethodDSL::class, strategy = Closure.DELEGATE_FIRST)
-            block: Closure<*>
+            block: Closure<*>? = null
         ) {
             m(*names.toTypedArray()) {
-                block.delegate = this
-                block.call()
+                if (block != null) {
+                    block.delegate = this
+                    block.call()
+                }
             }
         }
 

diff --git a/src/test/kotlin/xyz/wagyourtail/unimined/test/integration/NeoForgedForgeFabric1_20_3Test.kt b/src/test/kotlin/xyz/wagyourtail/unimined/test/integration/NeoForgedForgeFabric1_20_3Test.kt
diff --git a/testing/1.20.4-NeoForged-Forge-Fabric/build.gradle b/testing/1.20.4-NeoForged-Forge-Fabric/build.gradle
@@ -40,9 +40,9 @@ unimined.minecraft {
         intermediary()
         yarn(1)
 
-        stub(["intermediary", "yarn"]) {
+        stubs(["intermediary", "yarn"]) {
             c(["net/minecraft/class_1927"]) {
-                m(["method_55109()Lnet/minecraft/class_243;", "getPos"])
+                m(["method_55109;()Lnet/minecraft/class_243;", "getPos"])
             }
         }
     }