HUGE IScriptHandlerPacket merge.

All ScriptHandlers that send packets now directly define their data through the ScriptHandler class itself, NOT through their own GuiScript extended class.
This commit is contained in:
bigguy345 committed 2026-01-22 20:05:07 +02:00
1 parent 3f8373d76f
commit 50e9f1b3e5
18 files changed
+323 -443

No files matched your search

@@ -84,6 +84,10 @@ public final class BlockScriptPacket extends AbstractPacket {
NBTTagCompound compound = ((TileScripted) tile).getNBT(new NBTTagCompound());
compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
NBTTagCompound loadComplete = new NBTTagCompound();
loadComplete.setInteger("LoadComplete", 1);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, loadComplete);
} else {
if (!player.capabilities.isCreativeMode) {
return;
@@ -75,6 +75,10 @@ public final class ItemScriptPacket extends AbstractPacket {
NBTTagCompound compound = iw.getMCNbt();
compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
NBTTagCompound loadComplete = new NBTTagCompound();
loadComplete.setInteger("LoadComplete", 1);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, loadComplete);
} else {
if (!player.capabilities.isCreativeMode) {
return;
@@ -3,6 +3,7 @@ package noppes.npcs.blocks.tiles;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import kamkeel.npcs.network.packets.request.script.BlockScriptPacket;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.ITickable;
import net.minecraft.item.Item;
@@ -25,7 +26,9 @@ import noppes.npcs.api.IBlock;
import noppes.npcs.api.block.ITextPlane;
import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.data.IScriptHandlerPacket;
import noppes.npcs.controllers.data.IScriptBlockHandler;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.entity.data.DataTimers;
@@ -39,7 +42,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
public class TileScripted extends TileEntity implements IScriptBlockHandler {
public class TileScripted extends TileEntity implements IScriptBlockHandler, IScriptHandlerPacket {
public List<IScriptUnit> scripts = new ArrayList<>();
public Map<String, Object> tempData = new HashMap<>();
@@ -161,6 +164,41 @@ public class TileScripted extends TileEntity implements IScriptBlockHandler {
text6.setNBT(compound.getCompoundTag("Text6"));
}
@Override
public ScriptContext getContext() {
return ScriptContext.BLOCK;
}
@Override
public String getHookContext() {
return noppes.npcs.api.handler.IScriptHookHandler.CONTEXT_BLOCK;
}
@Override
public void requestData() {
BlockScriptPacket.Get(this.xCoord, this.yCoord, this.zCoord);
}
@Override
public void sendSavePacket(int index, int totalCount, NBTTagCompound nbt) {
BlockScriptPacket.Save(this.xCoord, this.yCoord, this.zCoord, nbt);
}
@Override
public GuiDataResult setGuiData(NBTTagCompound compound) {
if (compound.hasKey("LoadComplete")) {
return new GuiDataResult(GuiDataKind.LOAD_COMPLETE, -1);
}
setNBT(compound);
return new GuiDataResult(GuiDataKind.METADATA, -1);
}
@Override
public void sync() {
sendSavePacket(-1, getScripts().size(), getNBT(new NBTTagCompound()));
}
@Override
public void writeToNBT(NBTTagCompound compound) {
super.writeToNBT(compound);
@@ -21,7 +21,9 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ReportedException;
import net.minecraft.util.ResourceLocation;
@@ -120,9 +122,8 @@ import noppes.npcs.client.gui.roles.GuiNpcFollowerSetup;
import noppes.npcs.client.gui.roles.GuiNpcItemGiver;
import noppes.npcs.client.gui.roles.GuiNpcTraderSetup;
import noppes.npcs.client.gui.roles.GuiNpcTransporter;
import noppes.npcs.client.gui.script.GuiScriptBlock;
import noppes.npcs.client.gui.script.GuiScriptGlobal;
import noppes.npcs.client.gui.script.GuiScriptItem;
import noppes.npcs.client.gui.script.GuiScriptInterface;
import noppes.npcs.client.gui.util.script.PackageFinder;
import noppes.npcs.client.model.ModelNPCGolem;
import noppes.npcs.client.model.ModelNpcCrystal;
@@ -138,6 +139,7 @@ import noppes.npcs.client.renderer.RenderNpcDragon;
import noppes.npcs.client.renderer.RenderNpcSlime;
import noppes.npcs.client.renderer.RenderProjectile;
import kamkeel.npcs.client.renderer.TelegraphRenderer;
import noppes.npcs.scripted.item.ScriptCustomItem;
import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphManager;
import noppes.npcs.client.renderer.blocks.BlockBannerRenderer;
import noppes.npcs.client.renderer.blocks.BlockBarrelRenderer;
@@ -492,7 +494,7 @@ public class ClientProxy extends CommonProxy {
return new GuiScript(npc);
else if (gui == EnumGuiType.ScriptItem)
return new GuiScriptItem();
return GuiScriptInterface.create(null, new ScriptCustomItem(new ItemStack(CustomItems.scripted_item)));
else if (gui == EnumGuiType.PlayerCarpentryBench)
return new GuiNpcCarpentryBench((ContainerCarpentryBench) container);
@@ -567,7 +569,7 @@ public class ClientProxy extends CommonProxy {
return new GuiCustom((ContainerCustomGui) container);
else if (gui == EnumGuiType.ScriptBlock)
return new GuiScriptBlock(x, y, z);
return getScriptBlockGui(x, y, z);
else if (gui == EnumGuiType.Paintbrush)
return new GuiNpcPaintbrush();
@@ -619,9 +621,22 @@ public class ClientProxy extends CommonProxy {
if (guiscreen != null) {
minecraft.displayGuiScreen((GuiScreen) guiscreen);
}
}
private GuiScreen getScriptBlockGui(int x, int y, int z) {
World world = Minecraft.getMinecraft().theWorld;
if (world == null)
return null;
TileEntity tile = world.getTileEntity(x, y, z);
if (!(tile instanceof TileScripted))
return null;
return GuiScriptInterface.create(null, (TileScripted) tile);
}
@Override
public void spawnParticle(EntityLivingBase player, String string, Object... ob) {
if (string.equals("Spell")) {
@@ -10,7 +10,6 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.StatCollector;
import noppes.npcs.NoppesStringUtils;
import noppes.npcs.client.NoppesUtil;
import noppes.npcs.client.gui.script.GuiNPCEventScripts;
import noppes.npcs.client.gui.script.GuiScriptInterface;
import noppes.npcs.client.gui.util.*;
import noppes.npcs.constants.ScriptContext;
@@ -270,7 +269,7 @@ public class GuiScript extends GuiScriptInterface {
}
if (guibutton.id == 16) {
close();
mc.displayGuiScreen(new GuiNPCEventScripts(npc));
GuiScriptInterface.open(this, new DataScript(npc));
}
if (guibutton.id == 17) {
close();
@@ -1,65 +1,13 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.EventScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.IScriptHandlerPacket;
import noppes.npcs.controllers.data.DataScript;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.entity.EntityNPCInterface;
import java.util.ArrayList;
import java.util.List;
public class GuiNPCEventScripts extends GuiScriptInterface {
private final DataScript script;
public GuiNPCEventScripts(EntityNPCInterface npc) {
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_NPC));
this.script = new DataScript(npc);
this.handler = this.script;
EventScriptPacket.Get();
}
public void setGuiData(NBTTagCompound compound) {
if (compound.hasKey("LoadComplete")) {
loaded = true;
return;
}
if (!compound.hasKey("Tab")) {
script.setLanguage(compound.getString("ScriptLanguage"));
script.setEnabled(compound.getBoolean("ScriptEnabled"));
super.setGuiData(compound);
} else {
int tab = compound.getInteger("Tab");
NBTTagCompound scriptCompound = compound.getCompoundTag("Script");
IScriptUnit container = IScriptUnit.createFromNBT(scriptCompound, script);
if (script.getScripts().isEmpty()) {
for (int i = 0; i < compound.getInteger("TotalScripts"); i++) {
script.getScripts().add(new ScriptContainer(script));
}
}
script.getScripts().set(tab, container);
initGui();
}
}
public void save() {
if (loaded) {
super.save();
List<IScriptUnit> containers = this.script.getScripts();
for (int i = 0; i < containers.size(); i++) {
IScriptUnit container = containers.get(i);
EventScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
}
NBTTagCompound scriptData = new NBTTagCompound();
scriptData.setString("ScriptLanguage", this.script.getLanguage());
scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
EventScriptPacket.Save(-1, containers.size(), scriptData);
}
this.handler = new DataScript(npc);
if (this.handler instanceof IScriptHandlerPacket)
((IScriptHandlerPacket) this.handler).requestData();
}
}
@@ -1,63 +0,0 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.GlobalNPCScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.GlobalNPCDataScript;
import noppes.npcs.controllers.data.IScriptUnit;
import java.util.ArrayList;
import java.util.List;
public class GuiScriptAllNPCs extends GuiScriptInterface {
private final GlobalNPCDataScript script = new GlobalNPCDataScript(null);
public GuiScriptAllNPCs() {
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_NPC));
this.handler = this.script;
GlobalNPCScriptPacket.Get();
}
public void setGuiData(NBTTagCompound compound) {
if (compound.hasKey("LoadComplete")) {
loaded = true;
return;
}
if (!compound.hasKey("Tab")) {
script.setLanguage(compound.getString("ScriptLanguage"));
script.setEnabled(compound.getBoolean("ScriptEnabled"));
super.setGuiData(compound);
} else {
int tab = compound.getInteger("Tab");
NBTTagCompound scriptCompound = compound.getCompoundTag("Script");
IScriptUnit container = IScriptUnit.createFromNBT(scriptCompound, script);
if (script.getScripts().isEmpty()) {
for (int i = 0; i < compound.getInteger("TotalScripts"); i++) {
script.getScripts().add(new ScriptContainer(script));
}
}
script.getScripts().set(tab, container);
initGui();
}
}
public void save() {
if (loaded) {
super.save();
List<IScriptUnit> containers = this.script.getScripts();
for (int i = 0; i < containers.size(); i++) {
IScriptUnit container = containers.get(i);
GlobalNPCScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
}
NBTTagCompound scriptData = new NBTTagCompound();
scriptData.setString("ScriptLanguage", this.script.getLanguage());
scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
GlobalNPCScriptPacket.Save(-1, containers.size(), scriptData);
}
}
}
@@ -1,39 +0,0 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.BlockScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.blocks.tiles.TileScripted;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptHookController;
import java.util.ArrayList;
public class GuiScriptBlock extends GuiScriptInterface {
private final TileScripted tileScripted;
public GuiScriptBlock(int x, int y, int z) {
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_BLOCK));
this.handler = this.tileScripted = (TileScripted) player.worldObj.getTileEntity(x, y, z);
BlockScriptPacket.Get(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord);
}
public void setGuiData(NBTTagCompound compound) {
this.tileScripted.setNBT(compound);
super.setGuiData(compound);
loaded = true;
}
@Override
protected ScriptContext getScriptContext() {
return ScriptContext.BLOCK;
}
public void save() {
if (loaded) {
super.save();
BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound()));
}
}
}
@@ -1,118 +0,0 @@
package noppes.npcs.client.gui.script;
import com.google.common.reflect.ClassPath;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.network.FMLNetworkEvent;
import kamkeel.npcs.network.packets.request.script.ForgeScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.ChunkWatchEvent;
import net.minecraftforge.event.world.WorldEvent;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.ForgeDataScript;
import noppes.npcs.controllers.data.IScriptUnit;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
public class GuiScriptForge extends GuiScriptInterface {
private final ForgeDataScript script = new ForgeDataScript();
public GuiScriptForge() {
// Add built-in "init" hook from controller
hookList.addAll(ScriptHookController.Instance.getBuiltInHooks(IScriptHookHandler.CONTEXT_FORGE));
// Dynamically discover Forge event hooks
ArrayList<ClassPath.ClassInfo> list = new ArrayList();
try {
list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("cpw.mods.fml.common.gameevent"));
list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event"));
list.removeAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event.terraingen"));
} catch (IOException e) {
e.printStackTrace();
}
for (ClassPath.ClassInfo e1 : list) {
ClassPath.ClassInfo classLoader = e1;
Class infoClass = classLoader.load();
ArrayList c = new ArrayList(Arrays.asList(infoClass.getDeclaredClasses()));
if (c.isEmpty()) {
c.add(infoClass);
}
Iterator var10 = c.iterator();
while (var10.hasNext()) {
Class c1 = (Class) var10.next();
if (!EntityEvent.EntityConstructing.class.isAssignableFrom(c1) && !WorldEvent.PotentialSpawns.class.isAssignableFrom(c1) && !TickEvent.RenderTickEvent.class.isAssignableFrom(c1) && !TickEvent.ClientTickEvent.class.isAssignableFrom(c1) && !FMLNetworkEvent.ClientCustomPacketEvent.class.isAssignableFrom(c1) && !ItemTooltipEvent.class.isAssignableFrom(c1) && Event.class.isAssignableFrom(c1) && !Modifier.isAbstract(c1.getModifiers()) && Modifier.isPublic(c1.getModifiers()) && !ChunkEvent.class.isAssignableFrom(c1) && !ChunkWatchEvent.class.isAssignableFrom(c1) && !ChunkDataEvent.class.isAssignableFrom(c1)) {
String eventName = c1.getName();
int i = eventName.lastIndexOf(".");
eventName = StringUtils.uncapitalize(eventName.substring(i + 1).replace("$", ""));
hookList.add(eventName);
}
}
}
hookList.add("onCNPCNaturalSpawn");
// Add any addon-registered hooks for the forge context
for (String addonHook : ScriptHookController.Instance.getAddonHooks(IScriptHookHandler.CONTEXT_FORGE)) {
if (!hookList.contains(addonHook)) {
hookList.add(addonHook);
}
}
this.handler = this.script;
ForgeScriptPacket.Get();
}
public void setGuiData(NBTTagCompound compound) {
if (compound.hasKey("LoadComplete")) {
loaded = true;
return;
}
if (!compound.hasKey("Tab")) {
script.setLanguage(compound.getString("ScriptLanguage"));
script.setEnabled(compound.getBoolean("ScriptEnabled"));
super.setGuiData(compound);
} else {
int tab = compound.getInteger("Tab");
NBTTagCompound scriptCompound = compound.getCompoundTag("Script");
IScriptUnit container = IScriptUnit.createFromNBT(scriptCompound, script);
if (script.getScripts().isEmpty()) {
for (int i = 0; i < compound.getInteger("TotalScripts"); i++) {
script.getScripts().add(new ScriptContainer(script));
}
}
script.getScripts().set(tab, container);
initGui();
}
}
public void save() {
if (loaded) {
super.save();
List<IScriptUnit> containers = this.script.getScripts();
for (int i = 0; i < containers.size(); i++) {
IScriptUnit container = containers.get(i);
ForgeScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
}
NBTTagCompound scriptData = new NBTTagCompound();
scriptData.setString("ScriptLanguage", this.script.getLanguage());
scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
ForgeScriptPacket.Save(-1, containers.size(), scriptData);
}
}
}
@@ -8,6 +8,9 @@ import net.minecraft.util.ResourceLocation;
import noppes.npcs.client.gui.util.GuiNPCInterface;
import noppes.npcs.client.gui.util.GuiNpcButton;
import noppes.npcs.client.gui.util.IGuiData;
import noppes.npcs.controllers.data.ForgeDataScript;
import noppes.npcs.controllers.data.GlobalNPCDataScript;
import noppes.npcs.controllers.data.PlayerDataScript;
import org.lwjgl.opengl.GL11;
import java.util.HashMap;
@@ -65,13 +68,13 @@ public class GuiScriptGlobal extends GuiNPCInterface implements IGuiData {
protected void actionPerformed(GuiButton guibutton) {
if (guibutton.id == 0) {
this.displayGuiScreen(new GuiScriptPlayers());
GuiScriptInterface.open(this, new PlayerDataScript(null));
}
if (guibutton.id == 1) {
this.displayGuiScreen(new GuiScriptForge());
GuiScriptInterface.open(this, new ForgeDataScript());
}
if (guibutton.id == 2) {
this.displayGuiScreen(new GuiScriptAllNPCs());
GuiScriptInterface.open(this, new GlobalNPCDataScript(null));
}
if (guibutton.id > 2) {
try {
@@ -88,10 +88,10 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
}
/**
* Create a GuiScriptInterface for a single script without a handler.
* Wraps the script in a SingleScriptHandler automatically.
* Create a GuiScriptInterface for a handler without displaying it.
* Useful when a caller needs to return a GuiScreen (e.g. ClientProxy).
*/
public static GuiScriptInterface open(GuiScreen parent, IScriptHandler handler) {
public static GuiScriptInterface create(GuiScreen parent, IScriptHandler handler) {
GuiScriptInterface gui = new GuiScriptInterface();
gui.handler = handler;
gui.parent = parent;
@@ -103,6 +103,15 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
if (handler instanceof IScriptHandlerPacket)
((IScriptHandlerPacket) handler).requestData();
return gui;
}
/**
* Open a GuiScriptInterface for a handler.
* Wraps the script in a SingleScriptHandler automatically.
*/
public static GuiScriptInterface open(GuiScreen parent, IScriptHandler handler) {
GuiScriptInterface gui = create(parent, handler);
Minecraft.getMinecraft().displayGuiScreen(gui);
return gui;
}
@@ -1,74 +0,0 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket;
import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.CustomItems;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.scripted.item.ScriptCustomItem;
import java.util.*;
public class GuiScriptItem extends GuiScriptInterface {
private ScriptCustomItem item;
public static Map<Long, String> consoleText = new HashMap<>();
public GuiScriptItem() {
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_ITEM));
this.handler = this.item = new ScriptCustomItem(new ItemStack(CustomItems.scripted_item));
ItemScriptErrorPacket.Get();
ItemScriptPacket.Get();
}
public void setGuiData(NBTTagCompound compound) {
if (compound.hasKey("ItemScriptConsole")) {
consoleText = NBTTags.GetLongStringMap(compound.getTagList("ItemScriptConsole", 10));
initGui();
} else {
this.item.setMCNbt(compound);
this.item.loadScriptData();
super.setGuiData(compound);
loaded = true;
}
}
@Override
protected ScriptContext getScriptContext() {
return ScriptContext.ITEM;
}
public void save() {
if (loaded) {
super.save();
ItemScriptPacket.Save(this.item.getMCNbt());
}
}
protected String getConsoleText() {
Map<Long, String> map = consoleText;
StringBuilder builder = new StringBuilder();
Iterator var3 = map.entrySet().iterator();
while (var3.hasNext()) {
Map.Entry<Long, String> entry = (Map.Entry) var3.next();
builder.insert(0, new Date((Long) entry.getKey()) + (String) entry.getValue() + "\n");
}
return builder.toString();
}
public void confirmClicked(boolean flag, int i) {
if (i == 102) {
if (activeTab <= 0) {
consoleText = new HashMap<>();
ItemScriptErrorPacket.Clear();
}
}
super.confirmClicked(flag, i);
}
}
@@ -1,71 +0,0 @@
package noppes.npcs.client.gui.script;
import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.controllers.data.PlayerDataScript;
import java.util.ArrayList;
import java.util.List;
public class GuiScriptPlayers extends GuiScriptInterface {
private PlayerDataScript script = new PlayerDataScript((EntityPlayer) null);
public GuiScriptPlayers() {
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_PLAYER));
this.handler = this.script;
PlayerScriptPacket.Get();
}
public void setGuiData(NBTTagCompound compound) {
if (compound.hasKey("LoadComplete")) {
loaded = true;
return;
}
if (!compound.hasKey("Tab")) {
script.setLanguage(compound.getString("ScriptLanguage"));
script.setEnabled(compound.getBoolean("ScriptEnabled"));
super.setGuiData(compound);
} else {
int tab = compound.getInteger("Tab");
NBTTagCompound scriptCompound = compound.getCompoundTag("Script");
IScriptUnit container = IScriptUnit.createFromNBT(scriptCompound, script);
if (script.getScripts().isEmpty()) {
for (int i = 0; i < compound.getInteger("TotalScripts"); i++) {
script.getScripts().add(new ScriptContainer(script));
}
}
script.getScripts().set(tab, container);
initGui();
}
}
@Override
protected ScriptContext getScriptContext() {
return ScriptContext.PLAYER;
}
public void save() {
if (loaded) {
super.save();
List<IScriptUnit> containers = this.script.getScripts();
for (int i = 0; i < containers.size(); i++) {
IScriptUnit container = containers.get(i);
PlayerScriptPacket.Save(i, containers.size(), container.writeToNBT(new NBTTagCompound()));
}
NBTTagCompound scriptData = new NBTTagCompound();
scriptData.setString("ScriptLanguage", this.script.getLanguage());
scriptData.setBoolean("ScriptEnabled", this.script.getEnabled());
scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.script.getConsoleText()));
PlayerScriptPacket.Save(-1, containers.size(), scriptData);
}
}
}
@@ -3,6 +3,7 @@ package noppes.npcs.controllers.data;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.relauncher.Side;
import kamkeel.npcs.network.packets.request.script.EventScriptPacket;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
@@ -12,10 +13,12 @@ import noppes.npcs.EventHooks;
import noppes.npcs.LogWriter;
import noppes.npcs.NBTTags;
import noppes.npcs.api.IWorld;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.api.entity.ICustomNpc;
import noppes.npcs.config.ConfigDebug;
import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
@@ -36,7 +39,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
public class DataScript implements IScriptHandler {
public class DataScript implements IScriptHandlerPacket {
public List<IScriptUnit> eventScripts = new ArrayList<>();
private HashMap<EnumScriptType, ScriptContainer> scripts = new HashMap<>();
@@ -210,6 +213,26 @@ public class DataScript implements IScriptHandler {
return enabled && ScriptController.HasStart && !npc.worldObj.isRemote && !scripts.isEmpty() && ConfigScript.ScriptingEnabled;
}
@Override
public ScriptContext getContext() {
return ScriptContext.NPC;
}
@Override
public String getHookContext() {
return IScriptHookHandler.CONTEXT_NPC;
}
@Override
public void requestData() {
EventScriptPacket.Get();
}
@Override
public void sendSavePacket(int index, int totalCount, NBTTagCompound nbt) {
EventScriptPacket.Save(index, totalCount, nbt);
}
public Map<Long, String> getOldConsoleText() {
Map<Long, String> map = new TreeMap<>();
@@ -1,17 +1,37 @@
package noppes.npcs.controllers.data;
import com.google.common.reflect.ClassPath;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.gameevent.TickEvent;
import cpw.mods.fml.common.network.FMLNetworkEvent;
import kamkeel.npcs.network.packets.request.script.ForgeScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.event.entity.EntityEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.event.world.ChunkDataEvent;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.ChunkWatchEvent;
import net.minecraftforge.event.world.WorldEvent;
import noppes.npcs.EventHooks;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.ScriptHookController;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
public class ForgeDataScript implements IScriptHandler {
public class ForgeDataScript implements IScriptHandlerPacket {
private static final Object HOOK_LOCK = new Object();
private static List<String> cachedHooks;
private List<IScriptUnit> scripts = new ArrayList<>();
private String scriptLanguage = "ECMAScript";
public long lastInited = -1L;
@@ -81,6 +101,91 @@ public class ForgeDataScript implements IScriptHandler {
return this.enabled && ConfigScript.GlobalForgeScripts && ScriptController.HasStart && this.scripts.size() > 0;
}
@Override
public ScriptContext getContext() {
return ScriptContext.FORGE;
}
@Override
public String getHookContext() {
return IScriptHookHandler.CONTEXT_FORGE;
}
@Override
public List<String> getHooks() {
if (cachedHooks != null)
return new ArrayList<>(cachedHooks);
synchronized (HOOK_LOCK) {
if (cachedHooks != null)
return new ArrayList<>(cachedHooks);
List<String> hookList = new ArrayList<>(ScriptHookController.Instance.getBuiltInHooks(IScriptHookHandler.CONTEXT_FORGE));
ArrayList<ClassPath.ClassInfo> list = new ArrayList();
try {
list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("cpw.mods.fml.common.gameevent"));
list.addAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event"));
list.removeAll(ClassPath.from(this.getClass().getClassLoader()).getTopLevelClassesRecursive("net.minecraftforge.event.terraingen"));
} catch (IOException e) {
e.printStackTrace();
}
for (ClassPath.ClassInfo e1 : list) {
ClassPath.ClassInfo classLoader = e1;
Class infoClass = classLoader.load();
ArrayList c = new ArrayList(Arrays.asList(infoClass.getDeclaredClasses()));
if (c.isEmpty()) {
c.add(infoClass);
}
Iterator var10 = c.iterator();
while (var10.hasNext()) {
Class c1 = (Class) var10.next();
if (!EntityEvent.EntityConstructing.class.isAssignableFrom(c1)
&& !WorldEvent.PotentialSpawns.class.isAssignableFrom(c1)
&& !TickEvent.RenderTickEvent.class.isAssignableFrom(c1)
&& !TickEvent.ClientTickEvent.class.isAssignableFrom(c1)
&& !FMLNetworkEvent.ClientCustomPacketEvent.class.isAssignableFrom(c1)
&& !ItemTooltipEvent.class.isAssignableFrom(c1)
&& Event.class.isAssignableFrom(c1)
&& !Modifier.isAbstract(c1.getModifiers())
&& Modifier.isPublic(c1.getModifiers())
&& !ChunkEvent.class.isAssignableFrom(c1)
&& !ChunkWatchEvent.class.isAssignableFrom(c1)
&& !ChunkDataEvent.class.isAssignableFrom(c1)) {
String eventName = c1.getName();
int i = eventName.lastIndexOf(".");
eventName = StringUtils.uncapitalize(eventName.substring(i + 1).replace("$", ""));
hookList.add(eventName);
}
}
}
hookList.add("onCNPCNaturalSpawn");
for (String addonHook : ScriptHookController.Instance.getAddonHooks(IScriptHookHandler.CONTEXT_FORGE)) {
if (!hookList.contains(addonHook)) {
hookList.add(addonHook);
}
}
cachedHooks = hookList;
}
return new ArrayList<>(cachedHooks);
}
@Override
public void requestData() {
ForgeScriptPacket.Get();
}
@Override
public void sendSavePacket(int index, int totalCount, NBTTagCompound nbt) {
ForgeScriptPacket.Save(index, totalCount, nbt);
}
public boolean isClient() {
return false;
}
@@ -2,11 +2,14 @@ package noppes.npcs.controllers.data;
import com.google.common.base.Preconditions;
import cpw.mods.fml.common.eventhandler.Event;
import kamkeel.npcs.network.packets.request.script.GlobalNPCScriptPacket;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.api.entity.ICustomNpc;
import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.entity.EntityNPCInterface;
@@ -25,7 +28,7 @@ import java.util.OptionalInt;
import java.util.OptionalLong;
import java.util.TreeMap;
public class GlobalNPCDataScript implements IScriptHandler {
public class GlobalNPCDataScript implements IScriptHandlerPacket {
public List<IScriptUnit> scripts = new ArrayList<>();
public String scriptLanguage = "ECMAScript";
private EntityNPCInterface npc;
@@ -75,6 +78,26 @@ public class GlobalNPCDataScript implements IScriptHandler {
return ConfigScript.GlobalNPCScripts && this.enabled && ScriptController.HasStart && this.scripts.size() > 0;
}
@Override
public ScriptContext getContext() {
return ScriptContext.NPC;
}
@Override
public String getHookContext() {
return IScriptHookHandler.CONTEXT_NPC;
}
@Override
public void requestData() {
GlobalNPCScriptPacket.Get();
}
@Override
public void sendSavePacket(int index, int totalCount, NBTTagCompound nbt) {
GlobalNPCScriptPacket.Save(index, totalCount, nbt);
}
@Override
public void callScript(String hookName, Event event) {
@@ -2,14 +2,17 @@ package noppes.npcs.controllers.data;
import com.google.common.base.Preconditions;
import cpw.mods.fml.common.eventhandler.Event;
import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.math.BlockPos;
import noppes.npcs.EventHooks;
import noppes.npcs.NBTTags;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.api.entity.IPlayer;
import noppes.npcs.config.ConfigScript;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.scripted.NpcAPI;
@@ -30,7 +33,7 @@ import java.util.OptionalInt;
import java.util.OptionalLong;
import java.util.TreeMap;
public class PlayerDataScript implements IScriptHandler {
public class PlayerDataScript implements IScriptHandlerPacket {
public List<IScriptUnit> scripts = new ArrayList<>();
public String scriptLanguage = "ECMAScript";
private EntityPlayer player;
@@ -89,6 +92,26 @@ public class PlayerDataScript implements IScriptHandler {
return ConfigScript.GlobalPlayerScripts && ScriptController.Instance.playerScripts.enabled && ScriptController.HasStart && (this.player == null || !this.player.worldObj.isRemote);
}
@Override
public ScriptContext getContext() {
return ScriptContext.PLAYER;
}
@Override
public String getHookContext() {
return IScriptHookHandler.CONTEXT_PLAYER;
}
@Override
public void requestData() {
PlayerScriptPacket.Get();
}
@Override
public void sendSavePacket(int index, int totalCount, NBTTagCompound nbt) {
PlayerScriptPacket.Save(index, totalCount, nbt);
}
@Override
public void callScript(String hookName, Event event) {
@@ -200,7 +223,7 @@ public class PlayerDataScript implements IScriptHandler {
if (ConfigScript.IndividualPlayerScripts) {
return console;
}
return IScriptHandler.super.getConsoleText();
return IScriptHandlerPacket.super.getConsoleText();
}
@Override
@@ -209,7 +232,7 @@ public class PlayerDataScript implements IScriptHandler {
console.clear();
return;
}
IScriptHandler.super.clearConsole();
IScriptHandlerPacket.super.clearConsole();
}
public static final class ToStringHelper {
@@ -1,15 +1,20 @@
package noppes.npcs.scripted.item;
import cpw.mods.fml.common.eventhandler.Event;
import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket;
import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.EventHooks;
import noppes.npcs.NBTTags;
import noppes.npcs.api.item.IItemCustom;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.constants.ScriptContext;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.data.IScriptHandler;
import noppes.npcs.controllers.data.IScriptHandlerPacket;
import noppes.npcs.scripted.CustomNPCsException;
import java.util.ArrayList;
@@ -18,13 +23,15 @@ import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, IScriptHandler {
public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, IScriptHandlerPacket {
public List<IScriptUnit> scripts = new ArrayList();
public List<Integer> errored = new ArrayList();
public String scriptLanguage = "ECMAScript";
public boolean enabled = false;
public boolean loaded = false;
private Map<Long, String> clientConsoleText = new TreeMap<>();
public double durabilityValue = 1.0D;
public int stackSize = 64;
@@ -60,6 +67,48 @@ public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCus
}
}
@Override
public ScriptContext getContext() {
return ScriptContext.ITEM;
}
@Override
public String getHookContext() {
return IScriptHookHandler.CONTEXT_ITEM;
}
@Override
public void requestData() {
ItemScriptErrorPacket.Get();
ItemScriptPacket.Get();
}
@Override
public void sendSavePacket(int index, int totalCount, NBTTagCompound nbt) {
ItemScriptPacket.Save(nbt);
}
@Override
public GuiDataResult setGuiData(NBTTagCompound compound) {
if (compound.hasKey("LoadComplete")) {
return new GuiDataResult(GuiDataKind.LOAD_COMPLETE, -1);
}
if (compound.hasKey("ItemScriptConsole")) {
clientConsoleText = NBTTags.GetLongStringMap(compound.getTagList("ItemScriptConsole", 10));
return new GuiDataResult(GuiDataKind.TAB, -1);
}
setMCNbt(compound);
loadScriptData();
return new GuiDataResult(GuiDataKind.METADATA, -1);
}
@Override
public void sync() {
sendSavePacket(-1, getScripts().size(), getMCNbt());
}
public int getType() {
return 6;
}
@@ -142,10 +191,12 @@ public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCus
}
public Map<Long, String> getConsoleText() {
return new TreeMap<>();
return clientConsoleText;
}
public void clearConsole() {
clientConsoleText.clear();
ItemScriptErrorPacket.Clear();
}
public int getMaxStackSize() {