From 8d2ffdc5e31c24185b1ac5c0e7cbd23f46cb0922 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 11 Feb 2025 13:56:28 -0500 Subject: [PATCH] Rename to Effect Script --- .../request/script/EffectScriptPacket.java | 4 +-- .../client/gui/script/GuiScriptEffect.java | 8 +++--- .../controllers/CustomEffectController.java | 5 ++-- .../npcs/controllers/data/CustomEffect.java | 26 +++++++++---------- ...ctScriptHandler.java => EffectScript.java} | 4 +-- 5 files changed, 23 insertions(+), 24 deletions(-) rename src/main/java/noppes/npcs/controllers/data/{EffectScriptHandler.java => EffectScript.java} (97%) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java index 65b82d91c..8c1d878b7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EffectScriptPacket.java @@ -16,7 +16,7 @@ import noppes.npcs.config.ConfigDebug; import noppes.npcs.config.ConfigScript; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.data.CustomEffect; -import noppes.npcs.controllers.data.EffectScriptHandler; +import noppes.npcs.controllers.data.EffectScript; import noppes.npcs.controllers.data.IScriptHandler; import java.io.IOException; @@ -81,7 +81,7 @@ public final class EffectScriptPacket extends AbstractPacket { if(effect == null) return; - EffectScriptHandler data = effect.getOrCreateScriptHandler(); + EffectScript data = effect.getOrCreateScriptHandler(); if(requestedAction == Action.GET){ PacketUtil.getScripts((IScriptHandler) data, (EntityPlayerMP) player); } else { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java index 3853ee283..c4529bcf4 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -16,7 +16,7 @@ import noppes.npcs.client.gui.util.*; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.CustomEffect; -import noppes.npcs.controllers.data.EffectScriptHandler; +import noppes.npcs.controllers.data.EffectScript; import java.util.*; @@ -30,7 +30,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback public final GuiNPCManageEffects parent; public final CustomEffect effect; - private final EffectScriptHandler scriptHandler; + private final EffectScript scriptHandler; public GuiScriptEffect(GuiNPCManageEffects parent, CustomEffect effect) { @@ -41,9 +41,9 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback this.parent = parent; this.effect = effect; - this.scriptHandler = new EffectScriptHandler(); + this.scriptHandler = new EffectScript(); - for (EffectScriptHandler.ScriptType type : EffectScriptHandler.ScriptType.values()) { + for (EffectScript.ScriptType type : EffectScript.ScriptType.values()) { this.hookList.add(type.function); } diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java index 983405ccf..a372edae3 100644 --- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java +++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers; import kamkeel.npcs.controllers.SyncController; import kamkeel.npcs.network.enums.EnumSyncType; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; @@ -15,7 +14,7 @@ import noppes.npcs.api.handler.ICustomEffectHandler; import noppes.npcs.api.handler.data.ICustomEffect; import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.EffectKey; -import noppes.npcs.controllers.data.EffectScriptHandler; +import noppes.npcs.controllers.data.EffectScript; import noppes.npcs.controllers.data.PlayerEffect; import noppes.npcs.util.NBTJsonUtil; @@ -37,7 +36,7 @@ public class CustomEffectController implements ICustomEffectHandler { public HashMap customEffectsSync = new HashMap<>(); public HashMap customEffects = new HashMap<>(); - public HashMap customEffectScriptHandlers = new HashMap<>(); + public HashMap customEffectScriptHandlers = new HashMap<>(); private HashMap bootOrder; private int lastUsedID = 0; diff --git a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java index b186d94d8..03520eee8 100644 --- a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java +++ b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java @@ -184,12 +184,12 @@ public class CustomEffect implements ICustomEffect { PlayerEvent.EffectEvent.Added event = new PlayerEvent.EffectEvent.Added(iPlayer, playerEffect); if (onAddedConsumer != null) onAddedConsumer.accept(event); - EffectScriptHandler script = getScriptHandler(); + EffectScript script = getScriptHandler(); if (script == null) { return; } - script.callScript(EffectScriptHandler.ScriptType.OnAdd, event); + script.callScript(EffectScript.ScriptType.OnAdd, event); } public void onTick(EntityPlayer player, PlayerEffect playerEffect) { @@ -200,12 +200,12 @@ public class CustomEffect implements ICustomEffect { onTickConsumer.accept(event); } - EffectScriptHandler script = getScriptHandler(); + EffectScript script = getScriptHandler(); if (script == null) { return; } - script.callScript(EffectScriptHandler.ScriptType.OnTick, event); + script.callScript(EffectScript.ScriptType.OnTick, event); } public void onRemoved(EntityPlayer player, PlayerEffect playerEffect, PlayerEvent.EffectEvent.ExpirationType type) { @@ -217,12 +217,12 @@ public class CustomEffect implements ICustomEffect { onRemovedConsumer.accept(event); } - EffectScriptHandler script = getScriptHandler(); + EffectScript script = getScriptHandler(); if (script == null) { return; } - script.callScript(EffectScriptHandler.ScriptType.OnRemove, event); + script.callScript(EffectScript.ScriptType.OnRemove, event); } public NBTTagCompound writeToNBT(boolean saveScripts) { @@ -242,7 +242,7 @@ public class CustomEffect implements ICustomEffect { // if (saveScripts && scriptContainer != null) { if (saveScripts) { NBTTagCompound scriptData = new NBTTagCompound(); - EffectScriptHandler handler = getScriptHandler(); + EffectScript handler = getScriptHandler(); if (handler != null) handler.writeToNBT(scriptData); compound.setTag("ScriptData", scriptData); @@ -282,7 +282,7 @@ public class CustomEffect implements ICustomEffect { lossOnDeath = compound.getBoolean("lossOnDeath"); if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { - EffectScriptHandler handler = new EffectScriptHandler(); + EffectScript handler = new EffectScript(); handler.readFromNBT(compound.getCompoundTag("ScriptData")); setScriptHandler(handler); } @@ -296,17 +296,17 @@ public class CustomEffect implements ICustomEffect { return newEffect; } - public EffectScriptHandler getScriptHandler() { + public EffectScript getScriptHandler() { return CustomEffectController.getInstance().customEffectScriptHandlers.get(this.id); } - public void setScriptHandler(EffectScriptHandler handler) { + public void setScriptHandler(EffectScript handler) { CustomEffectController.getInstance().customEffectScriptHandlers.put(this.id, handler); } - public EffectScriptHandler getOrCreateScriptHandler() { - EffectScriptHandler data = getScriptHandler(); + public EffectScript getOrCreateScriptHandler() { + EffectScript data = getScriptHandler(); if (data == null) - setScriptHandler(data =new EffectScriptHandler()); + setScriptHandler(data =new EffectScript()); return data; } diff --git a/src/main/java/noppes/npcs/controllers/data/EffectScriptHandler.java b/src/main/java/noppes/npcs/controllers/data/EffectScript.java similarity index 97% rename from src/main/java/noppes/npcs/controllers/data/EffectScriptHandler.java rename to src/main/java/noppes/npcs/controllers/data/EffectScript.java index 05db76d09..45dda2e9b 100644 --- a/src/main/java/noppes/npcs/controllers/data/EffectScriptHandler.java +++ b/src/main/java/noppes/npcs/controllers/data/EffectScript.java @@ -16,7 +16,7 @@ import javax.script.ScriptEngine; import java.io.IOException; import java.util.*; -public class EffectScriptHandler implements IScriptHandler { +public class EffectScript implements IScriptHandler { public ScriptContainer container; public String scriptLanguage = "ECMAScript"; public boolean enabled = false; @@ -31,7 +31,7 @@ public class EffectScriptHandler implements IScriptHandler { return compound; } - public EffectScriptHandler readFromNBT(NBTTagCompound compound) { + public EffectScript readFromNBT(NBTTagCompound compound) { scriptLanguage = compound.getString("ScriptLanguage"); enabled = compound.getBoolean("ScriptEnabled");