undo that adapt thing lol

Author: diamonddevv

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

@@ -1,66 +1,20 @@
 package dev.diamond.luafy.lua;
 
-import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.script.LuaScript;
 import dev.diamond.luafy.script.object.AbstractScriptObject;
 import net.minecraft.commands.CommandSourceStack;
 import org.luaj.vm2.*;
 
-import java.lang.reflect.Array;
 import java.util.function.Function;
 
 @FunctionalInterface
 public interface ScriptFunction extends Function<Varargs, LuaValue> {
 
-    Object call(ArgumentSupplier args);
+    LuaValue call(ArgumentSupplier args);
 
     @Override
     default LuaValue apply(Varargs args) {
-        Object obj = call(new ArgumentSupplier(args));
-        return ScriptFunction.adapt(obj);
-    }
-
-    static LuaValue adapt(Object obj) {
-
-        if (obj instanceof LuaValue val) {
-            return val;
-
-        } else if (obj == null) {
-            return LuaValue.NIL;
-        } else if (obj instanceof Integer i) { // primitives + string
-            return LuaValue.valueOf(i);
-        } else if (obj instanceof Byte b) {
-            return LuaValue.valueOf(b);
-        } else if (obj instanceof Long l) {
-            return LuaValue.valueOf(l);
-        } else if (obj instanceof Float f) {
-            return LuaValue.valueOf(f);
-        } else if (obj instanceof Double d) {
-            return LuaValue.valueOf(d);
-        } else if (obj instanceof Boolean bl) {
-            return LuaValue.valueOf(bl);
-        } else if (obj instanceof String s) {
-            return LuaValue.valueOf(s);
-        } else if (obj instanceof Short sh) {
-            return LuaValue.valueOf(sh);
-        } else if (obj.getClass().isArray()) { // should probably be avoided anyway
-            Object[] arr = (Object[]) obj;
-            LuaValue[] luaArr = new LuaValue[arr.length];
-            for (int i = 0; i < arr.length; i++) luaArr[i] = adapt(arr[i]);
-            return LuaTable.tableOf(luaArr);
-        } else { // script objects
-
-            for (var asco : LuafyRegistries.SCRIPT_OBJECTS) {
-                if (obj.getClass() == asco.getType()) {
-                    return LuaTableBuilder.provide(asco, obj, script);
-                }
-            }
-
-        }
-
-
-        throw new RuntimeException("Couldn't adapt some JVM value to a value returnable to Lua " +
-                "(It might not be registered)");
+        return call(new ArgumentSupplier(args));
     }
 
     class ArgumentSupplier {

src/main/java/dev/diamond/luafy/script/object/ModScriptObject.java

@@ -7,6 +7,7 @@
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.commands.CommandSourceStack;
 import org.luaj.vm2.LuaTable;
+import org.luaj.vm2.LuaValue;
 
 public class ModScriptObject extends AbstractScriptObject<ModContainer> {
 
@@ -22,8 +23,8 @@ public ModScriptObject() {
 
     @Override
     public void toTable(ModContainer obj, LuaTableBuilder builder, LuaScript script) {
-        builder.add(FUNC_MODID, args -> obj.getMetadata().getId());
-        builder.add(FUNC_VERSION, args -> obj.getMetadata().getVersion().getFriendlyString());
+        builder.add(FUNC_MODID, args -> LuaValue.valueOf(obj.getMetadata().getId()));
+        builder.add(FUNC_VERSION, args -> LuaValue.valueOf(obj.getMetadata().getVersion().getFriendlyString()));
 
         makeReadonly(builder);
     }

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

@@ -60,14 +60,14 @@ public void toTable(ItemStack obj, LuaTableBuilder builder, LuaScript script) {
 
         builder.add(FUNC_COUNT, args -> LuaValue.valueOf(obj.getCount()));
         builder.add(FUNC_COUNT_SET, args -> {
-            obj.setCount(args.arg1().toint());
+            obj.setCount(args.nextInt());
             return LuaValue.NIL;
         });
         builder.add(FUNC_ITEM_TYPE, args -> LuaTableBuilder.provide(b -> ScriptObjects.ITEM.toTable(obj.getItem(), b, script)));
         builder.add(FUNC_ITEM_ID, args -> LuaValue.valueOf(BuiltInRegistries.ITEM.getId(obj.getItem())));
 
         builder.add(FUNC_COMPONENT, args -> {
-            String key = MetamethodImpl.tostring(args.arg1());
+            String key = args.nextString();
 
             // get the component
             DataComponentType<Object> type = (DataComponentType<Object>) BuiltInRegistries.DATA_COMPONENT_TYPE.get(Identifier.parse(key)).orElseThrow().value();
@@ -85,8 +85,8 @@ public void toTable(ItemStack obj, LuaTableBuilder builder, LuaScript script) {
         });
 
         builder.add(FUNC_COMPONENT_SET, args -> {
-            String key = MetamethodImpl.tostring(args.arg1());
-            LuaTable data = args.arg(2).checktable();
+            String key = args.nextString();
+            LuaTable data = args.nextTable();
 
             // get the component
             DataComponentType<Object> type = (DataComponentType<Object>) BuiltInRegistries.DATA_COMPONENT_TYPE.get(Identifier.parse(key)).orElseThrow().value();

src/main/java/dev/diamond/luafy/script/object/game/entity/LivingEntityScriptObject.java

@@ -2,12 +2,9 @@
 
 import dev.diamond.luafy.autodoc.Argtypes;
 import dev.diamond.luafy.lua.LuaTableBuilder;
-import dev.diamond.luafy.lua.MetamethodImpl;
 import dev.diamond.luafy.registry.ScriptObjects;
 import dev.diamond.luafy.script.LuaScript;
 import dev.diamond.luafy.script.object.AbstractScriptObject;
-import net.minecraft.commands.arguments.SlotArgument;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.SlotAccess;
 import net.minecraft.world.inventory.SlotRanges;
 import net.minecraft.world.item.ItemStack;
@@ -68,7 +65,7 @@ public LivingEntityScriptObject() {
     public void toTable(LivingEntity obj, LuaTableBuilder builder, LuaScript script) {
         applyInheritanceToTable(obj, builder, script);
 
-        builder.add(FUNC_GET_HEALTH, args -> obj.getHealth());
+        builder.add(FUNC_GET_HEALTH, args -> LuaValue.valueOf(obj.getHealth()));
         builder.add(FUNC_HURT, args -> {
             Identifier damageTypeId = Identifier.parse(args.nextString());
             float amount = args.nextFloat();