need to fix require

Author: diamonddevv

README.md

@@ -25,10 +25,10 @@ this mod uses the FiguraMC implementation of Lua.
   - [x] entity
   - [x] block
   - [x] item
-  - [ ] world/server
   - [x] math (vectors, mainly)
 - other
   - [x] autogen documentation (actively working on)
+  - [ ] support `require` function (and therefore libraries)
 
 ## what im not worried about right now
 - scripting language independence; im just focusing on lua

autodocs/autodoc.lua

@@ -2,7 +2,7 @@
 
 --#region Information
 -- GENERATED AUTODOC
--- Generated: 2026-01-29T15:36:57.191277400
+-- Generated: 2026-01-29T20:35:30.443182800
 -- Luafy Version: 2.0.0
 -- Format: Lua LS library file
 --#endregion
@@ -148,6 +148,10 @@ function Entity.get_name() end
 ---@return string
 function Entity.get_type_id() end
 
+--- Gets the the entity type that this entity is.
+---@return EntityType
+function Entity.get_type() end
+
 --- Returns true if this entity is a LivingEntity.
 ---@return boolean
 function Entity.is_living() end
@@ -157,11 +161,11 @@ function Entity.is_living() end
 function Entity.as_living() end
 
 --- Returns true if this entity is a PlayerEntity.
----@return LivingEntity
+---@return boolean
 function Entity.is_player() end
 
 --- Return this entity as a PlayerEntity.
----@return LivingEntity
+---@return Player
 function Entity.as_player() end
 
 --- Execute a commmand as this entity.
@@ -218,7 +222,7 @@ function Player.tell(msg) end
 --- Prints a text component to this player's chat.
 ---@param msg TextComponent Component to display.
 ---@return nil
-function Player.tell(msg) end
+function Player.tell_component(msg) end
 
 --- Gives this player this stack.
 ---@param stack ItemStack Stack to give.
@@ -255,10 +259,14 @@ function EntityType.is_fire_immune() end
 
 --- Spawns a new instance of this entity.
 ---@param pos Vec3d Position to spawn at.
----@param dimension string Id of dimension to spawn in.
+---@param dimension string | nil Id of dimension to spawn in.
 ---@return Entity
 function EntityType.spawn(pos, dimension) end
 
+--- Returns the id of this entity type.
+---@return string
+function EntityType.get_id() end
+
 
 --- An item stack.
 ---@class ItemStack
@@ -352,15 +360,15 @@ minecraft = {}
 ---@return string
 function minecraft.get_version() end
 
---- Prints an unformatted line to the server chat, visible to all players. (similar to /tellraw). Also prints to the console.
+--- Prints an unformatted line to the command source.
 ---@param message string Message to be printed.
 ---@return nil
-function minecraft.print(message) end
+function minecraft.feedback(message) end
 
---- Prints a text component to the server chat, visible to all players. (similar to /tellraw). Also prints the raw string to the console.
+--- Prints a text component to the command source.
 ---@param message string Message to be printed.
 ---@return nil
-function minecraft.print_component(message) end
+function minecraft.feedback_component(message) end
 
 --- Executes the given command from the server command source. Returns the result of the command.
 ---@param command string Command to be executed.
@@ -511,6 +519,19 @@ function text.atlas_sprite(atlas, sprite) end
 ---@return TextComponent
 function text.compound(elements) end
 
+nbtstorage = {}
+
+--- Reads abstract NBT data from storage.
+---@param id string Storage id to read.
+---@return table
+function nbtstorage.read(id) end
+
+--- Writes abstract NBT data to storage.
+---@param id string Storage id to write to.
+---@param table table Data to write.
+---@return nil
+function nbtstorage.write(id, table) end
+
 --#endregion
 
 --#region Script Event

build.gradle

@@ -32,7 +32,6 @@ loom {
 			sourceSet sourceSets.client
 		}
 	}
