move argtype too

diamonddevv · diamonddevv · commit 50b761fc50ba · 2026-02-05T11:13:42.000Z
diff --git a/src/main/java/dev/diamond/luafy/autodoc/ArgDocInfo.java b/src/main/java/dev/diamond/luafy/autodoc/ArgDocInfo.java
@@ -1,4 +1,6 @@
 package dev.diamond.luafy.autodoc;
 
+import dev.diamond.luafy.script.type.Argtype;
+
 public record ArgDocInfo(String argName, Argtype argType, String argDesc) {
 }
diff --git a/src/main/java/dev/diamond/luafy/autodoc/ArglistBuilder.java b/src/main/java/dev/diamond/luafy/autodoc/ArglistBuilder.java
@@ -1,5 +1,7 @@
 package dev.diamond.luafy.autodoc;
 
+import dev.diamond.luafy.script.type.Argtype;
+
 import java.util.ArrayList;
 
 public class ArglistBuilder {
diff --git a/src/main/java/dev/diamond/luafy/autodoc/FunctionDocInfo.java b/src/main/java/dev/diamond/luafy/autodoc/FunctionDocInfo.java
@@ -1,5 +1,7 @@
 package dev.diamond.luafy.autodoc;
 
+import dev.diamond.luafy.script.type.Argtype;
+
 import java.util.ArrayList;
 
 public record FunctionDocInfo(String funcName, String funcDesc, ArrayList<ArgDocInfo> args,
diff --git a/src/main/java/dev/diamond/luafy/autodoc/FunctionListBuilder.java b/src/main/java/dev/diamond/luafy/autodoc/FunctionListBuilder.java
@@ -1,6 +1,7 @@
 package dev.diamond.luafy.autodoc;
 
 import dev.diamond.luafy.lua.ScriptFunction;
+import dev.diamond.luafy.script.type.Argtype;
 import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.Varargs;
diff --git a/src/main/java/dev/diamond/luafy/autodoc/generator/AbstractAutodocGenerator.java b/src/main/java/dev/diamond/luafy/autodoc/generator/AbstractAutodocGenerator.java
@@ -2,23 +2,19 @@
 
 import dev.diamond.luafy.Luafy;
 import dev.diamond.luafy.autodoc.ArglistBuilder;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.autodoc.FunctionDocInfo;
-import dev.diamond.luafy.autodoc.FunctionListBuilder;
 import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.script.ApiScriptPlugin;
-import dev.diamond.luafy.script.LuaScript;
-import dev.diamond.luafy.script.api.AbstractScriptApi;
-import dev.diamond.luafy.script.enumeration.ScriptEnum;
+import dev.diamond.luafy.script.type.enumeration.ScriptEnum;
 import dev.diamond.luafy.script.event.ScriptEvent;
-import dev.diamond.luafy.script.object.AbstractScriptObject;
+import dev.diamond.luafy.script.type.object.AbstractScriptObject;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.resources.Identifier;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.ArrayList;
 
 public abstract class AbstractAutodocGenerator {
     public final String fileExtension;
diff --git a/src/main/java/dev/diamond/luafy/command/HotCommand.java b/src/main/java/dev/diamond/luafy/command/HotCommand.java
@@ -3,13 +3,12 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.builder.ArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.JsonOps;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.diamond.luafy.Luafy;
-import dev.diamond.luafy.autodoc.Argtype;
+import dev.diamond.luafy.script.type.Argtype;
 import dev.diamond.luafy.lua.LuaTableBuilder;
 import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.script.LuaScript;
@@ -22,12 +21,9 @@
 import net.minecraft.resources.Identifier;
 import org.luaj.vm2.LuaValue;
 
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/dev/diamond/luafy/lua/LuaTableBuilder.java b/src/main/java/dev/diamond/luafy/lua/LuaTableBuilder.java
@@ -1,7 +1,7 @@
 package dev.diamond.luafy.lua;
 
 import dev.diamond.luafy.script.LuaScript;
-import dev.diamond.luafy.script.object.AbstractScriptObject;
+import dev.diamond.luafy.script.type.object.AbstractScriptObject;
 import net.minecraft.nbt.*;
 import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaTable;
diff --git a/src/main/java/dev/diamond/luafy/lua/ScriptFunction.java b/src/main/java/dev/diamond/luafy/lua/ScriptFunction.java
@@ -1,9 +1,8 @@
 package dev.diamond.luafy.lua;
 
-import com.mojang.datafixers.util.Either;
 import dev.diamond.luafy.script.LuaScript;
-import dev.diamond.luafy.script.enumeration.ScriptEnum;
-import dev.diamond.luafy.script.object.AbstractScriptObject;
+import dev.diamond.luafy.script.type.enumeration.ScriptEnum;
+import dev.diamond.luafy.script.type.object.AbstractScriptObject;
 import net.minecraft.commands.CommandSourceStack;
 import org.luaj.vm2.*;
 
diff --git a/src/main/java/dev/diamond/luafy/registry/LuafyRegistries.java b/src/main/java/dev/diamond/luafy/registry/LuafyRegistries.java
@@ -1,16 +1,15 @@
 package dev.diamond.luafy.registry;
 
 import dev.diamond.luafy.Luafy;
-import dev.diamond.luafy.autodoc.Argtype;
+import dev.diamond.luafy.script.type.Argtype;
 import dev.diamond.luafy.autodoc.generator.AbstractAutodocGenerator;
-import dev.diamond.luafy.script.enumeration.ScriptEnum;
+import dev.diamond.luafy.script.type.enumeration.ScriptEnum;
 import dev.diamond.luafy.script.event.ScriptEvent;
 import dev.diamond.luafy.script.ScriptPlugin;
-import dev.diamond.luafy.script.object.AbstractScriptObject;
+import dev.diamond.luafy.script.type.object.AbstractScriptObject;
 import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
-import org.luaj.vm2.LuaValue;
 
 public class LuafyRegistries {
 
diff --git a/src/main/java/dev/diamond/luafy/registry/ScriptArgtypes.java b/src/main/java/dev/diamond/luafy/registry/ScriptArgtypes.java
@@ -1,7 +1,7 @@
 package dev.diamond.luafy.registry;
 
 import dev.diamond.luafy.Luafy;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.Identifier;
 
diff --git a/src/main/java/dev/diamond/luafy/registry/ScriptEnums.java b/src/main/java/dev/diamond/luafy/registry/ScriptEnums.java
@@ -1,10 +1,10 @@
 package dev.diamond.luafy.registry;
 
 import dev.diamond.luafy.Luafy;
-import dev.diamond.luafy.script.enumeration.Note;
-import dev.diamond.luafy.script.enumeration.Instrument;
-import dev.diamond.luafy.script.enumeration.ScriptEnum;
-import dev.diamond.luafy.script.enumeration.TextComponentColor;
+import dev.diamond.luafy.script.type.enumeration.Note;
+import dev.diamond.luafy.script.type.enumeration.Instrument;
+import dev.diamond.luafy.script.type.enumeration.ScriptEnum;
+import dev.diamond.luafy.script.type.enumeration.TextComponentColor;
 import net.minecraft.core.Registry;
 
 public class ScriptEnums {
diff --git a/src/main/java/dev/diamond/luafy/registry/ScriptEvents.java b/src/main/java/dev/diamond/luafy/registry/ScriptEvents.java
@@ -1,16 +1,14 @@
 package dev.diamond.luafy.registry;
 
 import dev.diamond.luafy.Luafy;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.script.event.ScriptEvent;
 import net.fabricmc.fabric.api.entity.event.v1.ServerLivingEntityEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.minecraft.core.Registry;
-import net.minecraft.core.registries.Registries;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
-import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 
 
diff --git a/src/main/java/dev/diamond/luafy/registry/ScriptObjects.java b/src/main/java/dev/diamond/luafy/registry/ScriptObjects.java
@@ -1,15 +1,18 @@
 package dev.diamond.luafy.registry;
 
 import dev.diamond.luafy.Luafy;
-import dev.diamond.luafy.script.object.*;
-import dev.diamond.luafy.script.object.game.registry.RegistryBlockScriptObject;
-import dev.diamond.luafy.script.object.game.registry.RegistryEntityTypeScriptObject;
-import dev.diamond.luafy.script.object.game.registry.RegistryItemScriptObject;
-import dev.diamond.luafy.script.object.game.ItemStackScriptObject;
-import dev.diamond.luafy.script.object.game.TextComponentScriptObject;
-import dev.diamond.luafy.script.object.game.entity.EntityScriptObject;
-import dev.diamond.luafy.script.object.game.entity.LivingEntityScriptObject;
-import dev.diamond.luafy.script.object.game.entity.PlayerScriptObject;
+import dev.diamond.luafy.script.type.object.AbstractScriptObject;
+import dev.diamond.luafy.script.type.object.ModScriptObject;
+import dev.diamond.luafy.script.type.object.ScriptResultScriptObject;
+import dev.diamond.luafy.script.type.object.Vec3dScriptObject;
+import dev.diamond.luafy.script.type.object.game.registry.RegistryBlockScriptObject;
+import dev.diamond.luafy.script.type.object.game.registry.RegistryEntityTypeScriptObject;
+import dev.diamond.luafy.script.type.object.game.registry.RegistryItemScriptObject;
+import dev.diamond.luafy.script.type.object.game.ItemStackScriptObject;
+import dev.diamond.luafy.script.type.object.game.TextComponentScriptObject;
+import dev.diamond.luafy.script.type.object.game.entity.EntityScriptObject;
+import dev.diamond.luafy.script.type.object.game.entity.LivingEntityScriptObject;
+import dev.diamond.luafy.script.type.object.game.entity.PlayerScriptObject;
 import net.minecraft.core.Registry;
 
 public class ScriptObjects {
diff --git a/src/main/java/dev/diamond/luafy/script/LuaScript.java b/src/main/java/dev/diamond/luafy/script/LuaScript.java
@@ -5,7 +5,7 @@
 import dev.diamond.luafy.mixin.CommandSourceStackAccessor;
 import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.resource.ScriptResourceLoader;
-import dev.diamond.luafy.script.enumeration.ScriptEnum;
+import dev.diamond.luafy.script.type.enumeration.ScriptEnum;
 import net.minecraft.core.Registry;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
@@ -15,10 +15,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.luaj.vm2.*;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.StringReader;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.concurrent.Future;
diff --git a/src/main/java/dev/diamond/luafy/script/api/FabricApi.java b/src/main/java/dev/diamond/luafy/script/api/FabricApi.java
@@ -1,9 +1,8 @@
 package dev.diamond.luafy.script.api;
 
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.autodoc.ScriptApiBuilder;
 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 net.fabricmc.loader.api.FabricLoader;
diff --git a/src/main/java/dev/diamond/luafy/script/api/LuafyApi.java b/src/main/java/dev/diamond/luafy/script/api/LuafyApi.java
@@ -7,14 +7,12 @@
 import dev.diamond.luafy.registry.ScriptObjects;
 import dev.diamond.luafy.script.LuaScript;
 import net.minecraft.resources.Identifier;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.lua.MetamethodImpl;
 import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 
-import java.util.function.Function;
-
 public class LuafyApi extends AbstractScriptApi {
     public LuafyApi(LuaScript script) {
         super("luafy", script);
diff --git a/src/main/java/dev/diamond/luafy/script/api/MathApi.java b/src/main/java/dev/diamond/luafy/script/api/MathApi.java
@@ -2,7 +2,7 @@
 
 import dev.diamond.luafy.autodoc.ScriptApiBuilder;
 import dev.diamond.luafy.registry.ScriptObjects;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.script.LuaScript;
 import net.minecraft.world.phys.Vec3;
 import dev.diamond.luafy.lua.LuaTableBuilder;
diff --git a/src/main/java/dev/diamond/luafy/script/api/MinecraftApi.java b/src/main/java/dev/diamond/luafy/script/api/MinecraftApi.java
@@ -3,14 +3,14 @@
 import com.mojang.brigadier.ParseResults;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.autodoc.ScriptApiBuilder;
 import dev.diamond.luafy.registry.ScriptEnums;
 import dev.diamond.luafy.registry.ScriptObjects;
 import dev.diamond.luafy.script.LuaScript;
 import dev.diamond.luafy.lua.LuaTableBuilder;
-import dev.diamond.luafy.script.enumeration.Instrument;
-import dev.diamond.luafy.script.enumeration.Note;
+import dev.diamond.luafy.script.type.enumeration.Instrument;
+import dev.diamond.luafy.script.type.enumeration.Note;
 import net.minecraft.SharedConstants;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.EntityArgument;
diff --git a/src/main/java/dev/diamond/luafy/script/api/NbtStorageApi.java b/src/main/java/dev/diamond/luafy/script/api/NbtStorageApi.java
@@ -1,6 +1,6 @@
 package dev.diamond.luafy.script.api;
 
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.autodoc.ScriptApiBuilder;
 import dev.diamond.luafy.lua.LuaTableBuilder;
 import dev.diamond.luafy.script.LuaScript;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`package dev.diamond.luafy.autodoc;`
`2`	`2`
	`3`	`+import dev.diamond.luafy.script.type.Argtype;`
	`4`	`+`
`3`	`5`	`public record ArgDocInfo(String argName, Argtype argType, String argDesc) {`
`4`	`6`	`}`