argument fetchers, text component

Author: diamonddevv

src/main/java/dev/diamond/luafy/lua/ScriptFunction.java

@@ -35,55 +35,57 @@ private LuaValue next() {
             return idx(this.argIdx++);
         }
 
+        private <T> T optionalVal(LuaValue val, T def, Function<LuaValue, T> func) {
+            if (val.isnil()) return def;
+            else return func.apply(val);
+        }
 
 
-        public LuaTable getTable(LuaValue val, LuaTable def) {
-            return val.opttable(def);
+        public LuaTable getTable(LuaValue val) {
+            return val.checktable();
         }
 
-        public int getInt(LuaValue val, int def) {
-            return val.optint(def);
+        public int getInt(LuaValue val) {
+            return val.checkint();
         }
 
-        public float getFloat(LuaValue val, float def) {
-            return (float) val.optdouble(def);
+        public float getFloat(LuaValue val) {
+            return (float) val.checkdouble();
         }
 
-        public boolean getBoolean(LuaValue val, boolean def) {
-            return val.optboolean(def);
+        public boolean getBoolean(LuaValue val) {
+            return val.checkboolean();
         }
 
-        public String getString(LuaValue val, String def) {
-            return MetamethodImpl.tostring(val.optstring(LuaString.valueOf(def)));
+        public String getString(LuaValue val) {
+            return MetamethodImpl.tostring(val);
         }
 
-        public LuaValue getLuaValue(LuaValue val, LuaValue def) {
-            return val.optvalue(def);
+        public LuaValue getLuaValue(LuaValue val) {
+            return val;
         }
 
-        public LuaFunction getFunction(LuaValue val, LuaFunction def) {
-            return val.optfunction(def);
+        public LuaFunction getFunction(LuaValue val) {
+            return val.checkfunction();
         }
 
-        public <T> T getScriptObject(AbstractScriptObject<T> obj, LuaValue val, CommandSourceStack src, LuaScript script, T def) {
-            LuaTable table = val.checktable();
-            if (table.isnil()) {
-                return def;
-            } else {
-                return obj.toThing(table, src, script);
-            }
+        public <T> T getScriptObject(AbstractScriptObject<T> obj, LuaValue val, CommandSourceStack src, LuaScript script) {
+            return obj.toThing(val.checktable(), src, script);
         }
 
-        public <T> ArrayList<T> getArray(int idx, BiFunction<LuaValue, T, T> getter) {
-            LuaTable table = getTable(idx);
+        public <T> ArrayList<T> getArray(LuaValue val, Function<LuaValue, T> getter) {
+            LuaTable table = getTable(val);
             ArrayList<T> ts = new ArrayList<>();
 
             for (LuaValue key : table.keys()) {
                 var luaValue = table.get(key);
+                ts.add(getter.apply(luaValue));
             }
 
+            return ts;
         }
 
+        // nexts, no def
 
         public LuaTable nextTable() {
             return getTable(next());
@@ -117,38 +119,46 @@ public <T> T nextScriptObject(AbstractScriptObject<T> obj, CommandSourceStack sr
             return getScriptObject(obj, next(), src, script);
         }
 
-        // defaults
+        public <T> ArrayList<T> nextArray(Function<LuaValue, T> getter) {
+            return getArray(next(), getter);
+        }
+
+        // nexts with defs
 
         public LuaTable nextTable(LuaTable def) {
-            return getTable(next(), def);
+            return optionalVal(next(), def, this::getTable);
         }
 
         public int nextInt(int def) {
-            return getInt(next(), def);
+            return optionalVal(next(), def, this::getInt);
         }
 
         public float nextFloat(float def) {
-            return getFloat(next(), def);
+            return optionalVal(next(), def, this::getFloat);
         }
 
         public boolean nextBoolean(boolean def) {
-            return getBoolean(next(), def);
+            return optionalVal(next(), def, this::getBoolean);
         }
 
         public String nextString(String def) {
-            return getString(next(), def);
+            return optionalVal(next(), def, this::getString);
         }
 
         public LuaValue nextLuaValue(LuaValue def) {
-            return getLuaValue(next(), def);
+            return optionalVal(next(), def, this::getLuaValue);
         }
 
         public LuaFunction nextFunction(LuaFunction def) {
-            return getFunction(next(), def);
+            return optionalVal(next(), def, this::getFunction);
         }
 
         public <T> T nextScriptObject(AbstractScriptObject<T> obj, CommandSourceStack src, LuaScript script, T def) {
-            return getScriptObject(obj, next(), src, script, def);
+            return optionalVal(next(), def, val -> getScriptObject(obj, val, src, script));
+        }
+
+        public <T> ArrayList<T> nextArray(Function<LuaValue, T> getter, ArrayList<T> def) {
+            return optionalVal(next(), def, val -> getArray(val, getter));
         }
 
     }

src/main/java/dev/diamond/luafy/script/object/game/TextComponentScriptObject.java

@@ -10,9 +10,12 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.network.chat.contents.TranslatableContents;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 
+import java.util.ArrayList;
+
 public class TextComponentScriptObject extends AbstractScriptObject<MutableComponent> {
 
     public static final String PROP_POINTER = "_ptr";
@@ -67,10 +70,10 @@ public void toTable(MutableComponent obj, LuaTableBuilder builder, LuaScript scr
 
         builder.add(FUNC_APPEND_TRANSLATABLE, args -> {
             String key = args.nextString();
+            ArrayList<MutableComponent> components = args.nextArray(v ->
+                    args.getScriptObject(ScriptObjects.TEXT_COMPONENT, v, script.getSource(), script), new ArrayList<>());
 
-
-
-            obj.append(Component.translatable(key));
+            obj.append(MutableComponent.create(new TranslatableContents(key, null, components.toArray())));
             return LuaValue.NIL;
         });