mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-21 13:52:23 +00:00
Merge branch 'refs/heads/dev' into syntax-highlighter-unified
# Conflicts: # repositories.gradle # src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java # src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java
This commit is contained in:
commit
83e11a05da
93 files changed
+13093
-179
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.controllers.data.IScriptUnit;
|
||||
import noppes.npcs.entity.EntityNPCInterface;
|
||||
@@ -15,25 +17,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,34 +3,20 @@ 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() {
|
||||
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();
|
||||
}
|
||||
|
||||
@@ -10,19 +10,7 @@ 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);
|
||||
|
||||
@@ -21,9 +21,7 @@ public class GuiScriptEffect extends GuiScriptInterface {
|
||||
this.handler = this.scriptHandler;
|
||||
this.singleContainer = true;
|
||||
|
||||
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);
|
||||
}
|
||||
@@ -50,4 +48,4 @@ public class GuiScriptEffect extends GuiScriptInterface {
|
||||
public void save() {
|
||||
saveWithPackets();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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 noppes.npcs.controllers.data.IScriptUnit;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -29,8 +31,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"));
|
||||
@@ -61,6 +65,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();
|
||||
}
|
||||
|
||||
@@ -19,18 +19,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();
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package noppes.npcs.client.gui.script;
|
||||
|
||||
import kamkeel.npcs.network.packets.request.script.item.LinkedItemScriptPacket;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiConfirmOpenLink;
|
||||
import net.minecraft.client.gui.GuiYesNo;
|
||||
import net.minecraft.client.gui.GuiYesNoCallback;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.client.gui.global.GuiNPCManageLinked;
|
||||
import noppes.npcs.constants.EnumScriptType;
|
||||
@@ -20,20 +24,7 @@ public class GuiScriptLinkedItem extends GuiScriptInterface {
|
||||
this.handler = new LinkedItemScript();
|
||||
this.singleContainer = true;
|
||||
|
||||
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,89 +4,23 @@ 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.constants.EnumScriptType;
|
||||
import noppes.npcs.controllers.ScriptContainer;
|
||||
import noppes.npcs.controllers.ScriptHookController;
|
||||
import noppes.npcs.controllers.data.EffectScript;
|
||||
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() {
|
||||
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();
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package noppes.npcs.client.gui.script;
|
||||
|
||||
import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket;
|
||||
import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.client.gui.GuiConfirmOpenLink;
|
||||
import net.minecraft.client.gui.GuiYesNo;
|
||||
import net.minecraft.client.gui.GuiYesNoCallback;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import noppes.npcs.client.gui.global.GuiNpcManageRecipes;
|
||||
import noppes.npcs.constants.ScriptContext;
|
||||
@@ -22,8 +26,7 @@ public class GuiScriptRecipe extends GuiScriptInterface {
|
||||
this.recipeId = recipe.id;
|
||||
this.singleContainer = true;
|
||||
|
||||
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);
|
||||
}
|
||||
@@ -35,8 +38,7 @@ public class GuiScriptRecipe extends GuiScriptInterface {
|
||||
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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user