-
 }
 
 dependencies {

src/main/java/dev/diamond/luafy/LuafyCommand.java

@@ -219,6 +219,7 @@ private static class ScriptIdsSuggestionProvider implements SuggestionProvider<C
         public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> ctx, SuggestionsBuilder builder) throws CommandSyntaxException {
 
             for (String id : Luafy.SCRIPT_MANAGER.getScriptIdStrings()) {
+                if (Luafy.SCRIPT_MANAGER.get(Identifier.parse(id)).onLibPath) continue; // dont suggest libraries
                 builder.suggest(id);
             }
 

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

@@ -190,5 +190,13 @@ public <T, X> T nextMap(T def, Function<LuaValue, X> getter, Function<X, T> conv
             return map(next(), def, getter, convert);
         }
 
+        public <T, X> T map(LuaValue value, Function<LuaValue, X> getter, Function<X, T> convert) {
+            return convert.apply(getter.apply(value));
+        }
+
+        public <T, X> T nextMap(Function<LuaValue, X> getter, Function<X, T> convert) {
+            return map(next(), getter, convert);
+        }
+
     }
 }

src/main/java/dev/diamond/luafy/mixin/CommandSourceStackAccessor.java

@@ -0,0 +1,12 @@
+package dev.diamond.luafy.mixin;
+
+import net.minecraft.commands.CommandSource;
+import net.minecraft.commands.CommandSourceStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(CommandSourceStack.class)
+public interface CommandSourceStackAccessor {
+    @Accessor("source")
+    CommandSource accessCommandSource();
+}

src/main/java/dev/diamond/luafy/registry/ScriptPlugins.java

