no arg mapper returns default value

CleanroomMC · Jul 5, 2024 · 54af456 · 54af456
1 parent 7a7eb44
commit 54af456
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapper.java b/src/main/java/com/cleanroommc/groovyscript/mapper/ObjectMapper.java
@@ -84,6 +84,11 @@ T invoke(String s, Object... args) {
         return Objects.requireNonNull(t.getValue(), "Object napper result must contain a non-null value!");
     }
 
+    T invokeDefault() {
+        Result<T> t = this.defaultValue.get();
+        return t == null || t.hasError() ? null : t.getValue();
+    }
+
     public GroovyContainer<?> getMod() {
         return mod;
     }
@@ -114,6 +119,10 @@ public T doCall(String s, Object... args) {
         return invoke(s, args);
     }
 
+    public T doCall() {
+        return invokeDefault();
+    }
+
     @Override
     public String getDocumentation() {
         return documentation;