move types to a single package

Author: diamonddevv

src/main/java/dev/diamond/luafy/autodoc/generator/LuaLanguageServerAutodocGenerator.java

@@ -5,9 +5,9 @@
 import dev.diamond.luafy.autodoc.ScriptApiBuilder;
 import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.script.ApiScriptPlugin;
-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 java.time.LocalDateTime;

src/main/java/dev/diamond/luafy/script/api/TextApi.java

@@ -2,7 +2,7 @@
 
 import dev.diamond.luafy.autodoc.ScriptApiBuilder;
 import dev.diamond.luafy.script.LuaScript;
-import dev.diamond.luafy.script.object.game.TextComponentScriptObject;
+import dev.diamond.luafy.script.type.object.game.TextComponentScriptObject;
 
 public class TextApi extends AbstractScriptApi {
     public TextApi(LuaScript script) {

src/main/java/dev/diamond/luafy/script/api/WebApi.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.script.LuaScript;
 import org.luaj.vm2.LuaValue;

…a/dev/diamond/luafy/autodoc/Argtype.java …v/diamond/luafy/script/type/Argtype.javasrc/main/java/dev/diamond/luafy/autodoc/Argtype.java renamed to src/main/java/dev/diamond/luafy/script/type/Argtype.java src/main/java/dev/diamond/luafy/autodoc/Argtype.java renamed to src/main/java/dev/diamond/luafy/script/type/Argtype.java

@@ -1,4 +1,4 @@
-package dev.diamond.luafy.autodoc;
+package dev.diamond.luafy.script.type;
 
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;

…/dev/diamond/luafy/autodoc/Argtypes.java …/diamond/luafy/script/type/Argtypes.javasrc/main/java/dev/diamond/luafy/autodoc/Argtypes.java renamed to src/main/java/dev/diamond/luafy/script/type/Argtypes.java src/main/java/dev/diamond/luafy/autodoc/Argtypes.java renamed to src/main/java/dev/diamond/luafy/script/type/Argtypes.java

@@ -1,15 +1,11 @@
-package dev.diamond.luafy.autodoc;
+package dev.diamond.luafy.script.type;
 
 import com.mojang.brigadier.arguments.BoolArgumentType;
 import com.mojang.brigadier.arguments.FloatArgumentType;
 import com.mojang.brigadier.arguments.IntegerArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.datafixers.util.Either;
 import org.luaj.vm2.*;
 
-import java.util.List;
-import java.util.Optional;
-
 public class Argtypes {
 
     // since these are "primitives" they are in lowercase; this also ensures parity with LuaCATS and lua

…luafy/script/enumeration/Instrument.java …/script/type/enumeration/Instrument.javasrc/main/java/dev/diamond/luafy/script/enumeration/Instrument.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/Instrument.java src/main/java/dev/diamond/luafy/script/enumeration/Instrument.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/Instrument.java

@@ -1,4 +1,4 @@
-package dev.diamond.luafy.script.enumeration;
+package dev.diamond.luafy.script.type.enumeration;
 
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 

…amond/luafy/script/enumeration/Note.java …/luafy/script/type/enumeration/Note.javasrc/main/java/dev/diamond/luafy/script/enumeration/Note.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/Note.java src/main/java/dev/diamond/luafy/script/enumeration/Note.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/Note.java

@@ -1,4 +1,4 @@
-package dev.diamond.luafy.script.enumeration;
+package dev.diamond.luafy.script.type.enumeration;
 
 public enum Note {
     G_FLAT_LOW(0),

…luafy/script/enumeration/ScriptEnum.java …/script/type/enumeration/ScriptEnum.javasrc/main/java/dev/diamond/luafy/script/enumeration/ScriptEnum.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/ScriptEnum.java src/main/java/dev/diamond/luafy/script/enumeration/ScriptEnum.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/ScriptEnum.java

@@ -1,4 +1,4 @@
-package dev.diamond.luafy.script.enumeration;
+package dev.diamond.luafy.script.type.enumeration;
 
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.arguments.StringArgumentType;
@@ -7,14 +7,12 @@
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.suggestion.Suggestions;
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
-import dev.diamond.luafy.autodoc.Argtype;
-import dev.diamond.luafy.autodoc.Argtypes;
+import dev.diamond.luafy.script.type.Argtype;
+import dev.diamond.luafy.script.type.Argtypes;
 import dev.diamond.luafy.autodoc.SimpleAutodocumentable;
-import dev.diamond.luafy.registry.LuafyRegistries;
 import dev.diamond.luafy.script.LuaScript;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.resources.Identifier;
 import org.luaj.vm2.LuaString;
 
 import java.util.Arrays;

…ript/enumeration/TextComponentColor.java …type/enumeration/TextComponentColor.javasrc/main/java/dev/diamond/luafy/script/enumeration/TextComponentColor.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/TextComponentColor.java src/main/java/dev/diamond/luafy/script/enumeration/TextComponentColor.java renamed to src/main/java/dev/diamond/luafy/script/type/enumeration/TextComponentColor.java

@@ -1,4 +1,4 @@
-package dev.diamond.luafy.script.enumeration;
+package dev.diamond.luafy.script.type.enumeration;
 
 import net.minecraft.ChatFormatting;
 

…/script/object/AbstractScriptObject.java …pt/type/object/AbstractScriptObject.javasrc/main/java/dev/diamond/luafy/script/object/AbstractScriptObject.java renamed to src/main/java/dev/diamond/luafy/script/type/object/AbstractScriptObject.java src/main/java/dev/diamond/luafy/script/object/AbstractScriptObject.java renamed to src/main/java/dev/diamond/luafy/script/type/object/AbstractScriptObject.java

@@ -1,8 +1,8 @@
-package dev.diamond.luafy.script.object;
+package dev.diamond.luafy.script.type.object;
 
 import dev.diamond.luafy.Luafy;
 import dev.diamond.luafy.autodoc.ArglistBuilder;
-import dev.diamond.luafy.autodoc.Argtype;
+import dev.diamond.luafy.script.type.Argtype;
 import dev.diamond.luafy.autodoc.SimpleAutodocumentable;
 import dev.diamond.luafy.autodoc.FunctionDocInfo;
 import dev.diamond.luafy.registry.LuafyRegistries;