Moved all INpcScriptHandler implementations to IScriptHandler as its redundant

This commit is contained in:
bigguy345 committed 2026-01-13 23:45:14 +02:00
1 parent 10b6ccf427
commit cd60a03544
14 files changed
+37 -36

No files matched your search

+16 -17
View File
@@ -40,7 +40,6 @@ import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.data.Dialog;
import noppes.npcs.controllers.data.EffectScript;
import noppes.npcs.controllers.data.ForgeDataScript;
import noppes.npcs.controllers.data.INpcScriptHandler;
import noppes.npcs.controllers.data.IScriptBlockHandler;
import noppes.npcs.controllers.data.IScriptHandler;
import noppes.npcs.controllers.data.Party;
@@ -85,7 +84,7 @@ public class EventHooks {
}
public static void onScriptItemInit(IItemCustomizable item) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
if (handler != null && !handler.isClient()) {
ItemEvent.InitEvent event = new ItemEvent.InitEvent(item);
handler.callScript(EnumScriptType.INIT, event);
@@ -94,7 +93,7 @@ public class EventHooks {
}
public static void onScriptItemUpdate(IItemCustomizable item, EntityLivingBase player) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
if (handler != null && !handler.isClient()) {
ItemEvent.UpdateEvent event = new ItemEvent.UpdateEvent(item, NpcAPI.Instance().getIEntity(player));
handler.callScript(EnumScriptType.TICK, event);
@@ -103,7 +102,7 @@ public class EventHooks {
}
public static boolean onScriptItemTossed(IItemCustomizable item, EntityPlayer player, EntityItem entity) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.TossedEvent event = new ItemEvent.TossedEvent(item, (IPlayer) NpcAPI.Instance().getIEntity(player), NpcAPI.Instance().getIEntity(entity));
if (handler != null) {
handler.callScript(EnumScriptType.TOSSED, event);
@@ -112,7 +111,7 @@ public class EventHooks {
}
public static boolean onScriptItemPickedUp(IItemCustomizable item, EntityPlayer player) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.PickedUpEvent event = new ItemEvent.PickedUpEvent(item, (IPlayer) NpcAPI.Instance().getIEntity(player));
if (handler != null) {
handler.callScript(EnumScriptType.PICKEDUP, event);
@@ -121,7 +120,7 @@ public class EventHooks {
}
public static boolean onScriptItemSpawn(IItemCustomizable item, EntityItem entity) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.SpawnEvent event = new ItemEvent.SpawnEvent(item, NpcAPI.Instance().getIEntity(entity));
if (handler != null) {
handler.callScript(EnumScriptType.SPAWN, event);
@@ -130,7 +129,7 @@ public class EventHooks {
}
public static boolean onScriptItemInteract(IItemCustomizable item, noppes.npcs.scripted.event.ItemEvent.InteractEvent event) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
if (handler != null) {
handler.callScript(EnumScriptType.INTERACT, event);
}
@@ -138,7 +137,7 @@ public class EventHooks {
}
public static boolean onScriptItemRightClick(IItemCustomizable item, noppes.npcs.scripted.event.ItemEvent.RightClickEvent event) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
if (handler != null) {
handler.callScript(EnumScriptType.RIGHT_CLICK, event);
}
@@ -146,7 +145,7 @@ public class EventHooks {
}
public static boolean onScriptItemAttack(IItemCustomizable item, noppes.npcs.scripted.event.ItemEvent.AttackEvent event) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
if (handler != null) {
handler.callScript(EnumScriptType.ATTACK, event);
}
@@ -154,7 +153,7 @@ public class EventHooks {
}
public static boolean onStartUsingCustomItem(IItemCustomizable item, IPlayer player, int duration) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.StartUsingItem event = new ItemEvent.StartUsingItem(item, player, duration);
if (handler != null) {
handler.callScript(EnumScriptType.START_USING_ITEM, event);
@@ -163,7 +162,7 @@ public class EventHooks {
}
public static boolean onUsingCustomItem(IItemCustomizable item, IPlayer player, int duration) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.UsingItem event = new ItemEvent.UsingItem(item, player, duration);
if (handler != null) {
handler.callScript(EnumScriptType.USING_ITEM, event);
@@ -172,7 +171,7 @@ public class EventHooks {
}
public static boolean onStopUsingCustomItem(IItemCustomizable item, IPlayer player, int duration) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.StopUsingItem event = new ItemEvent.StopUsingItem(item, player, duration);
if (handler != null) {
handler.callScript(EnumScriptType.STOP_USING_ITEM, event);
@@ -181,7 +180,7 @@ public class EventHooks {
}
public static boolean onFinishUsingCustomItem(IItemCustomizable item, IPlayer player, int duration) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.FinishUsingItem event = new ItemEvent.FinishUsingItem(item, player, duration);
if (handler != null) {
handler.callScript(EnumScriptType.FINISH_USING_ITEM, event);
@@ -190,7 +189,7 @@ public class EventHooks {
}
public static void onRepairCustomItem(IItemCustomizable item, IPlayer player, IItemStack left, IItemStack right, float anvilBreakChance) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.RepairItem event = new ItemEvent.RepairItem(item, player, left, right, anvilBreakChance);
if (handler != null) {
handler.callScript(EnumScriptType.REPAIR_ITEM, event);
@@ -199,7 +198,7 @@ public class EventHooks {
}
public static void onBreakCustomItem(IItemCustomizable item, IPlayer player) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
ItemEvent.BreakItem event = new ItemEvent.BreakItem(item, player);
if (handler != null) {
handler.callScript(EnumScriptType.BREAK_ITEM, event);
@@ -242,7 +241,7 @@ public class EventHooks {
public static void onLinkedItemVersionChange(IItemLinked item, int version, int prevVersion) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
LinkedItemEvent.VersionChangeEvent event = new LinkedItemEvent.VersionChangeEvent(item, version, prevVersion);
if (handler != null) {
handler.callScript(EnumScriptType.LINKED_ITEM_VERSION, event);
@@ -251,7 +250,7 @@ public class EventHooks {
}
public static void onLinkedItemBuild(IItemLinked item) {
INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler();
IScriptHandler handler = (IScriptHandler) item.getScriptHandler();
LinkedItemEvent.BuildEvent event = new LinkedItemEvent.BuildEvent(item);
if (handler != null) {
handler.callScript(EnumScriptType.LINKED_ITEM_BUILD, event);
@@ -7,7 +7,7 @@ import noppes.npcs.CustomNpcs;
import noppes.npcs.LogWriter;
import noppes.npcs.api.handler.data.ILinkedItem;
import noppes.npcs.api.item.IItemStack;
import noppes.npcs.controllers.data.INpcScriptHandler;
import noppes.npcs.controllers.data.IScriptHandler;
import noppes.npcs.controllers.data.LinkedItem;
import noppes.npcs.controllers.data.LinkedItemScript;
import noppes.npcs.util.NBTJsonUtil;
@@ -90,7 +90,7 @@ public class LinkedItemController {
return this.linkedItems.containsValue(linkedItem);
}
public INpcScriptHandler getScriptHandler(int id) {
public IScriptHandler getScriptHandler(int id) {
return this.linkedItemsScripts.get(id);
}
@@ -35,7 +35,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
public class DataScript implements INpcScriptHandler {
public class DataScript implements IScriptHandler {
public List<IScriptUnit> eventScripts = new ArrayList<>();
private HashMap<EnumScriptType, ScriptContainer> scripts = new HashMap<>();
@@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
public class EffectScript implements INpcScriptHandler {
public class EffectScript implements IScriptHandler {
public IScriptUnit container;
public String scriptLanguage = "ECMAScript";
public boolean enabled = false;
@@ -15,7 +15,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap;
public class ForgeDataScript implements INpcScriptHandler {
public class ForgeDataScript implements IScriptHandler {
private List<IScriptUnit> scripts = new ArrayList<>();
private String scriptLanguage = "ECMAScript";
public long lastInited = -1L;
@@ -26,7 +26,7 @@ import java.util.OptionalInt;
import java.util.OptionalLong;
import java.util.TreeMap;
public class GlobalNPCDataScript implements INpcScriptHandler {
public class GlobalNPCDataScript implements IScriptHandler {
public List<IScriptUnit> scripts = new ArrayList<>();
public String scriptLanguage = "ECMAScript";
private EntityNPCInterface npc;
@@ -1,8 +1,7 @@
package noppes.npcs.controllers.data;
import cpw.mods.fml.common.eventhandler.Event;
import noppes.npcs.constants.EnumScriptType;
public interface INpcScriptHandler extends IScriptHandler {
void callScript(EnumScriptType var1, Event var2);
// This interface is now empty - callScript methods moved to IScriptHandler
// Kept for backward compatibility
}
@@ -2,7 +2,7 @@ package noppes.npcs.controllers.data;
import noppes.npcs.api.IBlock;
public interface IScriptBlockHandler extends INpcScriptHandler {
public interface IScriptBlockHandler extends IScriptHandler {
IBlock getBlock();
}
@@ -1,11 +1,14 @@
package noppes.npcs.controllers.data;
import cpw.mods.fml.common.eventhandler.Event;
import noppes.npcs.constants.EnumScriptType;
import java.util.List;
import java.util.Map;
public interface IScriptHandler {
void callScript(EnumScriptType type, Event event);
void callScript(String hookName, Event event);
boolean isClient();
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
public class LinkedItemScript implements INpcScriptHandler {
public class LinkedItemScript implements IScriptHandler {
public IScriptUnit container;
public String scriptLanguage = "ECMAScript";
public boolean enabled = false;
@@ -30,7 +30,7 @@ import java.util.OptionalInt;
import java.util.OptionalLong;
import java.util.TreeMap;
public class PlayerDataScript implements INpcScriptHandler {
public class PlayerDataScript implements IScriptHandler {
public List<IScriptUnit> scripts = new ArrayList<>();
public String scriptLanguage = "ECMAScript";
private EntityPlayer player;
@@ -18,7 +18,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
public class RecipeScript implements INpcScriptHandler {
public class RecipeScript implements IScriptHandler {
public IScriptUnit container;
public String scriptLanguage = "ECMAScript";
public boolean enabled = false;
@@ -10,7 +10,7 @@ import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.controllers.data.IScriptUnit;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptController;
import noppes.npcs.controllers.data.INpcScriptHandler;
import noppes.npcs.controllers.data.IScriptHandler;
import noppes.npcs.scripted.CustomNPCsException;
import java.util.ArrayList;
@@ -19,7 +19,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, INpcScriptHandler {
public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, IScriptHandler {
public List<IScriptUnit> scripts = new ArrayList();
public List<Integer> errored = new ArrayList();
public String scriptLanguage = "ECMAScript";
@@ -70,7 +70,7 @@ public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCus
}
@Override
public INpcScriptHandler getScriptHandler() {
public IScriptHandler getScriptHandler() {
return this;
}
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import noppes.npcs.api.item.IItemLinked;
import noppes.npcs.controllers.LinkedItemController;
import noppes.npcs.controllers.data.INpcScriptHandler;
import noppes.npcs.controllers.data.IScriptHandler;
import noppes.npcs.controllers.data.LinkedItem;
public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLinked {
@@ -51,7 +51,7 @@ public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLin
}
@Override
public INpcScriptHandler getScriptHandler() {
public IScriptHandler getScriptHandler() {
if (this.getLinkedItem() == null)
return null;
return this.getLinkedItem().getScriptHandler();