Abstracted ScriptContainer & JaninoScript to IScriptUnit + global implementation

This commit is contained in:
bigguy345 committed 2026-01-13 18:25:28 +02:00
1 parent 1372127266
commit c3e032dcf2
21 files changed
+518 -220

No files matched your search

@@ -15,6 +15,7 @@ import noppes.npcs.NBTTags;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.data.IScriptHandler;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.items.ItemNpcTool;
import java.io.IOException;
@@ -221,9 +222,9 @@ public class PacketUtil {
compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
compound.setTag("ScriptConsole", NBTTags.NBTLongStringMap(data.getConsoleText()));
GuiDataPacket.sendGuiData(player, compound);
List<ScriptContainer> containers = data.getScripts();
List<IScriptUnit> containers = data.getScripts();
for (int i = 0; i < containers.size(); i++) {
ScriptContainer container = containers.get(i);
IScriptUnit container = containers.get(i);
NBTTagCompound tabCompound = new NBTTagCompound();
tabCompound.setInteger("Tab", i);
tabCompound.setTag("Script", container.writeToNBT(new NBTTagCompound()));
@@ -16,7 +16,7 @@ import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.NBTTags;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.config.ConfigScript;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.item.ScriptCustomItem;
@@ -72,10 +72,10 @@ public final class ItemScriptErrorPacket extends AbstractPacket {
if (requestedAction == Action.GET) {
TreeMap<Long, String> map = new TreeMap<>();
int tab = 0;
for (ScriptContainer script : ((ScriptCustomItem) iw).scripts) {
for (IScriptUnit script : ((ScriptCustomItem) iw).scripts) {
++tab;
for (Map.Entry<Long, String> longStringEntry : script.console.entrySet()) {
for (Map.Entry<Long, String> longStringEntry : script.getConsole().entrySet()) {
map.put(longStringEntry.getKey(), " tab " + tab + ":\n" + longStringEntry.getValue());
}
}
@@ -84,8 +84,8 @@ public final class ItemScriptErrorPacket extends AbstractPacket {
compound.setTag("ItemScriptConsole", NBTTags.NBTLongStringMap(map));
GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
} else {
for (ScriptContainer script : ((ScriptCustomItem) iw).scripts) {
script.console.clear();
for (IScriptUnit script : ((ScriptCustomItem) iw).scripts) {
script.clearConsole();
}
}
}