From bca4841bef9fa68db71c834067fe6e3e0ad4f744 Mon Sep 17 00:00:00 2001 From: UnlegitDqrk Date: Tue, 3 Mar 2026 12:30:16 +0100 Subject: [PATCH] Import fix --- .../security/LuaSecurityManager.java | 2 +- .../luascript/tables/AudioTable.java | 4 +- .../luascript/tables/ClipboardTable.java | 2 +- .../luascript/tables/CssTable.java | 2 +- .../luascript/tables/DomTable.java | 2 +- .../luascript/tables/EventsTable.java | 6 +-- .../luascript/tables/GeometryTable.java | 8 ++-- .../luascript/tables/ImageTable.java | 4 +- .../luascript/tables/ObserversTable.java | 2 +- .../luascript/tables/SchedulerTable.java | 6 +-- .../luascript/tables/SelectorTable.java | 4 +- .../luascript/tables/StorageTable.java | 2 +- .../luascript/tables/UiTable.java | 38 +++++++++---------- .../luascript/tables/UtilTable.java | 2 +- .../luascript/tables/VideoTable.java | 4 +- .../tables/console/ConsoleLogTable.java | 2 +- .../console/ConsoleStacktraceTable.java | 2 +- .../luascript/utils/LuaGlobalsFactory.java | 4 +- 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/main/java/org/openautonomousconnection/luascript/security/LuaSecurityManager.java b/src/main/java/org/openautonomousconnection/luascript/security/LuaSecurityManager.java index fbb5c7e..ae4fe25 100644 --- a/src/main/java/org/openautonomousconnection/luascript/security/LuaSecurityManager.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/AudioTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/AudioTable.java index 0dcaefe..be0e481 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/AudioTable.java +++ b/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.lib.ZeroArgFunction; +import org.luaj.vm2.libs.OneArgFunction; +import org.luaj.vm2.libs.ZeroArgFunction; import org.openautonomousconnection.luascript.hosts.AudioHost; import org.openautonomousconnection.luascript.hosts.HostServices; import org.openautonomousconnection.luascript.utils.ScriptTable; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/ClipboardTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/ClipboardTable.java index e1a113c..12766ec 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/ClipboardTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/CssTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/CssTable.java index 162eafb..ef64c46 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/CssTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/DomTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/DomTable.java index 1c2364f..f658413 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/DomTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/EventsTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/EventsTable.java index d75ad1b..fb89f5b 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/EventsTable.java +++ b/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.lib.TwoArgFunction; +import org.luaj.vm2.libs.OneArgFunction; +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(); diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/GeometryTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/GeometryTable.java index e30ac1c..59e9124 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/GeometryTable.java +++ b/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.lib.TwoArgFunction; -import org.luaj.vm2.lib.VarArgFunction; +import org.luaj.vm2.libs.OneArgFunction; +import org.luaj.vm2.libs.TwoArgFunction; +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()); diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/ImageTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/ImageTable.java index 7ed83d3..3a10dcc 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/ImageTable.java +++ b/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.lib.ZeroArgFunction; +import org.luaj.vm2.libs.VarArgFunction; +import org.luaj.vm2.libs.ZeroArgFunction; import org.openautonomousconnection.luascript.hosts.HostServices; import org.openautonomousconnection.luascript.hosts.ImageHost; import org.openautonomousconnection.luascript.utils.ScriptTable; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/ObserversTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/ObserversTable.java index 3491390..c495036 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/ObserversTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/SchedulerTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/SchedulerTable.java index 5439b36..869f4b3 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/SchedulerTable.java +++ b/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.lib.TwoArgFunction; -import org.luaj.vm2.lib.VarArgFunction; +import org.luaj.vm2.libs.OneArgFunction; +import org.luaj.vm2.libs.TwoArgFunction; +import org.luaj.vm2.libs.VarArgFunction; import org.luaj.vm2.Varargs; import org.openautonomousconnection.luascript.hosts.HostServices; import org.openautonomousconnection.luascript.hosts.SchedulerHost; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/SelectorTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/SelectorTable.java index bc7b9f2..62f29f4 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/SelectorTable.java +++ b/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.lib.OneArgFunction; +import org.luaj.vm2.libs.TwoArgFunction; +import org.luaj.vm2.libs.OneArgFunction; import org.openautonomousconnection.luascript.hosts.HostServices; import org.openautonomousconnection.luascript.hosts.SelectorHost; import org.openautonomousconnection.luascript.utils.ScriptTable; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/StorageTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/StorageTable.java index e4efa01..0d11cab 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/StorageTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/UiTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/UiTable.java index 2cc7d85..51fc6c6 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/UiTable.java +++ b/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()); diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/UtilTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/UtilTable.java index 43e51e7..013c97c 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/UtilTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/VideoTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/VideoTable.java index ad09aec..3def165 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/VideoTable.java +++ b/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.lib.ZeroArgFunction; +import org.luaj.vm2.libs.VarArgFunction; +import org.luaj.vm2.libs.ZeroArgFunction; import org.openautonomousconnection.luascript.hosts.HostServices; import org.openautonomousconnection.luascript.hosts.VideoHost; import org.openautonomousconnection.luascript.utils.ScriptTable; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleLogTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleLogTable.java index a8f6a38..ab6745c 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleLogTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleStacktraceTable.java b/src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleStacktraceTable.java index 8f6d881..26d9e06 100644 --- a/src/main/java/org/openautonomousconnection/luascript/tables/console/ConsoleStacktraceTable.java +++ b/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; diff --git a/src/main/java/org/openautonomousconnection/luascript/utils/LuaGlobalsFactory.java b/src/main/java/org/openautonomousconnection/luascript/utils/LuaGlobalsFactory.java index 2c44049..d274e49 100644 --- a/src/main/java/org/openautonomousconnection/luascript/utils/LuaGlobalsFactory.java +++ b/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.lib.jse.JsePlatform; +import org.luaj.vm2.libs.DebugLib; +import org.luaj.vm2.libs.jse.JsePlatform; import java.util.Objects; import java.util.function.Consumer;