@@ -33,6 +33,7 @@ public class ScriptPlugins {
     public static ApiScriptPlugin<MathApi> MATH = new ApiScriptPlugin<>(MathApi::new);
     public static ApiScriptPlugin<FabricApi> FABRIC = new ApiScriptPlugin<>(FabricApi::new);
     public static ApiScriptPlugin<TextApi> TEXT = new ApiScriptPlugin<>(TextApi::new);
+    public static ApiScriptPlugin<NbtStorageApi> NBT_STORAGE = new ApiScriptPlugin<>(NbtStorageApi::new);
 
     public static void registerAll() {
         Registry.register(LuafyRegistries.SCRIPT_PLUGINS, Luafy.id_luaj("jse_base"), LUAJ_JSE_BASE);
@@ -53,5 +54,6 @@ public static void registerAll() {
         Registry.register(LuafyRegistries.SCRIPT_PLUGINS, Luafy.id("math"), MATH);
         Registry.register(LuafyRegistries.SCRIPT_PLUGINS, Luafy.id("fabric"), FABRIC);
         Registry.register(LuafyRegistries.SCRIPT_PLUGINS, Luafy.id("text"), TEXT);
+        Registry.register(LuafyRegistries.SCRIPT_PLUGINS, Luafy.id("nbt_storage"), NBT_STORAGE);
     }
 }

src/main/java/dev/diamond/luafy/resource/ScriptResourceLoader.java

@@ -13,6 +13,7 @@
 public class ScriptResourceLoader implements SimpleSynchronousResourceReloadListener {
 
     private static final String PATH = "luafy/scripts";
+    private static final String LIBRARY_PATH = "lib";
     private static final String EXT = ".lua";
 
     @Override
@@ -33,11 +34,11 @@ public void onResourceManagerReload(ResourceManager manager) {
                     String s = new String(bytes, StandardCharsets.UTF_8);
 
 
-                    String fixedPath = loc.getPath().substring(PATH.length() + 1, loc.getPath().length() - EXT.length());
-                    Identifier id = Identifier.fromNamespaceAndPath(loc.getNamespace(), fixedPath);
+                    Identifier id = idFromBadPath(loc.getPath(), loc.getNamespace());
+
 
                     // get script
-                    Luafy.SCRIPT_MANAGER.loadScript(id, new LuaScript(s));
+                    Luafy.SCRIPT_MANAGER.loadScript(id, new LuaScript(s), id.getPath().startsWith(LIBRARY_PATH + "/"));
                     count += 1;
 
                 } catch (Exception e) {
@@ -48,4 +49,9 @@ public void onResourceManagerReload(ResourceManager manager) {
 
         Luafy.LOGGER.info("Loaded {} scripts", count);
     }
+
+    public static Identifier idFromBadPath(String badPath, String namespace) {
+        String fixedPath = badPath.substring(PATH.length() + 1, badPath.length() - EXT.length());
+        return Identifier.fromNamespaceAndPath(namespace, fixedPath);
+    }
 }

src/main/java/dev/diamond/luafy/script/LuaScript.java

@@ -2,18 +2,24 @@
 
 import dev.diamond.luafy.Luafy;
 import dev.diamond.luafy.lua.LuaTableBuilder;
+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 net.minecraft.core.Registry;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.Identifier;
 import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.luaj.vm2.Globals;
-import org.luaj.vm2.LuaError;
-import org.luaj.vm2.LuaTable;
-import org.luaj.vm2.LuaValue;
+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;
 import net.minecraft.commands.CommandSourceStack;
@@ -23,6 +29,8 @@ public class LuaScript {
     public static final String CONTEXT_KEY = "ctx";
 
     private final Globals globals;
+    private final String source;
+    public boolean onLibPath;
     private LuaValue script;
     private String compilationError;
     private CommandSourceStack src;
@@ -31,6 +39,8 @@ public class LuaScript {
 
     public LuaScript(String source) {
         this.globals = new Globals();
+        this.onLibPath = false;
+        this.source = source;
         injectSources();
 
         this.unserializableDataReferences = new HashMap<>();
@@ -86,11 +96,22 @@ public void setSource(@NotNull CommandSourceStack src) {
         this.src = src.withSuppressedOutput();
     }
 
+    public void sendSourceMessage(Component c) {
+        ServerPlayer serverPlayer = this.src.getPlayer();
+        if (serverPlayer != null) {
+            serverPlayer.sendSystemMessage(c);
+        } else {
+            ((CommandSourceStackAccessor)this.src).accessCommandSource().sendSystemMessage(c);
+        }
+    }
+
     private void injectSources() {
         for (ScriptPlugin plugin : LuafyRegistries.SCRIPT_PLUGINS) {
             plugin.apply(this);
         }
 
+        modifyRequire(this);
+
         for (ScriptEnum<?> e : LuafyRegistries.SCRIPT_ENUMS) {
             this.globals.set(e.getArgtypeString(), LuaTableBuilder.provide(b -> {
                 for (var key : e.getEnumKeys()) b.add(key, key);
@@ -116,5 +137,13 @@ private ScriptExecutionResult executor(@NotNull CommandSourceStack src, @Nullabl
         }
     }
 
+    private static void modifyRequire(LuaScript script) {
+        script.globals.finder = s -> {
+            String namespace = ""; // todo get somehow
+            Identifier id = ScriptResourceLoader.idFromBadPath(s, namespace);
+            return new ByteArrayInputStream(Luafy.SCRIPT_MANAGER.get(id).source.getBytes(StandardCharsets.UTF_8));
+        };
+    }
+
 
 }

src/main/java/dev/diamond/luafy/script/ScriptManager.java

@@ -25,7 +25,8 @@ public Future<ScriptExecutionResult> submitExecution(Callable<ScriptExecutionRes
         return this.scriptExecutor.submit(scriptExecution);
     }
 
-    public void loadScript(Identifier id, LuaScript script) {
+    public void loadScript(Identifier id, LuaScript script, boolean libraryPath) {
+        script.onLibPath = libraryPath;
         this.scripts.put(id, script);
     }