Import fix

src/main/java/org/openautonomousconnection/luascript/security/LuaSecurityManager.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.security;
 
 import org.luaj.vm2.*;
-import org.luaj.vm2.lib.VarArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
 import org.openautonomousconnection.luascript.utils.LuaGlobalsFactory;
 
 import java.util.Objects;

src/main/java/org/openautonomousconnection/luascript/tables/AudioTable.java

@@ -1,8 +1,8 @@
 package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 import org.openautonomousconnection.luascript.hosts.AudioHost;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/ClipboardTable.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 import org.openautonomousconnection.luascript.hosts.ClipboardHost;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/CssTable.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 import org.openautonomousconnection.luascript.events.JavaToLua;
 import org.openautonomousconnection.luascript.hosts.CssHost;
 import org.openautonomousconnection.luascript.hosts.HostServices;

src/main/java/org/openautonomousconnection/luascript/tables/DomTable.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.*;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 import org.openautonomousconnection.luascript.events.JavaToLua;
 import org.openautonomousconnection.luascript.hosts.DomHost;
 import org.openautonomousconnection.luascript.hosts.HostServices;

src/main/java/org/openautonomousconnection/luascript/tables/EventsTable.java

@@ -1,8 +1,8 @@
 package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
 import org.openautonomousconnection.luascript.events.LuaEventDispatcher;
 import org.openautonomousconnection.luascript.events.UiEventRegistry;
 import org.openautonomousconnection.luascript.hosts.EventHost;
