hacked up fixed require function that works now

Author: diamonddevv

README.md

@@ -28,7 +28,7 @@ this mod uses the FiguraMC implementation of Lua.
   - [x] math (vectors, mainly)
 - other
   - [x] autogen documentation (actively working on)
-  - [ ] support `require` function (and therefore libraries)
+  - [x] 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-29T20:35:30.443182800
+-- Generated: 2026-01-30T10:10:00.200472100
 -- Luafy Version: 2.0.0
 -- Format: Lua LS library file
 --#endregion

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

@@ -12,9 +12,9 @@
 
 public class ScriptResourceLoader implements SimpleSynchronousResourceReloadListener {
 
-    private static final String PATH = "luafy/scripts";
+    public static final String PATH = "luafy/scripts";
     private static final String LIBRARY_PATH = "lib";
-    private static final String EXT = ".lua";
+    public static final String EXT = ".lua";
 
     @Override
     public @NotNull Identifier getFabricId() {
@@ -34,7 +34,8 @@ public void onResourceManagerReload(ResourceManager manager) {
                     String s = new String(bytes, StandardCharsets.UTF_8);
 
 
-                    Identifier id = idFromBadPath(loc.getPath(), loc.getNamespace());
+                    String fixedPath = loc.getPath().substring(PATH.length() + 1, loc.getPath().length() - EXT.length());
+                    Identifier id = Identifier.fromNamespaceAndPath(loc.getNamespace(), fixedPath);
 
 
                     // get script
@@ -49,9 +50,4 @@ 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

@@ -22,7 +22,11 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.concurrent.Future;
+import java.util.regex.Matcher;
+
 import net.minecraft.commands.CommandSourceStack;
+import org.luaj.vm2.lib.BaseLib;
+import org.luaj.vm2.lib.VarArgFunction;
 
 public class LuaScript {
 
@@ -138,10 +142,36 @@ private ScriptExecutionResult executor(@NotNull CommandSourceStack src, @Nullabl
     }
 
     private static void modifyRequire(LuaScript script) {
+        var oldFunc = script.globals.get("require");
+
+        script.globals.set("require", new VarArgFunction() {
+            @Override
+            public Varargs invoke(Varargs args) {
+                String out;
+                String path = args.arg1().tojstring();
+                if (args.narg() == 2) {
+                    String namespace = args.arg(2).tojstring();
+                    out = namespace + ":" + path;
+                } else {
+                    out = path;
+                }
+
+                return oldFunc.call(LuaValue.valueOf(out));
+            }
+        });
+
         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));
+            if (s.contains(":")) {
+                String[] splits = s.split(":");
+                String namespace = splits[0];
+                String path = splits[1];
+                String fixedPath = path.substring(0, path.length() - ScriptResourceLoader.EXT.length());
+                fixedPath = fixedPath.replaceAll(Matcher.quoteReplacement("\\"), "/");
+                Identifier id = Identifier.fromNamespaceAndPath(namespace, fixedPath);
+                return new ByteArrayInputStream(Luafy.SCRIPT_MANAGER.get(id).source.getBytes(StandardCharsets.UTF_8));
+            } else {
+                return BaseLib.class.getResourceAsStream(s.startsWith("/") ? s : "/" + s);
+            }
         };
     }