Merge branch 'dev' into janino-scripts

# Conflicts:
#	repositories.gradle
This commit is contained in:
bigguy345 committed 2026-01-13 18:18:06 +02:00
commit 88d43f8199
93 files changed
+13097 -181

No files matched your search

@@ -3,7 +3,9 @@ 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.DataScript;
import noppes.npcs.entity.EntityNPCInterface;
@@ -14,25 +16,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface {
private final DataScript script;
public GuiNPCEventScripts(EntityNPCInterface npc) {
this.hookList = new ArrayList<>();
hookList.add("init");
hookList.add("tick");
hookList.add("interact");
hookList.add("dialog");
hookList.add("damaged");
hookList.add("killed");
hookList.add("meleeAttack");
hookList.add("meleeSwing");
hookList.add("rangedLaunched");
hookList.add("target");
hookList.add("collide");
hookList.add("kills");
hookList.add("dialogClose");
hookList.add("timer");
hookList.add("targetLost");
hookList.add("projectileTick");
hookList.add("projectileImpact");
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_NPC));
this.script = new DataScript(npc);
this.handler = this.script;
EventScriptPacket.Get();
@@ -3,33 +3,19 @@ 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 java.util.ArrayList;
import java.util.List;
public class GuiScriptAllNPCs extends GuiScriptInterface {
private final GlobalNPCDataScript script = new GlobalNPCDataScript(null);
public GuiScriptAllNPCs() {
hookList.add("init");
hookList.add("tick");
hookList.add("interact");
hookList.add("dialog");
hookList.add("damaged");
hookList.add("killed");
hookList.add("meleeAttack");
hookList.add("meleeSwing");
hookList.add("rangedLaunched");
hookList.add("target");
hookList.add("collide");
hookList.add("kills");
hookList.add("dialogClose");
hookList.add("timer");
hookList.add("targetLost");
hookList.add("projectileTick");
hookList.add("projectileImpact");
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_NPC));
this.handler = this.script;
GlobalNPCScriptPacket.Get();
}
@@ -2,26 +2,18 @@ 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.controllers.ScriptHookController;
import java.util.ArrayList;
public class GuiScriptBlock extends GuiScriptInterface {
private final TileScripted tileScripted;
public GuiScriptBlock(int x, int y, int z) {
hookList.add("init");
hookList.add("tick");
hookList.add("interact");
hookList.add("fallenUpon");
hookList.add("redstone");
hookList.add("broken");
hookList.add("exploded");
hookList.add("rainFilled");
hookList.add("neighborChanged");
hookList.add("clicked");
hookList.add("harvested");
hookList.add("collide");
hookList.add("timer");
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);
@@ -24,7 +24,9 @@ import noppes.npcs.client.gui.util.IGuiData;
import noppes.npcs.client.gui.util.IJTextAreaListener;
import noppes.npcs.client.gui.util.ITextChangeListener;
import noppes.npcs.client.gui.util.ITextfieldListener;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.CustomEffect;
import noppes.npcs.controllers.data.EffectScript;
@@ -61,9 +63,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback
this.effect = effect;
this.scriptHandler = new EffectScript();
for (EffectScript.ScriptType type : EffectScript.ScriptType.values()) {
this.hookList.add(type.function);
}
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_EFFECT));
EffectScriptPacket.Get(effect.id);
}
@@ -13,7 +13,9 @@ 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 org.apache.commons.lang3.StringUtils;
@@ -28,8 +30,10 @@ public class GuiScriptForge extends GuiScriptInterface {
private final ForgeDataScript script = new ForgeDataScript();
public GuiScriptForge() {
hookList.add("init");
// 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"));
@@ -60,6 +64,13 @@ public class GuiScriptForge extends GuiScriptInterface {
}
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();
}
@@ -6,8 +6,11 @@ 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.controllers.ScriptHookController;
import noppes.npcs.scripted.item.ScriptCustomItem;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
@@ -18,18 +21,7 @@ public class GuiScriptItem extends GuiScriptInterface {
public static Map<Long, String> consoleText = new HashMap<>();
public GuiScriptItem() {
hookList.add("init");
hookList.add("tick");
hookList.add("tossed");
hookList.add("pickedUp");
hookList.add("spawn");
hookList.add("interact");
hookList.add("rightClick");
hookList.add("attack");
hookList.add("startItem");
hookList.add("usingItem");
hookList.add("stopItem");
hookList.add("finishItem");
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_ITEM));
this.handler = this.item = new ScriptCustomItem(new ItemStack(CustomItems.scripted_item));
ItemScriptErrorPacket.Get();
@@ -24,8 +24,9 @@ import noppes.npcs.client.gui.util.IGuiData;
import noppes.npcs.client.gui.util.IJTextAreaListener;
import noppes.npcs.client.gui.util.ITextChangeListener;
import noppes.npcs.client.gui.util.ITextfieldListener;
import noppes.npcs.constants.EnumScriptType;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.LinkedItem;
import noppes.npcs.controllers.data.LinkedItemScript;
@@ -61,20 +62,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall
this.linkedItem = linkedItem;
this.scriptHandler = new LinkedItemScript();
hookList.add(EnumScriptType.LINKED_ITEM_BUILD.function);
hookList.add(EnumScriptType.LINKED_ITEM_VERSION.function);
hookList.add(EnumScriptType.INIT.function);
hookList.add(EnumScriptType.TICK.function);
hookList.add(EnumScriptType.TOSSED.function);
hookList.add(EnumScriptType.PICKEDUP.function);
hookList.add(EnumScriptType.SPAWN.function);
hookList.add(EnumScriptType.INTERACT.function);
hookList.add(EnumScriptType.RIGHT_CLICK.function);
hookList.add(EnumScriptType.ATTACK.function);
hookList.add(EnumScriptType.START_USING_ITEM.function);
hookList.add(EnumScriptType.USING_ITEM.function);
hookList.add(EnumScriptType.STOP_USING_ITEM.function);
hookList.add(EnumScriptType.FINISH_USING_ITEM.function);
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_LINKED_ITEM));
LinkedItemScriptPacket.Get(linkedItem.id);
}
@@ -4,87 +4,19 @@ 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.constants.EnumScriptType;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.data.EffectScript;
import noppes.npcs.controllers.ScriptHookController;
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() {
hookList.add(EnumScriptType.INIT.function);
hookList.add(EnumScriptType.TICK.function);
hookList.add(EnumScriptType.INTERACT.function);
hookList.add(EnumScriptType.RIGHT_CLICK.function);
hookList.add(EnumScriptType.ATTACK.function);
hookList.add(EnumScriptType.ATTACKED.function);
hookList.add(EnumScriptType.DAMAGED_ENTITY.function);
hookList.add(EnumScriptType.DAMAGED.function);
hookList.add(EnumScriptType.KILLS.function);
hookList.add(EnumScriptType.KILLED.function);
hookList.add(EnumScriptType.DROP.function);
hookList.add(EnumScriptType.RESPAWN.function);
hookList.add(EnumScriptType.BREAK_BLOCK.function);
hookList.add(EnumScriptType.CHAT.function);
hookList.add(EnumScriptType.LOGIN.function);
hookList.add(EnumScriptType.LOGOUT.function);
hookList.add(EnumScriptType.KEY_PRESSED.function);
hookList.add(EnumScriptType.MOUSE_CLICKED.function);
hookList.add(EnumScriptType.TOSS.function);
hookList.add(EnumScriptType.PICKUP.function);
hookList.add(EnumScriptType.PICKUP_XP.function);
hookList.add(EnumScriptType.RANGED_CHARGE.function);
hookList.add(EnumScriptType.RANGED_LAUNCHED.function);
hookList.add(EnumScriptType.TIMER.function);
hookList.add(EnumScriptType.START_USING_ITEM.function);
hookList.add(EnumScriptType.USING_ITEM.function);
hookList.add(EnumScriptType.STOP_USING_ITEM.function);
hookList.add(EnumScriptType.FINISH_USING_ITEM.function);
hookList.add(EnumScriptType.CONTAINER_OPEN.function);
hookList.add(EnumScriptType.USE_HOE.function);
hookList.add(EnumScriptType.BONEMEAL.function);
hookList.add(EnumScriptType.FILL_BUCKET.function);
hookList.add(EnumScriptType.JUMP.function);
hookList.add(EnumScriptType.FALL.function);
hookList.add(EnumScriptType.WAKE_UP.function);
hookList.add(EnumScriptType.SLEEP.function);
hookList.add(EnumScriptType.PLAYSOUND.function);
hookList.add(EnumScriptType.LIGHTNING.function);
hookList.add(EnumScriptType.CHANGED_DIM.function);
hookList.add(EnumScriptType.QUEST_START.function);
hookList.add(EnumScriptType.QUEST_COMPLETED.function);
hookList.add(EnumScriptType.QUEST_TURNIN.function);
hookList.add(EnumScriptType.FACTION_POINTS.function);
hookList.add(EnumScriptType.DIALOG_OPEN.function);
hookList.add(EnumScriptType.DIALOG_OPTION.function);
hookList.add(EnumScriptType.DIALOG_CLOSE.function);
hookList.add(EnumScriptType.SCRIPT_COMMAND.function);
hookList.add(EnumScriptType.CUSTOM_GUI_CLOSED.function);
hookList.add(EnumScriptType.CUSTOM_GUI_BUTTON.function);
hookList.add(EnumScriptType.CUSTOM_GUI_SLOT.function);
hookList.add(EnumScriptType.CUSTOM_GUI_SLOT_CLICKED.function);
hookList.add(EnumScriptType.CUSTOM_GUI_SCROLL.function);
hookList.add(EnumScriptType.CUSTOM_GUI_TEXTFIELD.function);
hookList.add(EnumScriptType.PARTY_QUEST_COMPLETED.function);
hookList.add(EnumScriptType.PARTY_QUEST_SET.function);
hookList.add(EnumScriptType.PARTY_QUEST_TURNED_IN.function);
hookList.add(EnumScriptType.PARTY_INVITE.function);
hookList.add(EnumScriptType.PARTY_KICK.function);
hookList.add(EnumScriptType.PARTY_LEAVE.function);
hookList.add(EnumScriptType.PARTY_DISBAND.function);
hookList.add(EnumScriptType.ANIMATION_START.function);
hookList.add(EnumScriptType.ANIMATION_END.function);
hookList.add(EnumScriptType.ANIMATION_FRAME_ENTER.function);
hookList.add(EnumScriptType.ANIMATION_FRAME_EXIT.function);
hookList.add(EnumScriptType.PROFILE_CHANGE.function);
hookList.add(EnumScriptType.PROFILE_REMOVE.function);
hookList.add(EnumScriptType.PROFILE_CREATE.function);
hookList.add(EffectScript.ScriptType.OnEffectAdd.function);
hookList.add(EffectScript.ScriptType.OnEffectTick.function);
hookList.add(EffectScript.ScriptType.OnEffectRemove.function);
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_PLAYER));
this.handler = this.script;
PlayerScriptPacket.Get();
@@ -24,7 +24,9 @@ import noppes.npcs.client.gui.util.IGuiData;
import noppes.npcs.client.gui.util.IJTextAreaListener;
import noppes.npcs.client.gui.util.ITextChangeListener;
import noppes.npcs.client.gui.util.ITextfieldListener;
import noppes.npcs.api.handler.IScriptHookHandler;
import noppes.npcs.controllers.ScriptContainer;
import noppes.npcs.controllers.ScriptHookController;
import noppes.npcs.controllers.data.RecipeAnvil;
import noppes.npcs.controllers.data.RecipeCarpentry;
import noppes.npcs.controllers.data.RecipeScript;
@@ -64,8 +66,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback
this.anvil = false;
this.recipeId = recipe.id;
hookList.add(RecipeScript.ScriptType.PRE.function);
hookList.add(RecipeScript.ScriptType.POST.function);
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_RECIPE));
RecipeScriptPacket.Get(false, recipeId);
}
@@ -82,8 +83,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback
this.anvil = true;
this.recipeId = recipe.id;
hookList.add(RecipeScript.ScriptType.PRE.function);
hookList.add(RecipeScript.ScriptType.POST.function);
this.hookList = new ArrayList<>(ScriptHookController.Instance.getAllHooks(IScriptHookHandler.CONTEXT_RECIPE));
RecipeScriptPacket.Get(true, recipeId);
}