@@ -27,7 +27,7 @@ public final class EventsTable extends ScriptTable {
     protected void define(HostServices services) {
         EventHost host = services.events().orElseThrow(() -> new IllegalStateException("EventHost not provided"));
 
-        table().set("on", new org.luaj.vm2.lib.ThreeArgFunction() {
+        table().set("on", new org.luaj.vm2.libs.ThreeArgFunction() {
             @Override
             public LuaValue call(LuaValue elementId, LuaValue eventName, LuaValue handlerPath) {
                 String id = elementId.checkjstring();

src/main/java/org/openautonomousconnection/luascript/tables/GeometryTable.java

@@ -2,9 +2,9 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
-import org.luaj.vm2.lib.VarArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
 import org.luaj.vm2.Varargs;
 import org.openautonomousconnection.luascript.events.JavaToLua;
 import org.openautonomousconnection.luascript.hosts.GeometryHost;
@@ -42,7 +42,7 @@ public final class GeometryTable extends ScriptTable {
             }
         });
 
-        table().set("viewport", new org.luaj.vm2.lib.ZeroArgFunction() {
+        table().set("viewport", new org.luaj.vm2.libs.ZeroArgFunction() {
             @Override
             public LuaValue call() {
                 return JavaToLua.coerce(host.getViewport());

src/main/java/org/openautonomousconnection/luascript/tables/ImageTable.java

@@ -2,8 +2,8 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.VarArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.ImageHost;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/ObserversTable.java

@@ -3,7 +3,7 @@ package org.openautonomousconnection.luascript.tables;
 import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 import org.openautonomousconnection.luascript.events.JavaToLua;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.ObserverHost;

src/main/java/org/openautonomousconnection/luascript/tables/SchedulerTable.java

@@ -2,9 +2,9 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaFunction;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
-import org.luaj.vm2.lib.VarArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
 import org.luaj.vm2.Varargs;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.SchedulerHost;

src/main/java/org/openautonomousconnection/luascript/tables/SelectorTable.java

@@ -2,8 +2,8 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.libs.TwoArgFunction;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.SelectorHost;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/StorageTable.java

@@ -2,7 +2,7 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.StorageHost;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/UiTable.java

@@ -2,7 +2,7 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.UiHost;
 import org.openautonomousconnection.luascript.utils.ScriptTable;
@@ -35,7 +35,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("prompt", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("prompt", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue msg, LuaValue def) {
                 String out = ui.prompt(
@@ -46,7 +46,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("setText", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("setText", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue text) {
                 ui.setText(id.checkjstring(), text.isnil() ? "" : text.tojstring());
@@ -62,7 +62,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("setHtml", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("setHtml", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue html) {
                 ui.setHtml(id.checkjstring(), html.isnil() ? "" : html.tojstring());
@@ -77,7 +77,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("setValue", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("setValue", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue value) {
                 ui.setValue(id.checkjstring(), value.isnil() ? "" : value.tojstring());
@@ -92,7 +92,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("setEnabled", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("setEnabled", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue enabled) {
                 ui.setEnabled(id.checkjstring(), enabled.toboolean());
@@ -100,7 +100,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("setVisible", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("setVisible", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue visible) {
                 ui.setVisible(id.checkjstring(), visible.toboolean());
@@ -108,7 +108,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("addClass", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("addClass", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue cls) {
                 ui.addClass(id.checkjstring(), cls.checkjstring());
@@ -116,7 +116,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("removeClass", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("removeClass", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue cls) {
                 ui.removeClass(id.checkjstring(), cls.checkjstring());
@@ -124,21 +124,21 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("toggleClass", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("toggleClass", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue cls) {
                 return LuaValue.valueOf(ui.toggleClass(id.checkjstring(), cls.checkjstring()));
             }
         });
 
-        table().set("hasClass", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("hasClass", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue cls) {
                 return LuaValue.valueOf(ui.hasClass(id.checkjstring(), cls.checkjstring()));
             }
         });
 
-        table().set("setStyle", new org.luaj.vm2.lib.ThreeArgFunction() {
+        table().set("setStyle", new org.luaj.vm2.libs.ThreeArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue prop, LuaValue value) {
                 ui.setStyle(id.checkjstring(), prop.checkjstring(), value.isnil() ? "" : value.tojstring());
@@ -146,14 +146,14 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("getStyle", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("getStyle", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue prop) {
                 return LuaValue.valueOf(ui.getStyle(id.checkjstring(), prop.checkjstring()));
             }
         });
 
-        table().set("setAttr", new org.luaj.vm2.lib.ThreeArgFunction() {
+        table().set("setAttr", new org.luaj.vm2.libs.ThreeArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue name, LuaValue value) {
                 ui.setAttribute(id.checkjstring(), name.checkjstring(), value.isnil() ? "" : value.tojstring());
@@ -161,7 +161,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("getAttr", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("getAttr", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue name) {
                 String v = ui.getAttribute(id.checkjstring(), name.checkjstring());
@@ -169,7 +169,7 @@ public final class UiTable extends ScriptTable {
             }
         });
 
-        table().set("removeAttr", new org.luaj.vm2.lib.TwoArgFunction() {
+        table().set("removeAttr", new org.luaj.vm2.libs.TwoArgFunction() {
             @Override
             public LuaValue call(LuaValue id, LuaValue name) {
                 ui.removeAttribute(id.checkjstring(), name.checkjstring());
@@ -202,13 +202,13 @@ public final class UiTable extends ScriptTable {
         });
 
         LuaTable viewport = new LuaTable();
-        viewport.set("width", new org.luaj.vm2.lib.ZeroArgFunction() {
+        viewport.set("width", new org.luaj.vm2.libs.ZeroArgFunction() {
             @Override
             public LuaValue call() {
                 return LuaValue.valueOf(ui.viewportWidth());
             }
         });
-        viewport.set("height", new org.luaj.vm2.lib.ZeroArgFunction() {
+        viewport.set("height", new org.luaj.vm2.libs.ZeroArgFunction() {
             @Override
             public LuaValue call() {
                 return LuaValue.valueOf(ui.viewportHeight());
@@ -216,7 +216,7 @@ public final class UiTable extends ScriptTable {
         });
         table().set("viewport", viewport);
 
-        table().set("now", new org.luaj.vm2.lib.ZeroArgFunction() {
+        table().set("now", new org.luaj.vm2.libs.ZeroArgFunction() {
             @Override
             public LuaValue call() {
                 return LuaValue.valueOf(ui.nowMillis());

src/main/java/org/openautonomousconnection/luascript/tables/UtilTable.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.*;
+import org.luaj.vm2.libs.*;
 import org.openautonomousconnection.luascript.events.JavaToLua;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.UtilHost;

src/main/java/org/openautonomousconnection/luascript/tables/VideoTable.java

@@ -2,8 +2,8 @@ package org.openautonomousconnection.luascript.tables;
 
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
-import org.luaj.vm2.lib.VarArgFunction;
+import org.luaj.vm2.libs.VarArgFunction;
-import org.luaj.vm2.lib.ZeroArgFunction;
+import org.luaj.vm2.libs.ZeroArgFunction;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.hosts.VideoHost;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleLogTable.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.tables.console;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
 import org.openautonomousconnection.luascript.hosts.ConsoleHost;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleStacktraceTable.java

@@ -1,7 +1,7 @@
 package org.openautonomousconnection.luascript.tables.console;
 
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.OneArgFunction;
+import org.luaj.vm2.libs.OneArgFunction;
 import org.openautonomousconnection.luascript.hosts.ConsoleHost;
 import org.openautonomousconnection.luascript.hosts.HostServices;
 import org.openautonomousconnection.luascript.utils.ScriptTable;

src/main/java/org/openautonomousconnection/luascript/utils/LuaGlobalsFactory.java

@@ -3,8 +3,8 @@ package org.openautonomousconnection.luascript.utils;
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
-import org.luaj.vm2.lib.DebugLib;
+import org.luaj.vm2.libs.DebugLib;
-import org.luaj.vm2.lib.jse.JsePlatform;
+import org.luaj.vm2.libs.jse.JsePlatform;
 
 import java.util.Objects;
 import java.util.function.Consumer;