From fe1c21582af35a33bd2da22ac2fb7612b951231b Mon Sep 17 00:00:00 2001 From: luisc Date: Tue, 3 Jun 2025 15:11:49 -0500 Subject: [PATCH 001/154] improved script performance when looking up top-level functions --- .../npcs/controllers/ScriptContainer.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 07ddbfde4..4eb764103 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers; import cpw.mods.fml.common.eventhandler.Event; +import jdk.nashorn.api.scripting.ScriptObjectMirror; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.config.ConfigScript; @@ -8,10 +9,7 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.NpcAPI; -import javax.script.Compilable; -import javax.script.CompiledScript; -import javax.script.Invocable; -import javax.script.ScriptEngine; +import javax.script.*; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; @@ -35,6 +33,7 @@ public class ScriptContainer { private static Method luaCoerce; private static Method luaCall; private CompiledScript compScript = null; + private final HashMap cachedFunctions = new HashMap<>(); public ScriptContainer(IScriptHandler handler) { this.handler = handler; @@ -173,6 +172,7 @@ public class ScriptContainer { try { if (!evaluated) { + this.cachedFunctions.clear(); engine.eval(getFullCode()); evaluated = true; } @@ -188,7 +188,15 @@ public class ScriptContainer { unknownFunctions.add(type); } } else { - ((Invocable) engine).invokeFunction(type, event); + if (!this.cachedFunctions.containsKey(type)) { + ScriptObjectMirror global = (ScriptObjectMirror) engine.getBindings(ScriptContext.ENGINE_SCOPE); + ScriptObjectMirror func = (ScriptObjectMirror) global.get(type); + this.cachedFunctions.put(type, func); + } + ScriptObjectMirror func = this.cachedFunctions.get(type); + if (func != null) { + func.call(null, event); + } } } catch (NoSuchMethodException e) { unknownFunctions.add(type); From 96496a40e232e3fe065ff98bbceb462981d7b0f8 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 3 Jun 2025 19:06:07 -0400 Subject: [PATCH 002/154] Split Hover Text by New Lines --- .../java/noppes/npcs/client/gui/util/GuiDiagram.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java index 926708989..83a8a7c01 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java @@ -136,12 +136,20 @@ public abstract class GuiDiagram extends Gui { String nameFrom = iconFrom != null ? getIconName(iconFrom) : "Unknown"; String nameTo = iconTo != null ? getIconName(iconTo) : "Unknown"; tooltip.add(nameFrom + " > " + nameTo + ":"); - tooltip.add(conn.hoverText); + // Split Hover Text by newlines + if (conn.hoverText != null && !conn.hoverText.isEmpty()) { + String[] lines = conn.hoverText.split("\n"); + tooltip.addAll(Arrays.asList(lines)); + } if (allowTwoWay) { DiagramConnection reverse = getConnectionByIds(conn.idTo, conn.idFrom); if (reverse != null) { tooltip.add(nameTo + " > " + nameFrom + ":"); - tooltip.add(reverse.hoverText); + // Split Hover Text by newlines + if (reverse.hoverText != null && !reverse.hoverText.isEmpty()) { + String[] lines = reverse.hoverText.split("\n"); + tooltip.addAll(Arrays.asList(lines)); + } } } return tooltip; From 43154bba1583c636d57a10f455c6220bd30006b8 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 3 Jun 2025 19:06:34 -0400 Subject: [PATCH 003/154] 1.10.2 --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 2c7b271e8..d7092be2b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.1" +version = "1.10.2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index f4c2947ac..fddea1379 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -41,7 +41,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.1") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") From 0b60f4b455b293dbd2975291b1c77323e8f6e4ff Mon Sep 17 00:00:00 2001 From: luisc Date: Tue, 3 Jun 2025 18:18:24 -0500 Subject: [PATCH 004/154] small fix HAHAHA --- .../npcs/network/packets/request/role/RoleGetPacket.java | 1 + .../java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java index 762a34ca4..46accdce7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java @@ -55,6 +55,7 @@ public final class RoleGetPacket extends AbstractPacket { NBTTagCompound compound = new NBTTagCompound(); compound.setBoolean("RoleData", true); + compound.setInteger("RoleOrdinal", npc.advanced.role.ordinal()); GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.roleInterface.writeToNBT(compound)); } } diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java index aa00ed09f..2d8466d1c 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java @@ -119,7 +119,7 @@ public class GuiNpcAdvanced extends GuiNPCInterface2 implements IGuiData { @Override public void setGuiData(NBTTagCompound compound) { if (compound.hasKey("RoleData")) { - npc.advanced.setRole(compound.getByte("RoleData")); + npc.advanced.setRole(compound.getInteger("RoleOrdinal")); if (npc.roleInterface != null) npc.roleInterface.readFromNBT(compound); From e973605be6f4511d7fa066611b450a584866babc Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 5 Jun 2025 13:18:33 -0400 Subject: [PATCH 005/154] Make public --- src/main/java/noppes/npcs/entity/data/ModelPartData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/entity/data/ModelPartData.java b/src/main/java/noppes/npcs/entity/data/ModelPartData.java index 53a9a5b19..3aa06ef86 100644 --- a/src/main/java/noppes/npcs/entity/data/ModelPartData.java +++ b/src/main/java/noppes/npcs/entity/data/ModelPartData.java @@ -10,7 +10,7 @@ public class ModelPartData { public byte pattern = 0; public boolean playerTexture; - private ResourceLocation location; + public ResourceLocation location; public ModelPartData() { playerTexture = true; From 43bf4d34274358166841164c56eb36ebbc3f1967 Mon Sep 17 00:00:00 2001 From: luisc Date: Tue, 10 Jun 2025 10:56:25 -0500 Subject: [PATCH 006/154] merged separate gui packet calls in the ProfileChangePacket --- .../player/profile/ProfileChangePacket.java | 11 +++++- .../player/profile/ProfileGetInfoPacket.java | 6 ++- .../player/profile/ProfileGetPacket.java | 6 ++- .../gui/player/inventory/GuiProfiles.java | 39 ++++++++++++------- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java index 983e5e990..1c319753a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java @@ -10,8 +10,10 @@ import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.ChatAlertPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.config.ConfigMain; @@ -60,8 +62,13 @@ public final class ProfileChangePacket extends AbstractPacket { int slot = in.readInt(); ProfileOperation operation = ProfileController.Instance.changeSlot(player, slot); - ProfileGetPacket.sendProfileNBT(player); - ProfileGetInfoPacket.sendProfileInfo(player); + + NBTTagCompound compound = new NBTTagCompound(); + compound.setBoolean("CHANGE_PACKET", true); + compound.setTag("PROFILE", ProfileGetPacket.profileNBTPayload(player)); + compound.setTag("PROFILE_INFO", ProfileGetInfoPacket.profileInfoPayload(player)); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, operation.getMessage()); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java index c4d92d674..25cb641a0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java @@ -57,6 +57,10 @@ public final class ProfileGetInfoPacket extends AbstractPacket { } public static void sendProfileInfo(EntityPlayer player) { + GuiDataPacket.sendGuiData((EntityPlayerMP) player, profileInfoPayload(player)); + } + + public static NBTTagCompound profileInfoPayload(EntityPlayer player) { NBTTagCompound compound = new NBTTagCompound(); compound.setBoolean("PROFILE_INFO", true); NBTTagList slotList = new NBTTagList(); @@ -75,7 +79,7 @@ public final class ProfileGetInfoPacket extends AbstractPacket { } compound.setTag("SLOTS", slotList); } - GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + return compound; } public static HashMap> readProfileInfo(NBTTagCompound compound) { diff --git a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java index 6ef9cdefe..2b7e9801f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java @@ -50,9 +50,13 @@ public final class ProfileGetPacket extends AbstractPacket { } public static void sendProfileNBT(EntityPlayer player) { + GuiDataPacket.sendGuiData((EntityPlayerMP) player, profileNBTPayload(player)); + } + + public static NBTTagCompound profileNBTPayload(EntityPlayer player) { Profile profile = ProfileController.Instance.getProfile(player); NBTTagCompound compound = profile.writeToNBT(); compound.setBoolean("PROFILE", true); - GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + return compound; } } diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java index 0a9f1be87..47ec2c1ef 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java @@ -335,22 +335,15 @@ public class GuiProfiles extends GuiCNPCInventory implements ISubGuiListener, IC public void setGuiData(NBTTagCompound compound) { this.slot = null; - if (compound.hasKey("PROFILE")) { - // Load Profile - this.profile = new Profile(mc.thePlayer, compound); - this.data = new HashMap<>(); - String currentSlot = "\u00A7e"; - String otherSlot = "\u00A7f"; - for (ISlot slot1 : profile.getSlots().values()) { - String name = slot1.getId() + " - " + slot1.getName(); - if (profile.currentSlotId == slot1.getId()) - name = currentSlot + name; - else - name = otherSlot + name; - this.data.put(name, slot1.getId()); - } + if (compound.hasKey("CHANGE_PACKET")) { + this.readProfileCompound( + compound.getCompoundTag("PROFILE")); + this.slotInfoMap = ProfileGetInfoPacket.readProfileInfo( + compound.getCompoundTag("PROFILE_INFO")); + } else if (compound.hasKey("PROFILE")) { + this.readProfileCompound(compound); } else if (compound.hasKey("PROFILE_INFO")) { - slotInfoMap = ProfileGetInfoPacket.readProfileInfo(compound); + this.slotInfoMap = ProfileGetInfoPacket.readProfileInfo(compound); } if (scroll != null) { scroll.setSelected(""); @@ -358,6 +351,22 @@ public class GuiProfiles extends GuiCNPCInventory implements ISubGuiListener, IC initGui(); } + private void readProfileCompound(NBTTagCompound compound) { + // Load Profile + this.profile = new Profile(mc.thePlayer, compound); + this.data = new HashMap<>(); + String currentSlot = "\u00A7e"; + String otherSlot = "\u00A7f"; + for (ISlot slot1 : profile.getSlots().values()) { + String name = slot1.getId() + " - " + slot1.getName(); + if (profile.currentSlotId == slot1.getId()) + name = currentSlot + name; + else + name = otherSlot + name; + this.data.put(name, slot1.getId()); + } + } + /** * Handles mouse clicks for the scrollbar. */ From 7044d8ed6334230995da83a7c36034a001cea1f5 Mon Sep 17 00:00:00 2001 From: luisc Date: Wed, 11 Jun 2025 17:36:03 -0500 Subject: [PATCH 007/154] added a config that determines the order loaded scripts are run in --- .../npcs/controllers/ProfileController.java | 8 ++++---- .../java/noppes/npcs/config/ConfigScript.java | 9 +++++++++ .../npcs/controllers/ScriptContainer.java | 19 ++++++++++++++----- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 7a3a7d8e4..20bf56e28 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -616,6 +616,10 @@ public class ProfileController implements IProfileHandler { ISlot slot = profile.getSlots().get(profile.getCurrentSlotId()); if (slot == null) return; + + PlayerData pdata = PlayerData.get(player); + pdata.profileSlot = profile.getCurrentSlotId(); + for (IProfileData profileData : profileTypes.values()) { NBTTagCompound data; if (slot.getComponents().containsKey(profileData.getTagName())) @@ -628,10 +632,6 @@ public class ProfileController implements IProfileHandler { profileData.save(player); } - PlayerData pdata = PlayerData.get(player); - pdata.profileSlot = profile.getCurrentSlotId(); - pdata.save(); - if (ConfigMain.AttributesEnabled) AttributeController.getTracker(player).recalcAttributes(player); } diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index 8ec60d2b1..81d97780c 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -55,6 +55,9 @@ public class ConfigScript { public static Property EnableBannedClassesProperty; public static boolean EnableBannedClasses = false; + public static Property RunLoadedScriptsFirstProperty; + public static boolean RunLoadedScriptsFirst = true; + public static Property BannedClassesProperty; public final static HashSet BannedClasses = new HashSet<>(); @@ -108,6 +111,12 @@ public class ConfigScript { EnableBannedClassesProperty = config.get(CUSTOMIZATION, "Enable Banned Classes", false, "Enables the Banned Classes Functionality"); EnableBannedClasses = EnableBannedClassesProperty.getBoolean(false); + RunLoadedScriptsFirstProperty = config.get(CUSTOMIZATION, "Run Loaded Scripts First", true, + "If scripts have been loaded from the scripting GUI, the script engine will evaluates them by\n" + + "merging your loaded scripts with your main script, then running the combined script.\n" + + "This config determines the order in while the loaded scripts are merged with your main scripts: before (true), or after (false)."); + RunLoadedScriptsFirst = RunLoadedScriptsFirstProperty.getBoolean(true); + BannedClassesProperty = config.get(CUSTOMIZATION, "Banned Classes", "java.net.URL,java.net.URI", "Comma separated list of classes that cannot be used in scripts through Java.for().\n" + "Classes must be fully written out with library names preceding them.\n" + diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 4eb764103..32bef1699 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -93,22 +93,31 @@ public class ScriptContainer { if (!this.evaluated) { // build includes first StringBuilder sb = new StringBuilder(); - for (String loc : this.scripts) { - String code = ScriptController.Instance.scripts.get(loc); - if (code != null && !code.isEmpty()) { - sb.append(code).append("\n"); - } + if (ConfigScript.RunLoadedScriptsFirst) { + this.appendExternalScripts(sb); } // then your per‐hook script if (this.script != null && !this.script.isEmpty()) { sb.append(this.script).append("\n"); } + if (!ConfigScript.RunLoadedScriptsFirst) { + this.appendExternalScripts(sb); + } this.fullscript = sb.toString(); this.unknownFunctions = new HashSet<>(); } return this.fullscript; } + private void appendExternalScripts(StringBuilder sb) { + for (String loc : this.scripts) { + String code = ScriptController.Instance.scripts.get(loc); + if (code != null && !code.isEmpty()) { + sb.append(code).append("\n"); + } + } + } + public void run(ScriptEngine engine) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); From 70f146cb276a3abdda38504c9a07e70e165905e6 Mon Sep 17 00:00:00 2001 From: luisc Date: Wed, 11 Jun 2025 17:37:17 -0500 Subject: [PATCH 008/154] changed some comments --- src/main/java/noppes/npcs/controllers/ScriptContainer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 32bef1699..523ad8ba9 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -91,15 +91,18 @@ public class ScriptContainer { private String getFullCode() { if (!this.evaluated) { - // build includes first + // build includes first depending on config setting StringBuilder sb = new StringBuilder(); if (ConfigScript.RunLoadedScriptsFirst) { this.appendExternalScripts(sb); } - // then your per‐hook script + + // then your per‐hook main script if (this.script != null && !this.script.isEmpty()) { sb.append(this.script).append("\n"); } + + // build includes last if not built first if (!ConfigScript.RunLoadedScriptsFirst) { this.appendExternalScripts(sb); } From 6a21edb46b7ad22af1c4e2e16ddbf312b9834255 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 23 Jun 2025 23:48:35 -0400 Subject: [PATCH 009/154] Send Party Members to Client --- .../noppes/npcs/controllers/data/Party.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index df826bb9e..7a89e06c7 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -459,6 +459,15 @@ public class Party implements IParty { this.currentQuestID = compound.getInteger("PartyQuestID"); this.currentQuestName = compound.getString("PartyQuestName"); this.friendlyFire = compound.getBoolean("FriendlyFire"); + + NBTTagList list = compound.getTagList("PartyMembers", 10); + for (int i = 0; i < list.tagCount(); i++) { + NBTTagCompound tagCompound = list.getCompoundTagAt(i); + UUID uuid = UUID.fromString(tagCompound.getString("UUID")); + String playerName = tagCompound.getString("PlayerName"); + this.partyOrder.add(uuid); + this.partyMembers.put(uuid, playerName); + } } public NBTTagCompound writeClientNBT() { @@ -466,6 +475,15 @@ public class Party implements IParty { compound.setInteger("PartyQuestID", this.currentQuestID); compound.setString("PartyQuestName", this.currentQuestName); compound.setBoolean("FriendlyFire", this.friendlyFire); + + NBTTagList list = new NBTTagList(); + for (UUID uuid : this.partyOrder) { + NBTTagCompound uuidCompound = new NBTTagCompound(); + uuidCompound.setString("UUID", uuid.toString()); + uuidCompound.setString("PlayerName", this.partyMembers.get(uuid)); + list.appendTag(uuidCompound); + } + compound.setTag("PartyMembers", list); return compound; } } From df32f6dc5066130fa9b2121219d95af93d448245 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 24 Jun 2025 05:41:34 -0400 Subject: [PATCH 010/154] Send full party data to client --- src/main/java/kamkeel/npcs/controllers/SyncController.java | 4 ++++ .../npcs/network/packets/request/party/PartySavePacket.java | 1 + 2 files changed, 5 insertions(+) diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index 03a923485..982d7d494 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -9,6 +9,7 @@ import kamkeel.npcs.network.enums.EnumSyncType; import kamkeel.npcs.network.packets.data.LoginPacket; import kamkeel.npcs.network.packets.data.large.SyncEffectPacket; import kamkeel.npcs.network.packets.data.large.SyncPacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -97,6 +98,9 @@ public class SyncController { DBCAddon.instance.syncPlayer(player); syncPlayerData(player, false); + + // Send party information to the player on login + PartyInfoPacket.sendPartyData(player); } public static NBTTagCompound workbenchNBT() { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java index f4f0987fd..94f97a980 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java @@ -51,6 +51,7 @@ public final class PartySavePacket extends AbstractPacket { if (playerData.partyUUID != null) { Party party = PartyController.Instance().getParty(playerData.partyUUID); party.readClientNBT(ByteBufUtils.readNBT(in)); + PartyController.Instance().pingPartyUpdate(party); } } } From 8ebc372f83e85aca06db14488e18cc329710a7db Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 26 Jun 2025 00:34:23 -0400 Subject: [PATCH 011/154] Fix NBT write errors for parties --- .../java/noppes/npcs/controllers/data/Party.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 7a89e06c7..66988a104 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -217,7 +217,11 @@ public class Party implements IParty { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { return this.partyLeaderName; } else { - return this.getPartyLeader().getCommandSenderName(); + EntityPlayer leader = this.getPartyLeader(); + if (leader != null) + return leader.getCommandSenderName(); + String name = this.partyMembers.get(this.partyLeader); + return name == null ? "" : name; } } @@ -426,12 +430,14 @@ public class Party implements IParty { for (UUID uuid : this.partyOrder) { NBTTagCompound uuidCompound = new NBTTagCompound(); uuidCompound.setString("UUID", uuid.toString()); - uuidCompound.setString("PlayerName", this.partyMembers.get(uuid)); + String name = this.partyMembers.get(uuid); + uuidCompound.setString("PlayerName", name == null ? "" : name); list.appendTag(uuidCompound); } compound.setTag("PartyMembers", list); - compound.setString("PartyLeader", getPartyLeader().getCommandSenderName()); + EntityPlayer leader = getPartyLeader(); + compound.setString("PartyLeader", leader != null ? leader.getCommandSenderName() : ""); Quest quest = (Quest) QuestController.Instance.get(this.getCurrentQuestID()); if (quest != null) { compound.setString("QuestName", quest.getName()); @@ -480,7 +486,8 @@ public class Party implements IParty { for (UUID uuid : this.partyOrder) { NBTTagCompound uuidCompound = new NBTTagCompound(); uuidCompound.setString("UUID", uuid.toString()); - uuidCompound.setString("PlayerName", this.partyMembers.get(uuid)); + String name = this.partyMembers.get(uuid); + uuidCompound.setString("PlayerName", name == null ? "" : name); list.appendTag(uuidCompound); } compound.setTag("PartyMembers", list); From 8b3ae8d73ab07283448a3ae543f6e95c5830b867 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 26 Jun 2025 17:48:24 -0400 Subject: [PATCH 012/154] Make list height public --- build.gradle | 2 +- src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d7092be2b..820fe7ddf 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2" +version = "1.10.2.2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index bb83ef292..c1bd7f66a 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -26,7 +26,7 @@ public class GuiCustomScroll extends GuiScreen { protected int oldHover; private int hoverCount = 0; protected boolean hoverableText = false; - private int listHeight; + public int listHeight; protected int scrollY; protected int maxScrollY; protected int scrollHeight; From 9322cd7429b87a4ac339f4546db69db6f7ebc976 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 09:30:21 +0300 Subject: [PATCH 013/154] Added ActionThread IActions can now be threaded using action.threadify() --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 48 ++++++++++--- .../controllers/data/action/ActionThread.java | 71 +++++++++++++++++++ 3 files changed, 111 insertions(+), 10 deletions(-) create mode 100644 src/main/java/noppes/npcs/controllers/data/action/ActionThread.java diff --git a/src/api b/src/api index bbbea878f..3efd012ae 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit bbbea878fe30ea033112b0c5f1604417d4197447 +Subproject commit 3efd012ae0c465ff39ccfa85986ea966cc1bfa26 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 9bf4e745e..6b2eb6336 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -16,8 +16,10 @@ public class Action implements IAction { protected int maxDuration = -1; protected int updateEveryXTick = 5; protected Consumer task; - private boolean done; - private final Map dataStore = new HashMap<>(); + protected boolean done; + protected final Map dataStore = new HashMap<>(); + protected boolean isThreaded; + protected ActionThread threaded; public Action(ScriptedActionManager manager, String name) { this.manager = manager; @@ -68,13 +70,17 @@ public class Action implements IAction { return; } if (ticksExisted % updateEveryXTick == 0 && task != null) { - try { - task.accept(this); - count++; - } catch (Throwable t) { - System.err.println("Scripted action '" + name + "' threw an exception:"); - t.printStackTrace(); - markDone(); + if (isThreaded) + threaded.run(); + else { + try { + task.accept(this); + count++; + } catch (Throwable t) { + System.err.println("Scripted action '" + name + "' threw an exception:"); + t.printStackTrace(); + markDone(); + } } } duration++; @@ -161,10 +167,34 @@ public class Action implements IAction { @Override public IAction pauseFor(int ticks) { + if (isThreaded) + return threaded.pauseFor(ticks); + this.startAfterTicks = ticks; return this; } + @Override + public IAction pauseFor(long millis) { + if (isThreaded) + return threaded.pauseFor(millis); + + return pauseFor((int) (millis / 50)); + } + + @Override + public boolean isPaused() { + if (isThreaded) + return threaded.isPaused(); + + return startAfterTicks > 0; + } + + @Override + public void threadify() { + isThreaded = true; + threaded = new ActionThread(this); + } @Override public IAction getNext() { boolean seenMe = false; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java new file mode 100644 index 000000000..c0009d940 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -0,0 +1,71 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IAction; + +public class ActionThread { + private Action action; + private Thread thread; + private volatile boolean threadPaused; + private boolean threadRunning; + + public ActionThread(Action action) { + this.action = action; + createThread(); + } + + private void createThread() { + thread = new Thread(() -> { + threadRunning = true; + action.task.accept(action); + threadRunning = false; + action.count++; + }); + } + + public IAction pauseFor(long millis) { + if (Thread.currentThread() == thread) { + try { + threadPaused = true; + Thread.sleep(millis); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + threadPaused = false; + return action; + } + } else + return action.pauseFor((int) (millis / 50)); + } + + public IAction pauseFor(int ticks) { + if (Thread.currentThread() == thread) { + try { + threadPaused = true; + Thread.sleep(ticks * 50); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + threadPaused = false; + return action; + } + } else + return action.pauseFor(ticks); + } + + public boolean isPaused() { + return threadPaused; + } + + public void run() { + if (threadRunning) + return; + + try { + thread.start(); + } catch (Throwable t) { + System.err.println("Scripted threaded action '" + action.name + "' threw an exception:"); + t.printStackTrace(); + action.markDone(); + } + } +} From 6de09c1ee430435efe9d372e05f20a5e10a32c44 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 09:38:38 +0300 Subject: [PATCH 014/154] Added player's ActionManager getter to API --- src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index fb3d3d9ab..93b7aa6e7 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -27,6 +27,7 @@ import noppes.npcs.api.*; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; +import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; import noppes.npcs.api.handler.data.*; import noppes.npcs.api.item.IItemStack; @@ -846,4 +847,9 @@ public class ScriptPlayer extends ScriptLivingBase public IPlayerAttributes getAttributes() { return AttributeController.getTracker(this.player); } + + @Override + public IActionManager getActionManager() { + return data.actionManager; + } } From e001beb6bae2f4a7371e42d0958d9c9e0f77a16a Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 10:06:14 +0300 Subject: [PATCH 015/154] Added global API.getActionManager() --- src/api | 2 +- src/main/java/noppes/npcs/ServerTickHandler.java | 11 ++++++++++- src/main/java/noppes/npcs/scripted/NpcAPI.java | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/api b/src/api index 3efd012ae..f074267f7 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 3efd012ae0c465ff39ccfa85986ea966cc1bfa26 +Subproject commit f074267f73cd3c8480efe354af7b3d8c63480d90 diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index c73874df5..ecfdce50a 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -11,13 +11,22 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; import noppes.npcs.client.AnalyticsTracking; import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.scripted.NpcAPI; import java.net.InetAddress; import java.net.UnknownHostException; public class ServerTickHandler { + @SubscribeEvent - public void onServerTick(TickEvent.WorldTickEvent event) { + public void onServerTick(TickEvent.ServerTickEvent event) { + if (event.phase == Phase.END) { + NpcAPI.actionManager.tick(MinecraftServer.getServer().getTickCounter()); + } + } + + @SubscribeEvent + public void onWorldTick(TickEvent.WorldTickEvent event) { if (event.phase == Phase.START) { NPCSpawning.findChunksForSpawning((WorldServer) event.world); } diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 54d86963d..a514f8508 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -79,6 +79,7 @@ public class NpcAPI extends AbstractNpcAPI { private static final CacheHashMap> scriptItemCache = new CacheHashMap<>(60 * 1000); public static final HashMap engineObjects = new HashMap<>(); public static final EventBus EVENT_BUS = new EventBus(); + public static final ScriptedActionManager actionManager = new ScriptedActionManager(); private static AbstractNpcAPI instance = null; private final static String API_USER_AGENT = "CNPC+API"; @@ -559,6 +560,10 @@ public class NpcAPI extends AbstractNpcAPI { return container instanceof ContainerNpcInterface ? ContainerNpcInterface.getOrCreateIContainer((ContainerNpcInterface) container) : new ScriptContainer(container); } + public IActionManager getActionManager() { + return actionManager; + } + private void checkWorld() { if (CustomNpcs.getServer() == null || CustomNpcs.getServer().isServerStopped()) { throw new CustomNPCsException("No world is loaded right now"); From 70cc7b75e48a1931d8f4d6bbfe847707ac530d3e Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 19:07:19 +0300 Subject: [PATCH 016/154] More important ActionThread pausing frameworks and documentation --- .../npcs/controllers/data/action/Action.java | 45 ++++++++-- .../controllers/data/action/ActionThread.java | 82 +++++++++++++------ 2 files changed, 97 insertions(+), 30 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 6b2eb6336..f61ddb6cd 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -1,11 +1,13 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.ScriptedActionManager; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; +import java.util.function.Supplier; public class Action implements IAction { protected final ScriptedActionManager manager; @@ -168,20 +170,45 @@ public class Action implements IAction { @Override public IAction pauseFor(int ticks) { if (isThreaded) - return threaded.pauseFor(ticks); + threaded.pauseFor(ticks); + else + this.startAfterTicks = ticks; - this.startAfterTicks = ticks; return this; } @Override public IAction pauseFor(long millis) { - if (isThreaded) - return threaded.pauseFor(millis); + if (isThreaded) { + threaded.pauseFor(millis); + return this; + } return pauseFor((int) (millis / 50)); } + @Override + public void pause() { + if (isThreaded) + threaded.pause(); + else + throw new CustomNPCsException("Must threadify() IAction before pausing!"); + } + + @Override + public void pauseUntil(Supplier until) { + if (isThreaded) + threaded.pauseUntil(until); + else + throw new CustomNPCsException("Must threadify() IAction before pausing!"); + } + + @Override + public void resume() { + if (isThreaded) + threaded.resume(); + } + @Override public boolean isPaused() { if (isThreaded) @@ -191,9 +218,13 @@ public class Action implements IAction { } @Override - public void threadify() { - isThreaded = true; - threaded = new ActionThread(this); + public IAction threadify() { + if (!isThreaded) { + isThreaded = true; + threaded = new ActionThread(this); + } + + return this; } @Override public IAction getNext() { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index c0009d940..6effa1310 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -1,13 +1,17 @@ package noppes.npcs.controllers.data.action; -import noppes.npcs.api.handler.data.IAction; +import java.util.function.Supplier; public class ActionThread { - private Action action; + private final Action action; + + private final Object lock = new Object(); private Thread thread; - private volatile boolean threadPaused; + private volatile boolean threadPaused, threadSleeping; private boolean threadRunning; + private Supplier pauseUntil; + public ActionThread(Action action) { this.action = action; createThread(); @@ -22,41 +26,73 @@ public class ActionThread { }); } - public IAction pauseFor(long millis) { - if (Thread.currentThread() == thread) { + + public void pauseFor(long millis) { + if (isPaused()) + return; + + if (inActionThread()) { try { - threadPaused = true; + threadSleeping = true; Thread.sleep(millis); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } finally { - threadPaused = false; - return action; + threadSleeping = false; } } else - return action.pauseFor((int) (millis / 50)); + action.pauseFor((int) (millis / 50)); } - public IAction pauseFor(int ticks) { - if (Thread.currentThread() == thread) { - try { - threadPaused = true; - Thread.sleep(ticks * 50); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } finally { - threadPaused = false; - return action; + public void pauseFor(int ticks) { + pauseFor(ticks * 50L); + } + + public void pause() { + if (!inActionThread() || isPaused()) + return; + + threadPaused = true; + synchronized (lock) { + while (threadPaused) { + try { + lock.wait(); // Wait until notified + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } } - } else - return action.pauseFor(ticks); + } + } + + public void pauseUntil(Supplier until) { + this.pauseUntil = until; + pause(); + } + + public void resume() { + synchronized (lock) { + if (threadPaused) { + threadPaused = false; + lock.notify(); + } + + if (threadSleeping) + thread.interrupt(); + } } public boolean isPaused() { - return threadPaused; + return threadPaused || threadSleeping; } - public void run() { + public boolean inActionThread() { + return Thread.currentThread() == thread; + } + + protected void run() { + if (threadPaused && pauseUntil != null && pauseUntil.get()) + resume(); + if (threadRunning) return; From 203a7949505623c332e0bd426427b9987244bd0f Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 19:07:37 +0300 Subject: [PATCH 017/154] ActionManager.getAction(name) --- src/api | 2 +- .../npcs/scripted/ScriptedActionManager.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/api b/src/api index f074267f7..8ad0c21ef 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit f074267f73cd3c8480efe354af7b3d8c63480d90 +Subproject commit 8ad0c21ef4a368755208f7341ce130ace9586877 diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index 9d62fffac..f76fcbc0d 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -141,6 +141,26 @@ public class ScriptedActionManager implements IActionManager { return actionQueue.peekFirst(); } + @Override + public IAction getAction(String name) { + for (IAction action : actionQueue) { + if (action.getName().equals(name)) + return action; + } + + for (IAction action : parallelActions) { + if (action.getName().equals(name)) + return action; + } + + for (IAction action : conditionalActions) { + if (action.getName().equals(name)) + return action; + } + + return null; + } + @Override public Queue getActionQueue() { return actionQueue; From dd4b0c8b4b739f8c368da73736438bc7b2d9457a Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 28 Jun 2025 19:10:15 +0300 Subject: [PATCH 018/154] ActionManager no longer cleared on entity's death/reset --- src/main/java/noppes/npcs/ScriptPlayerEventHandler.java | 2 +- src/main/java/noppes/npcs/entity/EntityNPCInterface.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 8f8ffbb2f..26b638ac6 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -496,7 +496,7 @@ public class ScriptPlayerEventHandler { EntityPlayer player = (EntityPlayer) event.entityLiving; PlayerData playerData = PlayerData.get(player); - playerData.actionManager.clear(); + // playerData.actionManager.clear(); } if (event.source.getEntity() instanceof EntityPlayerMP) { diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index c79354347..6ff6961f0 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -1168,7 +1168,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti setHealth(getMaxHealth()); dataWatcher.updateObject(14, 0); // animation Normal dataWatcher.updateObject(15, 0); - actionManager.clear(); + // actionManager.clear(); combatHandler.reset(); this.setAttackTarget(null); this.setRevengeTarget(null); From 8ee35e8088a8bdeb79609200747010839e61b1a7 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 09:07:09 +0300 Subject: [PATCH 019/154] IActionManager and IAction QoL --- .../noppes/npcs/controllers/data/action/Action.java | 11 +++++++++-- .../noppes/npcs/scripted/ScriptedActionManager.java | 9 +++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index f61ddb6cd..20244d56a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -115,7 +115,7 @@ public class Action implements IAction { @Override public IAction setMaxDuration(int x) { - this.maxDuration = x; + this.maxDuration = Math.max(-1, x); return this; } @@ -158,7 +158,7 @@ public class Action implements IAction { @Override public IAction setUpdateEveryXTick(int x) { - this.updateEveryXTick = x; + this.updateEveryXTick = Math.max(1, x); return this; } @@ -226,6 +226,13 @@ public class Action implements IAction { return this; } + + @Override + public IAction start() { + manager.start(); + return this; + } + @Override public IAction getNext() { boolean seenMe = false; diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index f76fcbc0d..9d17e3b30 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -105,6 +105,15 @@ public class ScriptedActionManager implements IActionManager { return action; } + @Override + public IAction scheduleAction(String name, Consumer task) { + return scheduleAction(create(name, task)); + } + @Override + public IAction scheduleAction(String name, int startAfterTicks, Consumer task) { + return scheduleAction(create(name, startAfterTicks, task)); + } + @Override public IAction scheduleAction(String name, int maxDuration, int startAfterTicks, Consumer task) { return scheduleAction(create(name, maxDuration, startAfterTicks, task)); From fa9e5cdfe55c50db4d9ac2bc92ac1e528da160f5 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 09:44:20 +0300 Subject: [PATCH 020/154] More IActionManager and IAction QoL !!! --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 4 ++ .../npcs/scripted/ScriptedActionManager.java | 60 +++++++++++++++++-- 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/api b/src/api index 8ad0c21ef..50f30f367 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 8ad0c21ef4a368755208f7341ce130ace9586877 +Subproject commit 50f30f3678970011fcc7d4bdd8928fabc2f84ea0 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 20244d56a..9a28ed23e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -129,6 +129,10 @@ public class Action implements IAction { return done; } + public void kill() { + + } + @Override public Object getData(String key) { return dataStore.get(key); diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index 9d17e3b30..dea0797b4 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -106,7 +106,7 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IAction scheduleAction(String name, Consumer task) { + public IAction scheduleAction(String name, Consumer task) { return scheduleAction(create(name, task)); } @Override @@ -175,6 +175,26 @@ public class ScriptedActionManager implements IActionManager { return actionQueue; } + @Override + public boolean hasAction(String name) { + for (IAction act : actionQueue) + if (act.getName().equals(name)) + return true; + + return false; + } + @Override + public boolean hasAny(String name) { + if (hasAction(name)) + return true; + else if (hasParallel(name)) + return true; + else if (hasConditional(name)) + return true; + + return false; + } + @Override public void clear() { actionQueue.clear(); @@ -242,6 +262,15 @@ public class ScriptedActionManager implements IActionManager { return new ArrayList<>(conditionalActions); } + @Override + public boolean hasConditional(String name) { + for (IAction act : conditionalActions) + if (act.getName().equals(name)) + return true; + + return false; + } + @Override public IAction scheduleParallelAction(IAction action) { parallelActions.add(action); @@ -262,7 +291,10 @@ public class ScriptedActionManager implements IActionManager { if (current instanceof Action) { Action cab = (Action) current; cab.tick(ticksExisted); - if (cab.isDone()) actionQueue.pollFirst(); + if (cab.isDone()) { + cab.kill(); + actionQueue.pollFirst(); + } } // ─── Parallel (all) ─────────────────────────────────────── @@ -270,7 +302,10 @@ public class ScriptedActionManager implements IActionManager { while (pit.hasNext()) { Action a = (Action) pit.next(); a.tick(ticksExisted); - if (a.isDone()) pit.remove(); + if (a.isDone()) { + a.kill(); + pit.remove(); + } } // ─── Conditionals ───────────────────────────────────────── @@ -278,7 +313,10 @@ public class ScriptedActionManager implements IActionManager { while (cit.hasNext()) { ConditionalAction con = (ConditionalAction) cit.next(); con.tick(ticksExisted); - if (con.isDone()) cit.remove(); + if (con.isDone()) { + con.kill(); + cit.remove(); + } } } @@ -291,4 +329,18 @@ public class ScriptedActionManager implements IActionManager { public IActionChain parallelChain() { return new ParallelActionChain(this); } + + @Override + public Queue getParallelActions() { + return parallelActions; + } + + @Override + public boolean hasParallel(String name) { + for (IAction act : parallelActions) + if (act.getName().equals(name)) + return true; + + return false; + } } From e03af5e76f2d73db0c9238af86d114c1bca26209 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 09:47:07 +0300 Subject: [PATCH 021/154] Vastly improved ActionThread --- .../npcs/controllers/data/action/Action.java | 3 +- .../controllers/data/action/ActionThread.java | 82 +++++++++++-------- 2 files changed, 49 insertions(+), 36 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 9a28ed23e..121f6484c 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -130,7 +130,8 @@ public class Action implements IAction { } public void kill() { - + if (threaded != null) + threaded.stop(); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 6effa1310..e00607e76 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -1,5 +1,8 @@ package noppes.npcs.controllers.data.action; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.function.Supplier; public class ActionThread { @@ -7,41 +10,41 @@ public class ActionThread { private final Object lock = new Object(); private Thread thread; + ExecutorService executor; + private Future currentExecution; private volatile boolean threadPaused, threadSleeping; - private boolean threadRunning; private Supplier pauseUntil; public ActionThread(Action action) { this.action = action; - createThread(); - } - private void createThread() { - thread = new Thread(() -> { - threadRunning = true; - action.task.accept(action); - threadRunning = false; - action.count++; + executor = Executors.newSingleThreadExecutor(r -> { + thread = new Thread(r); + thread.setName(String.format("ActionThread (%s)", action.getName())); + return thread; }); } + public void stop() { + if (isThreadRunning()) + currentExecution.cancel(true); + + executor.shutdown(); + } public void pauseFor(long millis) { - if (isPaused()) + if (isPaused() || !inActionThread()) return; - if (inActionThread()) { - try { - threadSleeping = true; - Thread.sleep(millis); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } finally { - threadSleeping = false; - } - } else - action.pauseFor((int) (millis / 50)); + try { + threadSleeping = true; + Thread.sleep(millis); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + threadSleeping = false; + } } public void pauseFor(int ticks) { @@ -76,32 +79,41 @@ public class ActionThread { lock.notify(); } - if (threadSleeping) - thread.interrupt(); + if (threadSleeping && currentExecution != null) + currentExecution.cancel(true); } } - public boolean isPaused() { - return threadPaused || threadSleeping; - } - public boolean inActionThread() { return Thread.currentThread() == thread; } + public boolean isPaused() { + return threadPaused || threadSleeping; + } + + public boolean isThreadRunning() { + return currentExecution != null && !currentExecution.isDone(); + } + + protected void run() { if (threadPaused && pauseUntil != null && pauseUntil.get()) resume(); - if (threadRunning) + if (isThreadRunning()) return; - try { - thread.start(); - } catch (Throwable t) { - System.err.println("Scripted threaded action '" + action.name + "' threw an exception:"); - t.printStackTrace(); - action.markDone(); - } + currentExecution = executor.submit(() -> { + try { + action.task.accept(action); + action.count++; + } catch (Throwable t) { + System.err.println("Scripted threaded action '" + action.name + "' threw an exception:"); + t.printStackTrace(); + action.markDone(); + } + }); + } } From 213c9069de083c9d36b35f09fdf4089f91918eaf Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 09:55:14 +0300 Subject: [PATCH 022/154] Parallel IAction schedulers --- .../noppes/npcs/scripted/ScriptedActionManager.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index dea0797b4..1b6fd82eb 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -276,6 +276,19 @@ public class ScriptedActionManager implements IActionManager { parallelActions.add(action); return action; } + @Override + public IAction scheduleParallelAction(String name, Consumer task) { + return scheduleParallelAction(create(name, task)); + } + @Override + public IAction scheduleParallelAction(String name, int startAfterTicks, Consumer task) { + return scheduleParallelAction(create(name, startAfterTicks, task)); + } + + @Override + public IAction scheduleParallelAction(String name, int maxDuration, int startAfterTicks, Consumer task) { + return scheduleParallelAction(create(name, maxDuration, startAfterTicks, task)); + } /** From 6bb174102571449ea854b9445c4478f59b7b96bb Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 11:04:14 +0300 Subject: [PATCH 023/154] Parallel IAction chain methods --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/api b/src/api index 50f30f367..65c81997b 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 50f30f3678970011fcc7d4bdd8928fabc2f84ea0 +Subproject commit 65c81997b9d552d39ed1005975f9e9824eebccf6 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 121f6484c..39affcd26 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -264,6 +264,32 @@ public class Action implements IAction { return null; } + @Override + public IAction parallel(IAction after) { + return manager.scheduleParallelAction(after); + } + + @Override + public IAction parallel(Consumer task) { + return manager.scheduleParallelAction(manager.create(task)); + } + + @Override + public IAction parallel(int delay, Consumer task) { + return manager.scheduleParallelAction(manager.create(delay, task)); + } + + @Override + public IAction parallel(String name, Consumer task) { + return manager.scheduleParallelAction(manager.create(name, task)); + } + + @Override + public IAction parallel(String name, int startAfterTicks, Consumer task) { + return manager.scheduleParallelAction(manager.create(name, startAfterTicks, task)); + } + + @Override public IAction after(IAction after) { int idx = manager.getIndex(this); From 5994206abd41204e79581a2a56e3db97de0ca34b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 11:22:43 +0300 Subject: [PATCH 024/154] More schedulers and overloading methods !!!! --- .../npcs/scripted/ScriptedActionManager.java | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index 1b6fd82eb..cf9f95bc0 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -40,8 +40,8 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IAction create(String name, int maxDuration, int startAfterTicks, Consumer task) { - return new Action(this, name, maxDuration, startAfterTicks, task); + public IAction create(String name, int maxDuration, int delay, Consumer task) { + return new Action(this, name, maxDuration, delay, task); } @Override @@ -105,18 +105,28 @@ public class ScriptedActionManager implements IActionManager { return action; } + @Override + public IAction scheduleAction(Consumer task) { + return scheduleAction(create(task)); + } + + @Override + public IAction scheduleAction(int delay, Consumer task) { + return scheduleAction(create(delay, task)); + } + @Override public IAction scheduleAction(String name, Consumer task) { return scheduleAction(create(name, task)); } @Override - public IAction scheduleAction(String name, int startAfterTicks, Consumer task) { - return scheduleAction(create(name, startAfterTicks, task)); + public IAction scheduleAction(String name, int delay, Consumer task) { + return scheduleAction(create(name, delay, task)); } @Override - public IAction scheduleAction(String name, int maxDuration, int startAfterTicks, Consumer task) { - return scheduleAction(create(name, maxDuration, startAfterTicks, task)); + public IAction scheduleAction(String name, int maxDuration, int delay, Consumer task) { + return scheduleAction(create(name, maxDuration, delay, task)); } @Override @@ -281,13 +291,13 @@ public class ScriptedActionManager implements IActionManager { return scheduleParallelAction(create(name, task)); } @Override - public IAction scheduleParallelAction(String name, int startAfterTicks, Consumer task) { - return scheduleParallelAction(create(name, startAfterTicks, task)); + public IAction scheduleParallelAction(String name, int delay, Consumer task) { + return scheduleParallelAction(create(name, delay, task)); } @Override - public IAction scheduleParallelAction(String name, int maxDuration, int startAfterTicks, Consumer task) { - return scheduleParallelAction(create(name, maxDuration, startAfterTicks, task)); + public IAction scheduleParallelAction(String name, int maxDuration, int delay, Consumer task) { + return scheduleParallelAction(create(name, maxDuration, delay, task)); } From c31843c318aed356a647a56c068a6cd8d371a486 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 20:57:59 +0300 Subject: [PATCH 025/154] OVERLOAD !! --- .../noppes/npcs/controllers/data/action/Action.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 39affcd26..47fda4b30 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -271,22 +271,27 @@ public class Action implements IAction { @Override public IAction parallel(Consumer task) { - return manager.scheduleParallelAction(manager.create(task)); + return parallel(manager.create(task)); } @Override public IAction parallel(int delay, Consumer task) { - return manager.scheduleParallelAction(manager.create(delay, task)); + return parallel(manager.create(delay, task)); } @Override public IAction parallel(String name, Consumer task) { - return manager.scheduleParallelAction(manager.create(name, task)); + return parallel(manager.create(name, task)); } @Override public IAction parallel(String name, int startAfterTicks, Consumer task) { - return manager.scheduleParallelAction(manager.create(name, startAfterTicks, task)); + return parallel(manager.create(name, startAfterTicks, task)); + } + + @Override + public IAction parallel(String name, int maxDuration, int delay, Consumer t) { + return parallel(manager.create(name, maxDuration, delay, t)); } From 772fc5ef6d04190976ed92103ec885dfcceb9e31 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 20:59:43 +0300 Subject: [PATCH 026/154] Refactor --- .../npcs/controllers/data/action/Action.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 47fda4b30..e402fea58 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -21,7 +21,7 @@ public class Action implements IAction { protected boolean done; protected final Map dataStore = new HashMap<>(); protected boolean isThreaded; - protected ActionThread threaded; + protected ActionThread actionThread; public Action(ScriptedActionManager manager, String name) { this.manager = manager; @@ -73,7 +73,7 @@ public class Action implements IAction { } if (ticksExisted % updateEveryXTick == 0 && task != null) { if (isThreaded) - threaded.run(); + actionThread.run(); else { try { task.accept(this); @@ -130,8 +130,8 @@ public class Action implements IAction { } public void kill() { - if (threaded != null) - threaded.stop(); + if (actionThread != null) + actionThread.stop(); } @Override @@ -175,7 +175,7 @@ public class Action implements IAction { @Override public IAction pauseFor(int ticks) { if (isThreaded) - threaded.pauseFor(ticks); + actionThread.pauseFor(ticks); else this.startAfterTicks = ticks; @@ -185,7 +185,7 @@ public class Action implements IAction { @Override public IAction pauseFor(long millis) { if (isThreaded) { - threaded.pauseFor(millis); + actionThread.pauseFor(millis); return this; } @@ -195,7 +195,7 @@ public class Action implements IAction { @Override public void pause() { if (isThreaded) - threaded.pause(); + actionThread.pause(); else throw new CustomNPCsException("Must threadify() IAction before pausing!"); } @@ -203,7 +203,7 @@ public class Action implements IAction { @Override public void pauseUntil(Supplier until) { if (isThreaded) - threaded.pauseUntil(until); + actionThread.pauseUntil(until); else throw new CustomNPCsException("Must threadify() IAction before pausing!"); } @@ -211,13 +211,13 @@ public class Action implements IAction { @Override public void resume() { if (isThreaded) - threaded.resume(); + actionThread.resume(); } @Override public boolean isPaused() { if (isThreaded) - return threaded.isPaused(); + return actionThread.isPaused(); return startAfterTicks > 0; } @@ -226,7 +226,7 @@ public class Action implements IAction { public IAction threadify() { if (!isThreaded) { isThreaded = true; - threaded = new ActionThread(this); + actionThread = new ActionThread(this); } return this; From bdbf30d328ccc4a3a1ca6b8885955a651cd7b17f Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 21:06:15 +0300 Subject: [PATCH 027/154] Another ActionThread overhaul --- .../npcs/controllers/data/action/Action.java | 28 +++++++------ .../controllers/data/action/ActionThread.java | 41 +++++++++---------- 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index e402fea58..770487714 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -67,23 +67,27 @@ public class Action implements IAction { startAfterTicks--; return; } - if (maxDuration != -1 && duration >= maxDuration) { + if (maxDuration > -1 && duration >= maxDuration) { markDone(); return; } if (ticksExisted % updateEveryXTick == 0 && task != null) { if (isThreaded) - actionThread.run(); - else { - try { - task.accept(this); - count++; - } catch (Throwable t) { - System.err.println("Scripted action '" + name + "' threw an exception:"); - t.printStackTrace(); - markDone(); - } - } + actionThread.execute(this::executeTask); + else + executeTask(); + } + duration++; + } + + protected void executeTask() { + try { + task.accept(this); + count++; + } catch (Throwable t) { + System.err.println("IAction '" + name + "' threw an exception:"); + t.printStackTrace(); + markDone(); } duration++; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index e00607e76..8c381aa4d 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -1,24 +1,24 @@ package noppes.npcs.controllers.data.action; +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; public class ActionThread { - private final Action action; - private final Object lock = new Object(); private Thread thread; ExecutorService executor; - private Future currentExecution; + private final Queue> runningTasks = new ConcurrentLinkedQueue<>(); + private volatile boolean threadPaused, threadSleeping; private Supplier pauseUntil; public ActionThread(Action action) { - this.action = action; - executor = Executors.newSingleThreadExecutor(r -> { thread = new Thread(r); thread.setName(String.format("ActionThread (%s)", action.getName())); @@ -27,8 +27,10 @@ public class ActionThread { } public void stop() { - if (isThreadRunning()) - currentExecution.cancel(true); + runningTasks.forEach((task) -> { + if (!task.isDone()) + task.cancel(true); + }); executor.shutdown(); } @@ -79,8 +81,8 @@ public class ActionThread { lock.notify(); } - if (threadSleeping && currentExecution != null) - currentExecution.cancel(true); + if (threadSleeping) + thread.interrupt(); } } @@ -93,27 +95,24 @@ public class ActionThread { } public boolean isThreadRunning() { - return currentExecution != null && !currentExecution.isDone(); + return runningTasks.stream().anyMatch(task -> !task.isDone()); } - - protected void run() { + protected void execute(Runnable task) { if (threadPaused && pauseUntil != null && pauseUntil.get()) resume(); if (isThreadRunning()) return; - currentExecution = executor.submit(() -> { + final AtomicReference> taskRef = new AtomicReference<>(); + taskRef.set(executor.submit(() -> { + runningTasks.add(taskRef.get()); try { - action.task.accept(action); - action.count++; - } catch (Throwable t) { - System.err.println("Scripted threaded action '" + action.name + "' threw an exception:"); - t.printStackTrace(); - action.markDone(); + task.run(); + } finally { + runningTasks.remove(taskRef.get()); } - }); - + })); } } From 5d4721dc202a77d4e688f2ed0922a1a6f925f24a Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 29 Jun 2025 14:32:24 -0400 Subject: [PATCH 028/154] Public --- .../java/noppes/npcs/client/gui/util/GuiCustomScroll.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index c1bd7f66a..e8f5d804f 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -27,9 +27,9 @@ public class GuiCustomScroll extends GuiScreen { private int hoverCount = 0; protected boolean hoverableText = false; public int listHeight; - protected int scrollY; - protected int maxScrollY; - protected int scrollHeight; + public int scrollY; + public int maxScrollY; + public int scrollHeight; private boolean isScrolling; public boolean multipleSelection = false; private ICustomScrollListener listener; From 585ebdcc2f8ac3cc9385e2f0d4e2441665bdb04b Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 29 Jun 2025 14:40:49 -0400 Subject: [PATCH 029/154] Add config for clearing action manager on death --- src/main/java/noppes/npcs/ScriptPlayerEventHandler.java | 4 +++- src/main/java/noppes/npcs/config/ConfigScript.java | 5 +++++ src/main/java/noppes/npcs/entity/EntityNPCInterface.java | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 26b638ac6..63a9da703 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -32,6 +32,7 @@ import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ScriptController; +import noppes.npcs.config.ConfigScript; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemNpcTool; @@ -496,7 +497,8 @@ public class ScriptPlayerEventHandler { EntityPlayer player = (EntityPlayer) event.entityLiving; PlayerData playerData = PlayerData.get(player); - // playerData.actionManager.clear(); + if (ConfigScript.ClearActionsOnDeath) + playerData.actionManager.clear(); } if (event.source.getEntity() instanceof EntityPlayerMP) { diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index 81d97780c..91d65ec41 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -63,6 +63,9 @@ public class ConfigScript { public static int ActionManagerTickDefault = 5; + public static Property ClearActionsOnDeathProperty; + public static boolean ClearActionsOnDeath = true; + public static boolean IndividualPlayerScripts = false; public static void init(File configFile) { @@ -125,6 +128,8 @@ public class ConfigScript { IndividualPlayerScripts = config.get(CUSTOMIZATION, "Individual Player Scripts", false, "Acts similar to CNPC 1.12 where Player Scripts like Init are run PER Player").getBoolean(false); ActionManagerTickDefault = config.get(CUSTOMIZATION, "Action Manager Tick Default", ActionManagerTickDefault, "How frequent to update the action manager ticking tasks").getInt(ActionManagerTickDefault); + ClearActionsOnDeathProperty = config.get(CUSTOMIZATION, "Clear Actions On Death", true, "If true, clears the Action Manager for players and NPCs when they die"); + ClearActionsOnDeath = ClearActionsOnDeathProperty.getBoolean(true); // Convert to Legacy if (CustomNpcs.legacyExist) { diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 6ff6961f0..796cec2fa 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -66,6 +66,7 @@ import noppes.npcs.api.handler.data.ILine; import noppes.npcs.api.item.IItemStack; import noppes.npcs.client.EntityUtil; import noppes.npcs.config.ConfigMain; +import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.*; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; @@ -1168,7 +1169,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti setHealth(getMaxHealth()); dataWatcher.updateObject(14, 0); // animation Normal dataWatcher.updateObject(15, 0); - // actionManager.clear(); + if (ConfigScript.ClearActionsOnDeath) + actionManager.clear(); combatHandler.reset(); this.setAttackTarget(null); this.setRevengeTarget(null); From 5dad2f13ded666aabd2cc5917f23f535657cf311 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 29 Jun 2025 14:46:08 -0400 Subject: [PATCH 030/154] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 820fe7ddf..755eef405 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2.2" +version = "1.10.2.3" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" From 63d019dfd0c6ac0a0835a382cf0a0cc8c2aa7c3d Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 29 Jun 2025 14:49:24 -0400 Subject: [PATCH 031/154] Update api --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index 65c81997b..30f3e562c 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 65c81997b9d552d39ed1005975f9e9824eebccf6 +Subproject commit 30f3e562c8b07d6b1517bc8e52370330a4aa6480 From 78bb39e4c724b5d4cc049dd18069e914bde33deb Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 21:56:15 +0300 Subject: [PATCH 032/154] ActionThread --- .../npcs/controllers/data/action/Action.java | 2 +- .../npcs/controllers/data/action/ActionThread.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 770487714..4a83ab0a8 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -73,7 +73,7 @@ public class Action implements IAction { } if (ticksExisted % updateEveryXTick == 0 && task != null) { if (isThreaded) - actionThread.execute(this::executeTask); + actionThread.execute("task", this::executeTask); else executeTask(); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 8c381aa4d..9c0d29fd4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -1,10 +1,8 @@ package noppes.npcs.controllers.data.action; import java.util.Queue; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; +import java.util.Set; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; @@ -12,7 +10,9 @@ public class ActionThread { private final Object lock = new Object(); private Thread thread; ExecutorService executor; + private final Queue> runningTasks = new ConcurrentLinkedQueue<>(); + private final Set runningKeys = ConcurrentHashMap.newKeySet(); private volatile boolean threadPaused, threadSleeping; @@ -98,20 +98,22 @@ public class ActionThread { return runningTasks.stream().anyMatch(task -> !task.isDone()); } - protected void execute(Runnable task) { + protected void execute(String taskKey, Runnable task) { if (threadPaused && pauseUntil != null && pauseUntil.get()) resume(); - if (isThreadRunning()) + if (runningKeys.contains(taskKey)) return; final AtomicReference> taskRef = new AtomicReference<>(); taskRef.set(executor.submit(() -> { runningTasks.add(taskRef.get()); + runningKeys.add(taskKey); try { task.run(); } finally { runningTasks.remove(taskRef.get()); + runningKeys.remove(taskKey); } })); } From f662d8416e67ddc655ef31dbf6d51089d22855c6 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 21:57:31 +0300 Subject: [PATCH 033/154] Implemented actionThread to IConditionalActions --- src/api | 2 +- .../data/action/ConditionalAction.java | 77 ++++++++++++------- 2 files changed, 51 insertions(+), 28 deletions(-) diff --git a/src/api b/src/api index 65c81997b..34ed09542 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 65c81997b9d552d39ed1005975f9e9824eebccf6 +Subproject commit 34ed095423eda1a1289ba10cbe07e2d93875d0a6 diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index 9baf1d999..522b626ad 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -47,41 +47,64 @@ public class ConditionalAction extends Action implements IConditionalAction { @Override public void tick(int ticksExisted) { - if (isDone()) return; + if (done) + return; - try { - if (ticksExisted % updateEveryXTick == 0) { - checkCount++; - boolean terminated = terminateWhen != null && terminateWhen.get(); + if (maxChecks > -1 && checkCount > maxChecks) { + markDone(); + return; + } - if (terminated && onTermination != null) { - try { - onTermination.accept(this); - } catch (Throwable t) { - System.err.println("Error in onTermination for conditional '" + getName() + "':"); - t.printStackTrace(); - } - } - - if ((maxChecks >= 0 && checkCount > maxChecks) || terminated) { - markDone(); - return; - } - - if (condition != null && condition.get()) { - task.accept(this); - taskExecuted = true; - } + if (ticksExisted % updateEveryXTick == 0) { + if (condition != null && condition.get()) { + if (isThreaded) + actionThread.execute("task", this::executeTask); + else + executeTask(); } + + if (isTerminated()) { + if (onTermination != null) { + if (isThreaded) + actionThread.execute("onTermination", this::executeOnTermination); + else + executeOnTermination(); + } + markDone(); + return; + } + + checkCount++; + } + duration++; + } + + protected void executeTask() { + try { + task.accept(this); + count++; + taskExecuted = true; } catch (Throwable t) { - System.err.println("Scripted conditional '" + getName() + "' threw an exception:"); + System.err.println("IConditionalAction '" + getName() + "' threw an exception:"); t.printStackTrace(); markDone(); - } finally { - duration++; } } + protected void executeOnTermination() { + try { + onTermination.accept(this); + } catch (Throwable t) { + System.err.println("IConditionalAction's onTermination '" + getName() + "' threw an exception:"); + t.printStackTrace(); + } + } + + @Override + public boolean isTerminated() { + return terminateWhen != null && terminateWhen.get(); + } + @Override public IConditionalAction setMaxChecks(int maxChecks) { this.maxChecks = maxChecks; @@ -123,7 +146,7 @@ public class ConditionalAction extends Action implements IConditionalAction { @Override public IConditionalAction after(IConditionalAction after) { - return ((ScriptedActionManager) manager).scheduleAction(after); + return manager.scheduleAction(after); } @Override From f86db24def22d5dfb63004b2343520f0fa5dad02 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 29 Jun 2025 22:30:15 +0300 Subject: [PATCH 034/154] IEntity.getCollidingEntities --- .../npcs/scripted/entity/ScriptEntity.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index 7564562f8..cee7a89a4 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; import net.minecraft.nbt.NBTTagString; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraft.world.WorldServer; import noppes.npcs.NoppesUtilServer; @@ -464,6 +465,31 @@ public class ScriptEntity implements IEntity { } } + + @Override + public IEntity[] getCollidingEntities() { + AxisAlignedBB axisalignedbb; + boolean isPl = entity instanceof EntityPlayer; + + if (entity.ridingEntity != null && entity.ridingEntity.isEntityAlive()) { + axisalignedbb = entity.boundingBox.func_111270_a(entity.ridingEntity.boundingBox).expand(isPl ? 0 : 1.0D, 0.0D, isPl ? 0 : 1.0D); + } else { + axisalignedbb = entity.boundingBox.expand(isPl ? 0 : 1.0D, isPl ? 0 : 0.5D, isPl ? 0 : 1.0D); + } + + List entities = (List) entity.worldObj.getEntitiesWithinAABBExcludingEntity(entity, axisalignedbb); + List list = new ArrayList<>(); + + for (Entity living : entities) { + if (living.isEntityAlive()) + list.add(NpcAPI.Instance().getIEntity(living)); + } + + + return list.toArray(new IEntity[list.size()]); + } + + /** * @param range The search range for entities around this entity * @return Array of entities within range From 74198534af8e68863d5b3075977e07490f6818e8 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 07:15:34 +0300 Subject: [PATCH 035/154] INFINITE OVERLOADS !!!!! --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 102 ++++++++++++------ .../data/action/ConditionalAction.java | 34 ------ .../npcs/scripted/ScriptedActionManager.java | 25 +++++ 4 files changed, 97 insertions(+), 66 deletions(-) diff --git a/src/api b/src/api index 34ed09542..c0aae432d 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 34ed095423eda1a1289ba10cbe07e2d93875d0a6 +Subproject commit c0aae432d6a69b25a6f4b1c78fb46079383cef73 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 4a83ab0a8..d2ce3f9df 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.ScriptedActionManager; @@ -55,6 +56,11 @@ public class Action implements IAction { this.startAfterTicks = startAfterTicks; } + public Action(ScriptedActionManager manager, int maxDuration, int startAfterTicks, Consumer task) { + this(manager, startAfterTicks, task); + this.maxDuration = maxDuration; + } + @Override public IAction setTask(Consumer task) { this.task = task; @@ -268,37 +274,6 @@ public class Action implements IAction { return null; } - @Override - public IAction parallel(IAction after) { - return manager.scheduleParallelAction(after); - } - - @Override - public IAction parallel(Consumer task) { - return parallel(manager.create(task)); - } - - @Override - public IAction parallel(int delay, Consumer task) { - return parallel(manager.create(delay, task)); - } - - @Override - public IAction parallel(String name, Consumer task) { - return parallel(manager.create(name, task)); - } - - @Override - public IAction parallel(String name, int startAfterTicks, Consumer task) { - return parallel(manager.create(name, startAfterTicks, task)); - } - - @Override - public IAction parallel(String name, int maxDuration, int delay, Consumer t) { - return parallel(manager.create(name, maxDuration, delay, t)); - } - - @Override public IAction after(IAction after) { int idx = manager.getIndex(this); @@ -362,4 +337,69 @@ public class Action implements IAction { public IAction before(Consumer t) { return before(manager.create(t)); } + + @Override + public IConditionalAction conditional(IConditionalAction after) { + return manager.scheduleAction(after); + } + + @Override + public IConditionalAction conditional(Supplier condition, Consumer task) { + return conditional(manager.create(condition, task)); + } + + @Override + public IConditionalAction conditional(String name, Supplier condition, Consumer task) { + return conditional(manager.create(name, condition, task)); + } + + @Override + public IConditionalAction conditional(Supplier condition, Consumer task, Supplier terminateWhen) { + return conditional(manager.create(condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(String name, Supplier condition, Consumer task, Supplier terminateWhen) { + return conditional(manager.create(name, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + return conditional(manager.create(condition, task, terminateWhen, onTermination)); + } + + @Override + public IConditionalAction conditional(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); + } + + @Override + public IAction parallel(IAction after) { + return manager.scheduleParallelAction(after); + } + + @Override + public IAction parallel(Consumer task) { + return parallel(manager.create(task)); + } + + @Override + public IAction parallel(int delay, Consumer task) { + return parallel(manager.create(delay, task)); + } + + @Override + public IAction parallel(String name, Consumer task) { + return parallel(manager.create(name, task)); + } + + @Override + public IAction parallel(String name, int startAfterTicks, Consumer task) { + return parallel(manager.create(name, startAfterTicks, task)); + } + + @Override + public IAction parallel(String name, int maxDuration, int delay, Consumer t) { + return parallel(manager.create(name, maxDuration, delay, t)); + } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index 522b626ad..28ddf36cf 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -144,38 +144,4 @@ public class ConditionalAction extends Action implements IConditionalAction { return maxChecks; } - @Override - public IConditionalAction after(IConditionalAction after) { - return manager.scheduleAction(after); - } - - @Override - public IConditionalAction after(Supplier condition, Consumer task) { - return after(manager.create(condition, task)); - } - - @Override - public IConditionalAction after(String name, Supplier condition, Consumer task) { - return after(manager.create(name, condition, task)); - } - - @Override - public IConditionalAction after(Supplier condition, Consumer task, Supplier terminateWhen) { - return after(manager.create(condition, task, terminateWhen)); - } - - @Override - public IConditionalAction after(String name, Supplier condition, Consumer task, Supplier terminateWhen) { - return after(manager.create(name, condition, task, terminateWhen)); - } - - @Override - public IConditionalAction after(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return after(manager.create(condition, task, terminateWhen, onTermination)); - } - - @Override - public IConditionalAction after(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { - return after(manager.create(name, condition, task, terminateWhen, onTermination)); - } } diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index cf9f95bc0..9df292a1d 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -39,6 +39,10 @@ public class ScriptedActionManager implements IActionManager { return new Action(this, t); } + @Override + public IAction create(int maxDuration, int delay, Consumer task) { + return new Action(this, maxDuration, delay, task); + } @Override public IAction create(String name, int maxDuration, int delay, Consumer task) { return new Action(this, name, maxDuration, delay, task); @@ -115,6 +119,11 @@ public class ScriptedActionManager implements IActionManager { return scheduleAction(create(delay, task)); } + @Override + public IAction scheduleAction(int maxDuration, int delay, Consumer task) { + return scheduleAction(create(maxDuration, delay, task)); + } + @Override public IAction scheduleAction(String name, Consumer task) { return scheduleAction(create(name, task)); @@ -245,6 +254,22 @@ public class ScriptedActionManager implements IActionManager { /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Conditionals + @Override + public IConditionalAction scheduleAction(Supplier condition, Consumer task) { + return scheduleAction(new ConditionalAction(this, condition, task)); + } + + @Override + public IConditionalAction scheduleAction(Supplier condition, Consumer task, Supplier terminateWhen) { + return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction scheduleAction(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); + } + + @Override public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task) { return scheduleAction(new ConditionalAction(this, name, condition, task)); From 6a04a0ea28c8bd9adbbf3a50ea56954aba181782 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 08:21:50 +0300 Subject: [PATCH 036/154] IAction exceptions now report to CNPC+ script console --- .../npcs/controllers/data/action/Action.java | 38 ++++++++++++------- .../data/action/ConditionalAction.java | 15 +++++++- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index d2ce3f9df..af0e28320 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -2,8 +2,10 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.ScriptedActionManager; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.HashMap; import java.util.Map; @@ -24,28 +26,20 @@ public class Action implements IAction { protected boolean isThreaded; protected ActionThread actionThread; + protected ScriptContainer reportTo; + public Action(ScriptedActionManager manager, String name) { this.manager = manager; this.name = name; + + if (ScriptContainer.Current != null) + reportTo = ScriptContainer.Current; } public Action(ScriptedActionManager manager, Consumer task) { this(manager, task.toString(), task); } - public Action(ScriptedActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer task) { - this.manager = manager; - this.name = name; - this.maxDuration = maxDuration; - this.startAfterTicks = startAfterTicks; - this.task = task; - } - - public Action(ScriptedActionManager manager, String name, int startAfterTicks, Consumer task) { - this(manager, name, task); - this.startAfterTicks = startAfterTicks; - } - public Action(ScriptedActionManager manager, String name, Consumer task) { this(manager, name); this.task = task; @@ -56,11 +50,22 @@ public class Action implements IAction { this.startAfterTicks = startAfterTicks; } + public Action(ScriptedActionManager manager, String name, int startAfterTicks, Consumer task) { + this(manager, name, task); + this.startAfterTicks = startAfterTicks; + } + public Action(ScriptedActionManager manager, int maxDuration, int startAfterTicks, Consumer task) { this(manager, startAfterTicks, task); this.maxDuration = maxDuration; } + public Action(ScriptedActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer task) { + this(manager, name, startAfterTicks, task); + this.maxDuration = maxDuration; + } + + @Override public IAction setTask(Consumer task) { this.task = task; @@ -91,7 +96,12 @@ public class Action implements IAction { task.accept(this); count++; } catch (Throwable t) { - System.err.println("IAction '" + name + "' threw an exception:"); + String err = "IAction '" + name + "' threw an exception:"; + + if (reportTo != null) + reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); + + System.err.println(err); t.printStackTrace(); markDone(); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index 28ddf36cf..7d8a0e72e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -3,6 +3,7 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.scripted.ScriptedActionManager; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.function.Consumer; import java.util.function.Supplier; @@ -85,7 +86,12 @@ public class ConditionalAction extends Action implements IConditionalAction { count++; taskExecuted = true; } catch (Throwable t) { - System.err.println("IConditionalAction '" + getName() + "' threw an exception:"); + String err = "IConditionalAction '" + getName() + "' threw an exception:"; + + if (reportTo != null) + reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); + + System.err.println(err); t.printStackTrace(); markDone(); } @@ -95,7 +101,12 @@ public class ConditionalAction extends Action implements IConditionalAction { try { onTermination.accept(this); } catch (Throwable t) { - System.err.println("IConditionalAction's onTermination '" + getName() + "' threw an exception:"); + String err = "IConditionalAction's onTermination '" + getName() + "' threw an exception:"; + + if (reportTo != null) + reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); + + System.err.println(err); t.printStackTrace(); } } From bc2bab889d93b1b197818da6c549e092f812d9b7 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 08:59:51 +0300 Subject: [PATCH 037/154] cleared ActionManager on NPC delete --- .../npcs/controllers/data/action/Action.java | 4 + .../npcs/entity/EntityNPCInterface.java | 2 + .../npcs/scripted/ScriptedActionManager.java | 79 ++++++++++--------- 3 files changed, 48 insertions(+), 37 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index af0e28320..8ce816541 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -149,9 +149,13 @@ public class Action implements IAction { return done; } + @Override public void kill() { if (actionThread != null) actionThread.stop(); + + dataStore.clear(); + done = true; } @Override diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 796cec2fa..56808721a 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -1407,6 +1407,8 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti roleInterface.delete(); if (advanced.job != EnumJobType.None && jobInterface != null) jobInterface.delete(); + actionManager.clear(); + super.setDead(); } diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index 9df292a1d..fe00fd064 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -214,43 +214,6 @@ public class ScriptedActionManager implements IActionManager { return false; } - @Override - public void clear() { - actionQueue.clear(); - parallelActions.clear(); - conditionalActions.clear(); - } - - @Override - public boolean cancelAction(String name) { - Iterator acts = actionQueue.iterator(); - while (acts.hasNext()) { - IAction act = acts.next(); - if (act.getName().equals(name)) { - acts.remove(); - return true; - } - } - - Iterator pit = parallelActions.iterator(); - while (pit.hasNext()) { - if (pit.next().getName().equals(name)) { - pit.remove(); - return true; - } - } - - Iterator cons = conditionalActions.iterator(); - while (cons.hasNext()) { - IConditionalAction con = cons.next(); - if (con.getName().equals(name)) { - cons.remove(); - return true; - } - } - return false; - } - /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Conditionals @@ -368,6 +331,48 @@ public class ScriptedActionManager implements IActionManager { } } + @Override + public void clear() { + actionQueue.forEach((act) -> act.kill()); + actionQueue.clear(); + + parallelActions.forEach((act) -> act.kill()); + parallelActions.clear(); + + conditionalActions.forEach((act) -> act.kill()); + conditionalActions.clear(); + } + + @Override + public boolean cancelAction(String name) { + Iterator acts = actionQueue.iterator(); + while (acts.hasNext()) { + IAction act = acts.next(); + if (act.getName().equals(name)) { + acts.remove(); + return true; + } + } + + Iterator pit = parallelActions.iterator(); + while (pit.hasNext()) { + if (pit.next().getName().equals(name)) { + pit.remove(); + return true; + } + } + + Iterator cons = conditionalActions.iterator(); + while (cons.hasNext()) { + IConditionalAction con = cons.next(); + if (con.getName().equals(name)) { + cons.remove(); + return true; + } + } + return false; + } + @Override public IActionChain chain() { return new ActionChain(this); From 31a25acd20a30dc6e03a740f76524b5745794542 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 09:15:34 +0300 Subject: [PATCH 038/154] Canged all the IConditionalAction Supplier instances (condition,terminateWhen,pauseUntil) to Function --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 16 +++++------ .../controllers/data/action/ActionThread.java | 12 ++++++--- .../data/action/ConditionalAction.java | 27 ++++++++++--------- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/api b/src/api index c0aae432d..f998e8feb 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit c0aae432d6a69b25a6f4b1c78fb46079383cef73 +Subproject commit f998e8feb4e45e130632df26a313016031ad82d0 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 8ce816541..659dbcd04 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; public class Action implements IAction { protected final ScriptedActionManager manager; @@ -225,7 +225,7 @@ public class Action implements IAction { } @Override - public void pauseUntil(Supplier until) { + public void pauseUntil(Function until) { if (isThreaded) actionThread.pauseUntil(until); else @@ -358,32 +358,32 @@ public class Action implements IAction { } @Override - public IConditionalAction conditional(Supplier condition, Consumer task) { + public IConditionalAction conditional(Function condition, Consumer task) { return conditional(manager.create(condition, task)); } @Override - public IConditionalAction conditional(String name, Supplier condition, Consumer task) { + public IConditionalAction conditional(String name, Function condition, Consumer task) { return conditional(manager.create(name, condition, task)); } @Override - public IConditionalAction conditional(Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { return conditional(manager.create(condition, task, terminateWhen)); } @Override - public IConditionalAction conditional(String name, Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { return conditional(manager.create(name, condition, task, terminateWhen)); } @Override - public IConditionalAction conditional(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return conditional(manager.create(condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction conditional(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 9c0d29fd4..b8f5f3361 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -1,12 +1,17 @@ package noppes.npcs.controllers.data.action; +import noppes.npcs.api.handler.data.IAction; + import java.util.Queue; import java.util.Set; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; import java.util.function.Supplier; public class ActionThread { + private Action action; + private final Object lock = new Object(); private Thread thread; ExecutorService executor; @@ -16,9 +21,10 @@ public class ActionThread { private volatile boolean threadPaused, threadSleeping; - private Supplier pauseUntil; + private Function pauseUntil; public ActionThread(Action action) { + this.action = action; executor = Executors.newSingleThreadExecutor(r -> { thread = new Thread(r); thread.setName(String.format("ActionThread (%s)", action.getName())); @@ -69,7 +75,7 @@ public class ActionThread { } } - public void pauseUntil(Supplier until) { + public void pauseUntil(Function until) { this.pauseUntil = until; pause(); } @@ -99,7 +105,7 @@ public class ActionThread { } protected void execute(String taskKey, Runnable task) { - if (threadPaused && pauseUntil != null && pauseUntil.get()) + if (threadPaused && pauseUntil != null && pauseUntil.apply(action)) resume(); if (runningKeys.contains(taskKey)) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index 7d8a0e72e..c61b9cf6b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -6,42 +6,43 @@ import noppes.npcs.scripted.ScriptedActionManager; import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; + public class ConditionalAction extends Action implements IConditionalAction { - private Supplier condition; - private Supplier terminateWhen; + private Function condition; + private Function terminateWhen; private Consumer onTermination; private int maxChecks = -1; private int checkCount; private boolean taskExecuted; - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task) { + public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task) { super(manager, "conditional", task); this.condition = condition; } - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task) { + public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task) { super(manager, name, task); this.condition = condition; } - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task, Supplier terminateWhen) { + public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task, Function terminateWhen) { this(manager, condition, task); this.terminateWhen = terminateWhen; } - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task, Supplier terminateWhen) { + public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task, Function terminateWhen) { this(manager, name, condition, task); this.terminateWhen = terminateWhen; } - public ConditionalAction(ScriptedActionManager manager, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { this(manager, condition, task, terminateWhen); this.onTermination = onTermination; } - public ConditionalAction(ScriptedActionManager manager, String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { this(manager, name, condition, task, terminateWhen); this.onTermination = onTermination; } @@ -57,7 +58,7 @@ public class ConditionalAction extends Action implements IConditionalAction { } if (ticksExisted % updateEveryXTick == 0) { - if (condition != null && condition.get()) { + if (condition != null && condition.apply(this)) { if (isThreaded) actionThread.execute("task", this::executeTask); else @@ -113,7 +114,7 @@ public class ConditionalAction extends Action implements IConditionalAction { @Override public boolean isTerminated() { - return terminateWhen != null && terminateWhen.get(); + return terminateWhen != null && terminateWhen.apply(this); } @Override @@ -123,13 +124,13 @@ public class ConditionalAction extends Action implements IConditionalAction { } @Override - public IConditionalAction setCondition(Supplier condition) { + public IConditionalAction setCondition(Function condition) { this.condition = condition; return this; } @Override - public IConditionalAction terminateWhen(Supplier terminateWhen) { + public IConditionalAction terminateWhen(Function terminateWhen) { this.terminateWhen = terminateWhen; return this; } From cef0dfe45f1124e42aa0870cfee274986bfde044 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 09:18:56 +0300 Subject: [PATCH 039/154] forgor class :broken_heart_emoji: --- .../npcs/scripted/ScriptedActionManager.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index fe00fd064..0e4d1ccc4 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -12,7 +12,7 @@ import noppes.npcs.controllers.data.action.ParallelActionChain; import java.util.*; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.function.Consumer; -import java.util.function.Supplier; +import java.util.function.Function; /** * Full-featured ActionManager: @@ -64,32 +64,32 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IConditionalAction create(Supplier condition, Consumer task) { + public IConditionalAction create(Function condition, Consumer task) { return new ConditionalAction(this, condition, task); } @Override - public IConditionalAction create(String name, Supplier condition, Consumer task) { + public IConditionalAction create(String name,Function condition, Consumer task) { return new ConditionalAction(this, name, condition, task); } @Override - public IConditionalAction create(Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction create(Function condition, Consumer task,Function terminateWhen) { return new ConditionalAction(this, condition, task, terminateWhen); } @Override - public IConditionalAction create(String name, Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction create(String name,Function condition, Consumer task,Function terminateWhen) { return new ConditionalAction(this, name, condition, task, terminateWhen); } @Override - public IConditionalAction create(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction create(Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { return new ConditionalAction(this, condition, task, terminateWhen, onTermination); } @Override - public IConditionalAction create(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction create(String name,Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); } @@ -218,33 +218,33 @@ public class ScriptedActionManager implements IActionManager { /////////////////////////////////////////////////// // Conditionals @Override - public IConditionalAction scheduleAction(Supplier condition, Consumer task) { + public IConditionalAction scheduleAction(Function condition, Consumer task) { return scheduleAction(new ConditionalAction(this, condition, task)); } @Override - public IConditionalAction scheduleAction(Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction scheduleAction(Function condition, Consumer task, Function terminateWhen) { return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen)); } @Override - public IConditionalAction scheduleAction(Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction scheduleAction(Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task) { + public IConditionalAction scheduleAction(String name,Function condition, Consumer task) { return scheduleAction(new ConditionalAction(this, name, condition, task)); } @Override - public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task, Supplier terminateWhen) { + public IConditionalAction scheduleAction(String name,Function condition, Consumer task,Function terminateWhen) { return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen)); } @Override - public IConditionalAction scheduleAction(String name, Supplier condition, Consumer task, Supplier terminateWhen, Consumer onTermination) { + public IConditionalAction scheduleAction(String name,Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } From f6e0cd8addb78b3d69271c67d2c90513c181289b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 09:28:31 +0300 Subject: [PATCH 040/154] Refactored scheduleAction to schedule --- .../npcs/controllers/data/action/Action.java | 4 +- .../controllers/data/action/ActionChain.java | 2 +- .../data/action/ParallelActionChain.java | 2 +- .../npcs/scripted/ScriptedActionManager.java | 66 +++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 659dbcd04..5ca7e86b5 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -354,7 +354,7 @@ public class Action implements IAction { @Override public IConditionalAction conditional(IConditionalAction after) { - return manager.scheduleAction(after); + return manager.schedule(after); } @Override @@ -389,7 +389,7 @@ public class Action implements IAction { @Override public IAction parallel(IAction after) { - return manager.scheduleParallelAction(after); + return manager.scheduleParallel(after); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java index 572748a69..3f17e99eb 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java @@ -30,7 +30,7 @@ public class ActionChain implements IActionChain { IAction a = scriptedActionManager.create(name, offset, wrapper); index++; a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleAction(a); + scriptedActionManager.schedule(a); return this; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java index d437d80b1..640316b66 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java @@ -29,7 +29,7 @@ public class ParallelActionChain implements IActionChain { wrapper); idx++; a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleParallelAction(a); + scriptedActionManager.scheduleParallel(a); return this; } diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java index 0e4d1ccc4..6da5d3254 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java @@ -104,38 +104,38 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IAction scheduleAction(IAction action) { + public IAction schedule(IAction action) { actionQueue.addLast(action); return action; } @Override - public IAction scheduleAction(Consumer task) { - return scheduleAction(create(task)); + public IAction schedule(Consumer task) { + return schedule(create(task)); } @Override - public IAction scheduleAction(int delay, Consumer task) { - return scheduleAction(create(delay, task)); + public IAction schedule(int delay, Consumer task) { + return schedule(create(delay, task)); } @Override - public IAction scheduleAction(int maxDuration, int delay, Consumer task) { - return scheduleAction(create(maxDuration, delay, task)); + public IAction schedule(int maxDuration, int delay, Consumer task) { + return schedule(create(maxDuration, delay, task)); } @Override - public IAction scheduleAction(String name, Consumer task) { - return scheduleAction(create(name, task)); + public IAction schedule(String name, Consumer task) { + return schedule(create(name, task)); } @Override - public IAction scheduleAction(String name, int delay, Consumer task) { - return scheduleAction(create(name, delay, task)); + public IAction schedule(String name, int delay, Consumer task) { + return schedule(create(name, delay, task)); } @Override - public IAction scheduleAction(String name, int maxDuration, int delay, Consumer task) { - return scheduleAction(create(name, maxDuration, delay, task)); + public IAction schedule(String name, int maxDuration, int delay, Consumer task) { + return schedule(create(name, maxDuration, delay, task)); } @Override @@ -218,39 +218,39 @@ public class ScriptedActionManager implements IActionManager { /////////////////////////////////////////////////// // Conditionals @Override - public IConditionalAction scheduleAction(Function condition, Consumer task) { - return scheduleAction(new ConditionalAction(this, condition, task)); + public IConditionalAction schedule(Function condition, Consumer task) { + return schedule(new ConditionalAction(this, condition, task)); } @Override - public IConditionalAction scheduleAction(Function condition, Consumer task, Function terminateWhen) { - return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen)); + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { + return schedule(new ConditionalAction(this, condition, task, terminateWhen)); } @Override - public IConditionalAction scheduleAction(Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { - return scheduleAction(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return schedule(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction scheduleAction(String name,Function condition, Consumer task) { - return scheduleAction(new ConditionalAction(this, name, condition, task)); + public IConditionalAction schedule(String name, Function condition, Consumer task) { + return schedule(new ConditionalAction(this, name, condition, task)); } @Override - public IConditionalAction scheduleAction(String name,Function condition, Consumer task,Function terminateWhen) { - return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen)); + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { + return schedule(new ConditionalAction(this, name, condition, task, terminateWhen)); } @Override - public IConditionalAction scheduleAction(String name,Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { - return scheduleAction(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction scheduleAction(IConditionalAction action) { + public IConditionalAction schedule(IConditionalAction action) { conditionalActions.add(action); return action; } @@ -270,22 +270,22 @@ public class ScriptedActionManager implements IActionManager { } @Override - public IAction scheduleParallelAction(IAction action) { + public IAction scheduleParallel(IAction action) { parallelActions.add(action); return action; } @Override - public IAction scheduleParallelAction(String name, Consumer task) { - return scheduleParallelAction(create(name, task)); + public IAction scheduleParallel(String name, Consumer task) { + return scheduleParallel(create(name, task)); } @Override - public IAction scheduleParallelAction(String name, int delay, Consumer task) { - return scheduleParallelAction(create(name, delay, task)); + public IAction scheduleParallel(String name, int delay, Consumer task) { + return scheduleParallel(create(name, delay, task)); } @Override - public IAction scheduleParallelAction(String name, int maxDuration, int delay, Consumer task) { - return scheduleParallelAction(create(name, maxDuration, delay, task)); + public IAction scheduleParallel(String name, int maxDuration, int delay, Consumer task) { + return scheduleParallel(create(name, maxDuration, delay, task)); } From a52c676fcbedd48674c7518d30530623fd85121d Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 16:35:34 +0300 Subject: [PATCH 041/154] Refactored setUpdateEveryXTick to updateEvery Added getMaxCount(), once() and times(int n) --- .../npcs/controllers/data/action/Action.java | 35 +++++++++++++++---- .../data/action/ConditionalAction.java | 10 ++++-- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 5ca7e86b5..72823cdb5 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -16,9 +16,8 @@ public class Action implements IAction { protected final ScriptedActionManager manager; protected final String name; protected int startAfterTicks; - protected int count; - protected int duration; - protected int maxDuration = -1; + protected int count, maxCount = -1; + protected int duration, maxDuration = -1; protected int updateEveryXTick = 5; protected Consumer task; protected boolean done; @@ -78,7 +77,7 @@ public class Action implements IAction { startAfterTicks--; return; } - if (maxDuration > -1 && duration >= maxDuration) { + if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { markDone(); return; } @@ -88,6 +87,12 @@ public class Action implements IAction { else executeTask(); } + + if (maxCount > -1 && count >= maxCount) { + markDone(); + return; + } + duration++; } @@ -105,7 +110,6 @@ public class Action implements IAction { t.printStackTrace(); markDone(); } - duration++; } @Override @@ -139,6 +143,23 @@ public class Action implements IAction { return this; } + @Override + public int getMaxCount() { + return maxCount; + } + + @Override + public IAction times(int x) { + this.maxCount = Math.max(-1, x); + return this; + } + + @Override + public IAction once() { + this.maxCount = 1; + return this; + } + @Override public void markDone() { done = true; @@ -181,12 +202,12 @@ public class Action implements IAction { } @Override - public int getUpdateEveryXTick() { + public int getUpdateEvery() { return updateEveryXTick; } @Override - public IAction setUpdateEveryXTick(int x) { + public IAction updateEvery(int x) { this.updateEveryXTick = Math.max(1, x); return this; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index c61b9cf6b..a578c0d12 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -18,7 +18,7 @@ public class ConditionalAction extends Action implements IConditionalAction { private boolean taskExecuted; public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task) { - super(manager, "conditional", task); + super(manager, task); this.condition = condition; } @@ -52,7 +52,7 @@ public class ConditionalAction extends Action implements IConditionalAction { if (done) return; - if (maxChecks > -1 && checkCount > maxChecks) { + if (maxChecks > -1 && checkCount > maxChecks || maxCount == 0) { markDone(); return; } @@ -78,6 +78,12 @@ public class ConditionalAction extends Action implements IConditionalAction { checkCount++; } + + if (maxCount > -1 && count >= maxCount) { + markDone(); + return; + } + duration++; } From 47dc56c25e5f3b7d91a75c35747aec1f7b74ac7a Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 16:37:41 +0300 Subject: [PATCH 042/154] Adjusted ActionChains --- .../controllers/data/action/ActionChain.java | 18 ++++++++-------- .../data/action/ParallelActionChain.java | 21 +++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java index 3f17e99eb..69b2e1c0f 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java @@ -10,11 +10,11 @@ import java.util.function.Consumer; * helper to build a back‐to‐back chain of one‐shot actions */ public class ActionChain implements IActionChain { - private final ScriptedActionManager scriptedActionManager; + private final ScriptedActionManager manager; private int offset = 0, index = 0; public ActionChain(ScriptedActionManager scriptedActionManager) { - this.scriptedActionManager = scriptedActionManager; + this.manager = scriptedActionManager; } /** @@ -23,14 +23,8 @@ public class ActionChain implements IActionChain { @Override public IActionChain after(int delay, String name, Consumer task) { offset += delay; - Consumer wrapper = act -> { - task.accept(act); - act.markDone(); - }; - IAction a = scriptedActionManager.create(name, offset, wrapper); index++; - a.setUpdateEveryXTick(1); - scriptedActionManager.schedule(a); + manager.schedule(name, offset, task).updateEvery(1).once(); return this; } @@ -38,4 +32,10 @@ public class ActionChain implements IActionChain { public IActionChain after(int delay, Consumer task) { return after(delay, "chain#" + index, task); } + + @Override + public IActionChain start() { + manager.start(); + return this; + } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java index 640316b66..d0bba15f2 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java @@ -7,11 +7,11 @@ import noppes.npcs.scripted.ScriptedActionManager; import java.util.function.Consumer; public class ParallelActionChain implements IActionChain { - private final ScriptedActionManager scriptedActionManager; + private final ScriptedActionManager manager; private int offset = 0, idx = 0; public ParallelActionChain(ScriptedActionManager scriptedActionManager) { - this.scriptedActionManager = scriptedActionManager; + this.manager = scriptedActionManager; } /** @@ -20,16 +20,9 @@ public class ParallelActionChain implements IActionChain { @Override public IActionChain after(int delay, String name, Consumer task) { offset += delay; - Consumer wrapper = act -> { - task.accept(act); - act.markDone(); - }; - IAction a = scriptedActionManager.create(name, - offset, - wrapper); idx++; - a.setUpdateEveryXTick(1); - scriptedActionManager.scheduleParallel(a); + + manager.scheduleParallel(name, offset, task).updateEvery(1).once(); return this; } @@ -37,4 +30,10 @@ public class ParallelActionChain implements IActionChain { public IActionChain after(int delay, Consumer task) { return after(delay, "parallel#" + idx, task); } + + @Override + public IActionChain start() { + manager.start(); + return this; + } } From 7928c189ad1ddc24198eef5028de9106a8134299 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 16:52:17 +0300 Subject: [PATCH 043/154] Fixed delay incorrectly calculated for sequential IActionChain --- .../noppes/npcs/controllers/data/action/ActionChain.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java index 69b2e1c0f..7b6debd71 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java @@ -11,7 +11,7 @@ import java.util.function.Consumer; */ public class ActionChain implements IActionChain { private final ScriptedActionManager manager; - private int offset = 0, index = 0; + private int index = 0; public ActionChain(ScriptedActionManager scriptedActionManager) { this.manager = scriptedActionManager; @@ -22,9 +22,8 @@ public class ActionChain implements IActionChain { */ @Override public IActionChain after(int delay, String name, Consumer task) { - offset += delay; index++; - manager.schedule(name, offset, task).updateEvery(1).once(); + manager.schedule(name, delay, task).updateEvery(1).once(); return this; } From 2bb1df968bfed7f119082b1774c94d9fe2176fea Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 17:50:10 +0300 Subject: [PATCH 044/154] Improved ParallelActionChain --- src/api | 2 +- .../controllers/data/action/ActionChain.java | 13 +++++----- .../data/action/ParallelActionChain.java | 24 +++++-------------- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/src/api b/src/api index f998e8feb..13d32ae42 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit f998e8feb4e45e130632df26a313016031ad82d0 +Subproject commit 13d32ae42518a70ea3cc80677a7d3e611a2aef9b diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java index 7b6debd71..e4ba13ef0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java @@ -10,11 +10,12 @@ import java.util.function.Consumer; * helper to build a back‐to‐back chain of one‐shot actions */ public class ActionChain implements IActionChain { - private final ScriptedActionManager manager; - private int index = 0; + protected final ScriptedActionManager manager; + protected String defaultName = "sequential#"; + protected int index = 0; - public ActionChain(ScriptedActionManager scriptedActionManager) { - this.manager = scriptedActionManager; + public ActionChain(ScriptedActionManager manager) { + this.manager = manager; } /** @@ -22,14 +23,14 @@ public class ActionChain implements IActionChain { */ @Override public IActionChain after(int delay, String name, Consumer task) { - index++; manager.schedule(name, delay, task).updateEvery(1).once(); + index++; return this; } @Override public IActionChain after(int delay, Consumer task) { - return after(delay, "chain#" + index, task); + return after(delay, defaultName + index, task); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java index d0bba15f2..0598d0fef 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java @@ -6,12 +6,12 @@ import noppes.npcs.scripted.ScriptedActionManager; import java.util.function.Consumer; -public class ParallelActionChain implements IActionChain { - private final ScriptedActionManager manager; - private int offset = 0, idx = 0; +public class ParallelActionChain extends ActionChain implements IActionChain { + private int offset; - public ParallelActionChain(ScriptedActionManager scriptedActionManager) { - this.manager = scriptedActionManager; + public ParallelActionChain(ScriptedActionManager manager) { + super(manager); + defaultName = "parallel#"; } /** @@ -20,20 +20,8 @@ public class ParallelActionChain implements IActionChain { @Override public IActionChain after(int delay, String name, Consumer task) { offset += delay; - idx++; - manager.scheduleParallel(name, offset, task).updateEvery(1).once(); - return this; - } - - @Override - public IActionChain after(int delay, Consumer task) { - return after(delay, "parallel#" + idx, task); - } - - @Override - public IActionChain start() { - manager.start(); + index++; return this; } } From 7ea05e4ecc7f7f99fd0bc30fa9f404084f9c9198 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 18:13:31 +0300 Subject: [PATCH 045/154] Refactored ScriptedActionManager to ActionManager, moved to same package as Actions --- .../npcs/controllers/data/PlayerData.java | 4 ++-- .../npcs/controllers/data/action/Action.java | 19 +++++++++---------- .../controllers/data/action/ActionChain.java | 5 ++--- .../data/action/ActionManager.java} | 8 ++------ .../data/action/ConditionalAction.java | 13 ++++++------- .../data/action/ParallelActionChain.java | 3 +-- .../npcs/entity/EntityNPCInterface.java | 4 ++-- .../java/noppes/npcs/scripted/NpcAPI.java | 8 +++----- 8 files changed, 27 insertions(+), 37 deletions(-) rename src/main/java/noppes/npcs/{scripted/ScriptedActionManager.java => controllers/data/action/ActionManager.java} (97%) diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index bd97b85d0..07cc91a1d 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -22,6 +22,7 @@ import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; @@ -29,7 +30,6 @@ import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.RoleCompanion; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScreenSize; -import noppes.npcs.scripted.ScriptedActionManager; import noppes.npcs.util.CustomNPCsThreader; import noppes.npcs.util.NBTJsonUtil; @@ -52,7 +52,7 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData { public DataSkinOverlays skinOverlays = new DataSkinOverlays(this); public MagicData magicData = new MagicData(); - public ScriptedActionManager actionManager = new ScriptedActionManager(); + public ActionManager actionManager = new ActionManager(); public PlayerDataScript scriptData; public EntityNPCInterface editingNpc; diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 72823cdb5..cc68534cd 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -4,7 +4,6 @@ import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.scripted.CustomNPCsException; -import noppes.npcs.scripted.ScriptedActionManager; import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.HashMap; @@ -13,7 +12,7 @@ import java.util.function.Consumer; import java.util.function.Function; public class Action implements IAction { - protected final ScriptedActionManager manager; + protected final ActionManager manager; protected final String name; protected int startAfterTicks; protected int count, maxCount = -1; @@ -27,7 +26,7 @@ public class Action implements IAction { protected ScriptContainer reportTo; - public Action(ScriptedActionManager manager, String name) { + public Action(ActionManager manager, String name) { this.manager = manager; this.name = name; @@ -35,31 +34,31 @@ public class Action implements IAction { reportTo = ScriptContainer.Current; } - public Action(ScriptedActionManager manager, Consumer task) { + public Action(ActionManager manager, Consumer task) { this(manager, task.toString(), task); } - public Action(ScriptedActionManager manager, String name, Consumer task) { + public Action(ActionManager manager, String name, Consumer task) { this(manager, name); this.task = task; } - public Action(ScriptedActionManager manager, int startAfterTicks, Consumer task) { + public Action(ActionManager manager, int startAfterTicks, Consumer task) { this(manager, task); this.startAfterTicks = startAfterTicks; } - public Action(ScriptedActionManager manager, String name, int startAfterTicks, Consumer task) { + public Action(ActionManager manager, String name, int startAfterTicks, Consumer task) { this(manager, name, task); this.startAfterTicks = startAfterTicks; } - public Action(ScriptedActionManager manager, int maxDuration, int startAfterTicks, Consumer task) { + public Action(ActionManager manager, int maxDuration, int startAfterTicks, Consumer task) { this(manager, startAfterTicks, task); this.maxDuration = maxDuration; } - public Action(ScriptedActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer task) { + public Action(ActionManager manager, String name, int maxDuration, int startAfterTicks, Consumer task) { this(manager, name, startAfterTicks, task); this.maxDuration = maxDuration; } @@ -113,7 +112,7 @@ public class Action implements IAction { } @Override - public ScriptedActionManager getManager() { + public ActionManager getManager() { return manager; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java index e4ba13ef0..20d5c9d01 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.scripted.ScriptedActionManager; import java.util.function.Consumer; @@ -10,11 +9,11 @@ import java.util.function.Consumer; * helper to build a back‐to‐back chain of one‐shot actions */ public class ActionChain implements IActionChain { - protected final ScriptedActionManager manager; + protected final ActionManager manager; protected String defaultName = "sequential#"; protected int index = 0; - public ActionChain(ScriptedActionManager manager) { + public ActionChain(ActionManager manager) { this.manager = manager; } diff --git a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java similarity index 97% rename from src/main/java/noppes/npcs/scripted/ScriptedActionManager.java rename to src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 6da5d3254..234321464 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptedActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -1,13 +1,9 @@ -package noppes.npcs.scripted; +package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.actions.IConditionalAction; -import noppes.npcs.controllers.data.action.Action; -import noppes.npcs.controllers.data.action.ActionChain; -import noppes.npcs.controllers.data.action.ConditionalAction; -import noppes.npcs.controllers.data.action.ParallelActionChain; import java.util.*; import java.util.concurrent.ConcurrentLinkedDeque; @@ -22,7 +18,7 @@ import java.util.function.Function; * - conditional actions * - cancellation & clearing */ -public class ScriptedActionManager implements IActionManager { +public class ActionManager implements IActionManager { private boolean isWorking = false; private final Deque actionQueue = new ConcurrentLinkedDeque<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index a578c0d12..d1ee784ad 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.actions.IConditionalAction; -import noppes.npcs.scripted.ScriptedActionManager; import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.function.Consumer; @@ -17,32 +16,32 @@ public class ConditionalAction extends Action implements IConditionalAction { private int checkCount; private boolean taskExecuted; - public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task) { + public ConditionalAction(ActionManager manager, Function condition, Consumer task) { super(manager, task); this.condition = condition; } - public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task) { + public ConditionalAction(ActionManager manager, String name, Function condition, Consumer task) { super(manager, name, task); this.condition = condition; } - public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task, Function terminateWhen) { + public ConditionalAction(ActionManager manager, Function condition, Consumer task, Function terminateWhen) { this(manager, condition, task); this.terminateWhen = terminateWhen; } - public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task, Function terminateWhen) { + public ConditionalAction(ActionManager manager, String name, Function condition, Consumer task, Function terminateWhen) { this(manager, name, condition, task); this.terminateWhen = terminateWhen; } - public ConditionalAction(ScriptedActionManager manager, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + public ConditionalAction(ActionManager manager, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { this(manager, condition, task, terminateWhen); this.onTermination = onTermination; } - public ConditionalAction(ScriptedActionManager manager, String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + public ConditionalAction(ActionManager manager, String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { this(manager, name, condition, task, terminateWhen); this.onTermination = onTermination; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java index 0598d0fef..869766ddd 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java @@ -2,14 +2,13 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.scripted.ScriptedActionManager; import java.util.function.Consumer; public class ParallelActionChain extends ActionChain implements IActionChain { private int offset; - public ParallelActionChain(ScriptedActionManager manager) { + public ParallelActionChain(ActionManager manager) { super(manager); defaultName = "parallel#"; } diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 56808721a..7fd5525e2 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -72,10 +72,10 @@ import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.data.DataTimers; import noppes.npcs.roles.*; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.ScriptedActionManager; import noppes.npcs.scripted.entity.ScriptNpc; import noppes.npcs.scripted.event.NpcEvent; import noppes.npcs.util.GameProfileAlt; @@ -98,7 +98,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti public DataTimers timers; public CombatHandler combatHandler = new CombatHandler(this); - public ScriptedActionManager actionManager = new ScriptedActionManager(); + public ActionManager actionManager = new ActionManager(); public String linkedName = ""; public long linkedLast = 0; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index a514f8508..76a9936c2 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -51,10 +51,8 @@ import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumAnimationPart; import noppes.npcs.containers.ContainerNpcInterface; import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.Animation; -import noppes.npcs.controllers.data.Frame; -import noppes.npcs.controllers.data.FramePart; -import noppes.npcs.controllers.data.SkinOverlay; +import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; @@ -79,7 +77,7 @@ public class NpcAPI extends AbstractNpcAPI { private static final CacheHashMap> scriptItemCache = new CacheHashMap<>(60 * 1000); public static final HashMap engineObjects = new HashMap<>(); public static final EventBus EVENT_BUS = new EventBus(); - public static final ScriptedActionManager actionManager = new ScriptedActionManager(); + public static final ActionManager actionManager = new ActionManager(); private static AbstractNpcAPI instance = null; private final static String API_USER_AGENT = "CNPC+API"; From e69bbd13b0aa359a45855bcf4a2b529e8053046e Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 20:10:44 +0300 Subject: [PATCH 046/154] Action.after() and before() now properly work for unscheduled actions (Actions store a queue of actions to enqueue before/after them on their scheduling) --- .../npcs/controllers/data/action/Action.java | 73 ++++++++++++++++++- .../data/action/ActionManager.java | 12 +++ 2 files changed, 82 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index cc68534cd..8e3f916f3 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -6,13 +6,16 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.scripted.CustomNPCsException; import org.apache.commons.lang3.exception.ExceptionUtils; +import java.util.Deque; import java.util.HashMap; +import java.util.LinkedList; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; public class Action implements IAction { protected final ActionManager manager; + protected boolean isScheduled; protected final String name; protected int startAfterTicks; protected int count, maxCount = -1; @@ -23,7 +26,6 @@ public class Action implements IAction { protected final Map dataStore = new HashMap<>(); protected boolean isThreaded; protected ActionThread actionThread; - protected ScriptContainer reportTo; public Action(ActionManager manager, String name) { @@ -116,6 +118,12 @@ public class Action implements IAction { return manager; } + @Override + public boolean isScheduled() { + return isScheduled; + } + + @Override public int getCount() { return count; @@ -175,6 +183,7 @@ public class Action implements IAction { actionThread.stop(); dataStore.clear(); + isScheduled = false; done = true; } @@ -308,10 +317,62 @@ public class Action implements IAction { return null; } + protected Action unscheduledBefore, unscheduledAfter; + + protected LinkedList allUnscheduledBefore() { + Action before = unscheduledBefore; + + LinkedList befores = new LinkedList<>(); + while (before != null) { + befores.addFirst(before); + before = before.unscheduledBefore; + } + + return befores; + } + + protected void scheduleAllBefore(Deque actionQueue) { + allUnscheduledBefore().forEach((bef) -> { + if (bef.unscheduledAfter != null) + bef.unscheduledAfter.unscheduledBefore = null; + bef.unscheduledAfter = null; + + actionQueue.addLast(bef); + bef.isScheduled = true; + }); + } + + protected LinkedList allUnscheduledAfter() { + Action after = unscheduledAfter; + + LinkedList afters = new LinkedList<>(); + while (after != null) { + afters.add(after); + after = after.unscheduledAfter; + } + return afters; + } + + protected void scheduleAllAfter(Deque actionQueue) { + allUnscheduledAfter().forEach((aft) -> { + if (aft.unscheduledBefore != null) + aft.unscheduledBefore.unscheduledAfter = null; + aft.unscheduledBefore = null; + + actionQueue.addLast(aft); + aft.isScheduled = true; + }); + } @Override public IAction after(IAction after) { int idx = manager.getIndex(this); - if (idx >= 0) manager.scheduleActionAt(idx + 1, after); + if (idx >= 0) + manager.scheduleActionAt(idx + 1, after); + else { + Action aft = (Action) after; + unscheduledAfter = aft; + aft.unscheduledBefore = this; + } return after; } @@ -343,7 +404,13 @@ public class Action implements IAction { @Override public IAction before(IAction before) { int idx = manager.getIndex(this); - if (idx >= 0) manager.scheduleActionAt(Math.max(0, idx), before); + if (idx >= 0) + manager.scheduleActionAt(Math.max(0, idx), before); + else { + Action bef = (Action) before; + unscheduledBefore = bef; + bef.unscheduledAfter = this; + } return before; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 234321464..72ea15555 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -101,7 +101,16 @@ public class ActionManager implements IActionManager { @Override public IAction schedule(IAction action) { + Action act = (Action) action; + if (act.unscheduledBefore != null) + act.scheduleAllBefore(actionQueue); + actionQueue.addLast(action); + + if (act.unscheduledAfter != null) + act.scheduleAllAfter(actionQueue); + + act.isScheduled = true; return action; } @@ -147,6 +156,7 @@ public class ActionManager implements IActionManager { actionQueue.clear(); actionQueue.addAll(tmp); } + ((Action) action).isScheduled = true; return action; } @@ -248,6 +258,7 @@ public class ActionManager implements IActionManager { @Override public IConditionalAction schedule(IConditionalAction action) { conditionalActions.add(action); + ((Action) action).isScheduled = true; return action; } @@ -268,6 +279,7 @@ public class ActionManager implements IActionManager { @Override public IAction scheduleParallel(IAction action) { parallelActions.add(action); + ((Action) action).isScheduled = true; return action; } @Override From 8b4892cb353e277e1fbed69c0b9f6f9ba56e371c Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 20:14:08 +0300 Subject: [PATCH 047/154] Scheduled conditionals properly using after(), before() and sequential schedule() --- .../java/noppes/npcs/controllers/data/action/Action.java | 6 ++++++ .../noppes/npcs/controllers/data/action/ActionManager.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 8e3f916f3..9ab3fbf08 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -365,6 +365,9 @@ public class Action implements IAction { } @Override public IAction after(IAction after) { + if (after instanceof IConditionalAction) + return conditional((IConditionalAction) after); + int idx = manager.getIndex(this); if (idx >= 0) manager.scheduleActionAt(idx + 1, after); @@ -403,6 +406,9 @@ public class Action implements IAction { @Override public IAction before(IAction before) { + if (before instanceof IConditionalAction) + return conditional((IConditionalAction) before); + int idx = manager.getIndex(this); if (idx >= 0) manager.scheduleActionAt(Math.max(0, idx), before); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 72ea15555..3e2dc4bc4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -101,6 +101,9 @@ public class ActionManager implements IActionManager { @Override public IAction schedule(IAction action) { + if (action instanceof IConditionalAction) + return schedule((IConditionalAction) action); + Action act = (Action) action; if (act.unscheduledBefore != null) act.scheduleAllBefore(actionQueue); From 0e8db79605f8c134090e6500789ae999449ab635 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 22:34:38 +0300 Subject: [PATCH 048/154] Fixed IConditional's task firing with latency after code that must come after it due to thread delegation --- .../data/action/ConditionalAction.java | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index d1ee784ad..71a3df76b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -57,31 +57,27 @@ public class ConditionalAction extends Action implements IConditionalAction { } if (ticksExisted % updateEveryXTick == 0) { - if (condition != null && condition.apply(this)) { - if (isThreaded) - actionThread.execute("task", this::executeTask); - else - executeTask(); - } - - if (isTerminated()) { - if (onTermination != null) { - if (isThreaded) - actionThread.execute("onTermination", this::executeOnTermination); - else - executeOnTermination(); - } - markDone(); - return; - } - checkCount++; + + Runnable execute = () -> { + if (condition != null && condition.apply(this)) + executeTask(); + + if (isTerminated()) { + if (onTermination != null) + executeOnTermination(); + markDone(); + } + }; + + if (isThreaded) + actionThread.execute("task", execute); + else + execute.run(); } - if (maxCount > -1 && count >= maxCount) { + if (maxCount > -1 && count >= maxCount) markDone(); - return; - } duration++; } From 67926477bed3e77d65d413188a423274ac181a56 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 30 Jun 2025 23:00:23 +0300 Subject: [PATCH 049/154] More overloads and cleanup --- .../npcs/controllers/data/action/Action.java | 12 +++++------- .../controllers/data/action/ActionManager.java | 15 +++++++++++++++ .../data/action/ConditionalAction.java | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 9ab3fbf08..80e9297a3 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -89,10 +89,8 @@ public class Action implements IAction { executeTask(); } - if (maxCount > -1 && count >= maxCount) { + if (maxCount > -1 && count >= maxCount) markDone(); - return; - } duration++; } @@ -145,8 +143,8 @@ public class Action implements IAction { } @Override - public IAction setMaxDuration(int x) { - this.maxDuration = Math.max(-1, x); + public IAction setMaxDuration(int ticks) { + this.maxDuration = Math.max(-1, ticks); return this; } @@ -156,8 +154,8 @@ public class Action implements IAction { } @Override - public IAction times(int x) { - this.maxCount = Math.max(-1, x); + public IAction times(int n) { + this.maxCount = Math.max(-1, n); return this; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 3e2dc4bc4..37b806d01 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -285,6 +285,21 @@ public class ActionManager implements IActionManager { ((Action) action).isScheduled = true; return action; } + + @Override + public IAction scheduleParallel(Consumer task) { + return scheduleParallel(create(task)); + } + + @Override + public IAction scheduleParallel(int delay, Consumer task) { + return scheduleParallel(create(delay, task)); + } + @Override + public IAction scheduleParallel(int maxDuration, int delay, Consumer task) { + return scheduleParallel(create(maxDuration, delay, task)); + } + @Override public IAction scheduleParallel(String name, Consumer task) { return scheduleParallel(create(name, task)); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java index 71a3df76b..4e53bef50 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java @@ -120,7 +120,7 @@ public class ConditionalAction extends Action implements IConditionalAction { @Override public IConditionalAction setMaxChecks(int maxChecks) { - this.maxChecks = maxChecks; + this.maxChecks = Math.max(-1, maxChecks); return this; } From 6829547d3a3a0a47c60ac6de3409a6079dfcc56a Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 30 Jun 2025 21:57:29 -0400 Subject: [PATCH 050/154] Copy slot NBT when loading --- .../npcs/controllers/ProfileController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 20bf56e28..a8f2bf91c 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -110,8 +110,12 @@ public class ProfileController implements IProfileHandler { profile.currentSlotId = 0; saveSlotData(player); } + if (!profile.getSlots().containsKey(profile.currentSlotId)) { + profile.currentSlotId = 0; + } profile.player = player; activeProfiles.put(player.getUniqueID(), profile); + loadSlotData(player); verifySlotQuests(profile.player); save(player, profile); } @@ -147,9 +151,9 @@ public class ProfileController implements IProfileHandler { public synchronized void saveOffline(Profile profile, UUID uuid) { profile.setLocked(true); + final NBTTagCompound compound = profile.writeToNBT(); + final String filename = uuid.toString() + ".dat"; CustomNPCsThreader.customNPCThread.execute(() -> { - final NBTTagCompound compound = profile.writeToNBT(); - final String filename = uuid.toString() + ".dat"; try { File saveDir = getProfileDir(); File fileNew = new File(saveDir, filename + "_new"); @@ -170,9 +174,9 @@ public class ProfileController implements IProfileHandler { public synchronized void save(EntityPlayer player, Profile profile) { profile.setLocked(true); + final NBTTagCompound compound = profile.writeToNBT(); + final String filename = player.getUniqueID() + ".dat"; CustomNPCsThreader.customNPCThread.execute(() -> { - final NBTTagCompound compound = profile.writeToNBT(); - final String filename = player.getUniqueID() + ".dat"; try { File saveDir = getProfileDir(); File fileNew = new File(saveDir, filename + "_new"); @@ -623,7 +627,7 @@ public class ProfileController implements IProfileHandler { for (IProfileData profileData : profileTypes.values()) { NBTTagCompound data; if (slot.getComponents().containsKey(profileData.getTagName())) - data = slot.getComponentData(profileData.getTagName()); + data = (NBTTagCompound) slot.getComponentData(profileData.getTagName()).copy(); else data = new NBTTagCompound(); profileData.setNBT(player, data); @@ -656,7 +660,7 @@ public class ProfileController implements IProfileHandler { ISlot slot = profile.getSlots().get(slotId); for (IProfileData pd : dataList) { if (slot.getComponents().containsKey(pd.getTagName())) { - NBTTagCompound sub = slot.getComponentData(pd.getTagName()); + NBTTagCompound sub = (NBTTagCompound) slot.getComponentData(pd.getTagName()).copy(); List subInfo = pd.getInfo(player, sub); infoList.addAll(subInfo); } @@ -770,6 +774,8 @@ public class ProfileController implements IProfileHandler { NBTTagCompound compound = slot.getComponentData(new CNPCData().getTagName()); if (compound == null) compound = new NBTTagCompound(); + else + compound = (NBTTagCompound) compound.copy(); playerData.setNBT(compound); return playerData; } From ba28f62d747e0fe25e7ac41622981ce329535751 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 30 Jun 2025 21:58:45 -0400 Subject: [PATCH 051/154] Fix NPE in AnimationData when world object is missing --- .../noppes/npcs/controllers/data/AnimationData.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/AnimationData.java b/src/main/java/noppes/npcs/controllers/data/AnimationData.java index 43fe42016..c537d94e1 100644 --- a/src/main/java/noppes/npcs/controllers/data/AnimationData.java +++ b/src/main/java/noppes/npcs/controllers/data/AnimationData.java @@ -45,7 +45,7 @@ public class AnimationData implements IAnimationData { } public static AnimationData getData(Entity entity) { - if (entity == null) { + if (entity == null || entity.worldObj == null) { return null; } if (entity.worldObj.isRemote) { @@ -88,7 +88,7 @@ public class AnimationData implements IAnimationData { public void updateClient(EntityPlayer... excludedPlayers) { EntityLivingBase sendingEntity = parent instanceof PlayerData ? ((PlayerData) parent).player : parent instanceof DataDisplay ? ((DataDisplay) parent).npc : null; float range = parent instanceof PlayerData ? 160 : 60; - if (sendingEntity != null) { + if (sendingEntity != null && sendingEntity.worldObj != null) { if (sendingEntity.dimension != sendingEntity.worldObj.provider.dimensionId) sendingEntity.dimension = sendingEntity.worldObj.provider.dimensionId; @@ -235,7 +235,7 @@ public class AnimationData implements IAnimationData { public void readFromNBT(NBTTagCompound compound) { Entity entity = this.getMCEntity(); - boolean isServer = entity != null && !entity.worldObj.isRemote; + boolean isServer = entity != null && entity.worldObj != null && !entity.worldObj.isRemote; if (compound.hasKey("IsClientAnimating") && isServer) { this.isClientAnimating = compound.getBoolean("IsClientAnimating"); if (this.isClientAnimating) { @@ -272,14 +272,14 @@ public class AnimationData implements IAnimationData { } - if (this.getMCEntity() != null && this.getMCEntity().worldObj.isRemote && newAnim != null) { + if (this.getMCEntity() != null && this.getMCEntity().worldObj != null && this.getMCEntity().worldObj.isRemote && newAnim != null) { this.animatingTime = 0; } Animation prevAnim = this.animation; this.animation = newAnim; - if (this.getMCEntity() != null && this.getMCEntity().worldObj.isRemote && + if (this.getMCEntity() != null && this.getMCEntity().worldObj != null && this.getMCEntity().worldObj.isRemote && this.isActive() && prevAnim != null && newAnim != null && !newAnim.frames.isEmpty()) { Frame frame = (Frame) prevAnim.currentFrame(); if (frame != null) { From 253de25d5b19adfc25e284877ea869366705daf9 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 30 Jun 2025 22:02:43 -0400 Subject: [PATCH 052/154] Fix passive faction toggle --- .../noppes/npcs/client/gui/global/GuiNPCManageFactions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java index ced128544..0a7789f1f 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -132,7 +132,7 @@ public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollDat if (button.id == 4) { faction.getsAttacked = button.getValue() == 1; } - if (button.id == 4) { + if (button.id == 5) { faction.isPassive = button.getValue() == 1; } if (button.id == 10) { From 2c4a183c306b9d7039c44a635a0ccd262fa4a4aa Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 30 Jun 2025 22:05:57 -0400 Subject: [PATCH 053/154] Send dialog close packet on GUI shutdown --- .../client/gui/player/GuiDialogInteract.java | 20 +++++++++++++++++++ .../modern/GuiModernDialogInteract.java | 19 ++++++++++++++++++ .../player/modern/GuiModernQuestDialog.java | 18 +++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 1287000e1..a49db2873 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -68,6 +68,13 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { private HashMap dialogImages = new HashMap<>(); + /** + * Tracks if a close packet has been sent to the server. This ensures that the + * dialog closed event always triggers even when the gui is closed through + * external means such as key binds that bypass {@link #keyTyped(char, int)}. + */ + private boolean sentClosePacket = false; + public GuiDialogInteract(EntityNPCInterface npc, Dialog dialog) { super(npc); this.dialog = dialog; @@ -647,6 +654,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { } private void closed() { + sentClosePacket = true; grabMouse(false); PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } @@ -657,6 +665,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { public void appendDialog(Dialog dialog) { closeOnEsc = !dialog.disableEsc; + sentClosePacket = false; this.dialogImages.clear(); this.dialog = dialog; this.options = new ArrayList(); @@ -701,6 +710,17 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose { MusicController.Instance.stopAllSounds(); } + @Override + public void onGuiClosed() { + if (!sentClosePacket) { + if (dialog != null) { + PacketClient.sendClient(new DialogSelectPacket(dialog.id, -1)); + } + closed(); + } + super.onGuiClosed(); + } + @Override public void setClose(int i, NBTTagCompound data) { grabMouse(false); diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java index 6766b7711..fc4a221c7 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernDialogInteract.java @@ -57,6 +57,12 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos private final HashMap dialogImages = new HashMap<>(); + /** + * Similar to {@link noppes.npcs.client.gui.player.GuiDialogInteract#sentClosePacket} this flag + * tracks if a close packet was already sent to the server. + */ + private boolean sentClosePacket = false; + public GuiModernDialogInteract(EntityNPCInterface npc, Dialog dialog) { super(npc); this.dialog = dialog; @@ -357,6 +363,7 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos } private void closed() { + sentClosePacket = true; grabMouse(false); PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } @@ -367,6 +374,7 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos public void appendDialog(Dialog dialog) { closeOnEsc = !dialog.disableEsc; + sentClosePacket = false; this.dialogImages.clear(); this.dialog = dialog; this.options = new ArrayList(); @@ -423,4 +431,15 @@ public class GuiModernDialogInteract extends GuiNPCInterface implements IGuiClos public void setClose(int i, NBTTagCompound data) { grabMouse(false); } + + @Override + public void onGuiClosed() { + if (!sentClosePacket) { + if (dialog != null) { + PacketClient.sendClient(new DialogSelectPacket(dialog.id, -1)); + } + closed(); + } + super.onGuiClosed(); + } } diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java index 0def72744..0d4659ebb 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java @@ -54,6 +54,11 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { private boolean isGrabbed = false; + /** + * Flag to ensure the dialog close packet is only sent once. + */ + private boolean sentClosePacket = false; + private final HashMap dialogImages = new HashMap<>(); private Dialog prevDialog; private int optionId; @@ -70,6 +75,7 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { public void initGui() { super.initGui(); isGrabbed = false; + sentClosePacket = false; guiTop = (height - ySize); calculateRowHeight(); this.scaledResolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); @@ -353,6 +359,7 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { } private void closed() { + sentClosePacket = true; grabMouse(false); PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } @@ -403,4 +410,15 @@ public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { public void setClose(int i, NBTTagCompound data) { grabMouse(false); } + + @Override + public void onGuiClosed() { + if (!sentClosePacket) { + if (prevDialog != null) { + PacketClient.sendClient(new DialogSelectPacket(prevDialog.id, -1)); + } + closed(); + } + super.onGuiClosed(); + } } From 0b2c3f6ca9810ae2f6db936d8124682e7af774d0 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 30 Jun 2025 22:10:00 -0400 Subject: [PATCH 054/154] Implement shift-click support in bank container --- .../containers/ContainerNPCBankInterface.java | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java index 48017e13f..17cc83279 100644 --- a/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java +++ b/src/main/java/noppes/npcs/containers/ContainerNPCBankInterface.java @@ -85,8 +85,41 @@ public class ContainerNPCBankInterface extends ContainerNpcInterface { } @Override - public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int i) { - return null; + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack returnedStack = null; + Slot slot = (Slot) this.inventorySlots.get(index); + if (slot != null && slot.getHasStack()) { + ItemStack stackInSlot = slot.getStack(); + returnedStack = stackInSlot.copy(); + + int bankStart = (currency != null) ? 1 : 0; + int bankEnd = bankStart + getRowNumber() * 9; + + if (index >= bankStart && index < bankEnd) { + // Moving items from bank inventory to the player + if (!this.mergeItemStack(stackInSlot, bankEnd, this.inventorySlots.size(), true)) { + return null; + } + } else if (index >= bankEnd) { + // Moving items from the player inventory to the bank + if (!this.mergeItemStack(stackInSlot, bankStart, bankEnd, false)) { + return null; + } + } else { + // Currency slot + if (!this.mergeItemStack(stackInSlot, bankEnd, this.inventorySlots.size(), true)) { + return null; + } + } + + if (stackInSlot.stackSize == 0) { + slot.putStack(null); + } else { + slot.onSlotChanged(); + } + } + + return returnedStack; } @Override From 393a7fbb5695ac45c2cfa87dcfd2eb5fb3ea52b2 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 11:51:00 +0300 Subject: [PATCH 055/154] Added varargs chaining to IActions i.e schedule(act1,act2,act3...) --- .../npcs/controllers/data/action/Action.java | 33 +++++++++++++++++++ .../data/action/ActionManager.java | 31 ++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 80e9297a3..50b85198e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -377,6 +377,22 @@ public class Action implements IAction { return after; } + @Override + public void after(IAction... actions) { + for (int i = 0; i < actions.length - 1; i++) + actions[i].after(actions[i + 1]); + } + + @Override + public void after(Consumer... tasks) { + IAction[] actions = new IAction[tasks.length]; + + for (int i = 0; i < tasks.length; i++) + actions[i] = manager.create(tasks[i]); + + after(actions); + } + @Override public IAction after(String name, int maxDuration, int delay, Consumer t) { return after(manager.create(name, maxDuration, delay, t)); @@ -448,6 +464,12 @@ public class Action implements IAction { return manager.schedule(after); } + @Override + public void conditional(IConditionalAction... actions) { + for (IConditionalAction act : actions) + conditional(act); + } + @Override public IConditionalAction conditional(Function condition, Consumer task) { return conditional(manager.create(condition, task)); @@ -483,11 +505,22 @@ public class Action implements IAction { return manager.scheduleParallel(after); } + @Override + public void parallel(IAction... actions) { + for (IAction act : actions) + parallel(act); + } + @Override public IAction parallel(Consumer task) { return parallel(manager.create(task)); } + @Override + public void parallel(Consumer... tasks) { + for (Consumer task : tasks) + parallel(task); + } @Override public IAction parallel(int delay, Consumer task) { return parallel(manager.create(delay, task)); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 37b806d01..6c73aae74 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -117,6 +117,18 @@ public class ActionManager implements IActionManager { return action; } + @Override + public void schedule(IAction... actions) { + for (IAction act : actions) + schedule(act); + } + + @Override + public void schedule(Consumer... tasks) { + for (Consumer task : tasks) + schedule(task); + } + @Override public IAction schedule(Consumer task) { return schedule(create(task)); @@ -257,7 +269,6 @@ public class ActionManager implements IActionManager { return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } - @Override public IConditionalAction schedule(IConditionalAction action) { conditionalActions.add(action); @@ -265,6 +276,12 @@ public class ActionManager implements IActionManager { return action; } + @Override + public void schedule(IConditionalAction... actions) { + for (IConditionalAction act : actions) + schedule(act); + } + @Override public List getConditionalActions() { return new ArrayList<>(conditionalActions); @@ -286,6 +303,18 @@ public class ActionManager implements IActionManager { return action; } + @Override + public void scheduleParallel(IAction... actions) { + for (IAction act : actions) + scheduleParallel(act); + } + + @Override + public void scheduleParallel(Consumer... tasks) { + for (Consumer task : tasks) + scheduleParallel(task); + } + @Override public IAction scheduleParallel(Consumer task) { return scheduleParallel(create(task)); From 3e16c0a0d86c6fde92e87d19a6d4e2fd335084a5 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 19:55:28 +0300 Subject: [PATCH 056/154] ActionManger start()/stop() return IActionManager --- .../noppes/npcs/controllers/data/action/ActionManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 6c73aae74..a0509090a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -90,13 +90,15 @@ public class ActionManager implements IActionManager { } @Override - public void start() { + public IActionManager start() { isWorking = true; + return this; } @Override - public void stop() { + public IActionManager stop() { isWorking = false; + return this; } @Override From e2f12f4bbf4b254565709d73fb76517c961ace7a Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 19:59:33 +0300 Subject: [PATCH 057/154] Refactored Action classes into appropriate packages --- src/api | 2 +- .../noppes/npcs/controllers/data/action/ActionManager.java | 3 +++ .../noppes/npcs/controllers/data/action/ActionThread.java | 2 +- .../data/action/{ => action}/ConditionalAction.java | 4 +++- .../npcs/controllers/data/action/{ => chain}/ActionChain.java | 3 ++- .../data/action/{ => chain}/ParallelActionChain.java | 3 ++- 6 files changed, 12 insertions(+), 5 deletions(-) rename src/main/java/noppes/npcs/controllers/data/action/{ => action}/ConditionalAction.java (96%) rename src/main/java/noppes/npcs/controllers/data/action/{ => chain}/ActionChain.java (90%) rename src/main/java/noppes/npcs/controllers/data/action/{ => chain}/ParallelActionChain.java (86%) diff --git a/src/api b/src/api index 13d32ae42..6141ae147 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 13d32ae42518a70ea3cc80677a7d3e611a2aef9b +Subproject commit 6141ae1472dcd944c3797927c66b1ad4892e2a53 diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index a0509090a..1f7db6f5c 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -4,6 +4,9 @@ import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.data.action.action.ConditionalAction; +import noppes.npcs.controllers.data.action.chain.ActionChain; +import noppes.npcs.controllers.data.action.chain.ParallelActionChain; import java.util.*; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index b8f5f3361..ae5db82d6 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -104,7 +104,7 @@ public class ActionThread { return runningTasks.stream().anyMatch(task -> !task.isDone()); } - protected void execute(String taskKey, Runnable task) { + public void execute(String taskKey, Runnable task) { if (threadPaused && pauseUntil != null && pauseUntil.apply(action)) resume(); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java similarity index 96% rename from src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java rename to src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 4e53bef50..c7be5b407 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -1,7 +1,9 @@ -package noppes.npcs.controllers.data.action; +package noppes.npcs.controllers.data.action.action; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.data.action.Action; +import noppes.npcs.controllers.data.action.ActionManager; import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.function.Consumer; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java similarity index 90% rename from src/main/java/noppes/npcs/controllers/data/action/ActionChain.java rename to src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java index 20d5c9d01..acef1564a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java @@ -1,7 +1,8 @@ -package noppes.npcs.controllers.data.action; +package noppes.npcs.controllers.data.action.chain; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.controllers.data.action.ActionManager; import java.util.function.Consumer; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java similarity index 86% rename from src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java rename to src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java index 869766ddd..88b76e8d4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ParallelActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java @@ -1,7 +1,8 @@ -package noppes.npcs.controllers.data.action; +package noppes.npcs.controllers.data.action.chain; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.controllers.data.action.ActionManager; import java.util.function.Consumer; From 6cc9aa0e78d3b9a0bac3fbdc063a65dfb41e1c38 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 20:15:24 +0300 Subject: [PATCH 058/154] Created IActionQueue --- .../controllers/data/action/ActionQueue.java | 219 ++++++++++++++++++ 1 file changed, 219 insertions(+) create mode 100644 src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java new file mode 100644 index 000000000..46e42ccf6 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -0,0 +1,219 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionQueue; + +import java.util.*; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.function.Consumer; + +public class ActionQueue implements IActionQueue { + protected final Deque queue = new ConcurrentLinkedDeque<>(); + protected final ActionManager manager; + protected final String name; + + protected boolean isParallel; + protected boolean isWorking; + + public ActionQueue(ActionManager manager, String name) { + this.manager = manager; + this.name = name; + } + + @Override + public IActionQueue start() { + isWorking = true; + return this; + } + + @Override + public IActionQueue stop() { + isWorking = false; + return this; + } + @Override + public ActionManager getManager() { + return manager; + } + + @Override + public String getName() { + return name; + } + @Override + public boolean isParallel() { + return isParallel; + } + + @Override + public Queue getQueue() { + return queue; + } + + @Override + public IAction schedule(IAction action) { + Action act = (Action) action; + if (act.unscheduledBefore != null) + act.scheduleAllBefore(queue); + + queue.addLast(action); + + if (act.unscheduledAfter != null) + act.scheduleAllAfter(queue); + + act.isScheduled = true; + return action; + } + + @Override + public void schedule(IAction... actions) { + for (IAction act : actions) + schedule(act); + } + + @Override + public void schedule(Consumer... tasks) { + for (Consumer task : tasks) + schedule(task); + } + + @Override + public IAction schedule(Consumer task) { + return schedule(manager.create(task)); + } + + @Override + public IAction schedule(int delay, Consumer task) { + return schedule(manager.create(delay, task)); + } + + @Override + public IAction schedule(int maxDuration, int delay, Consumer task) { + return schedule(manager.create(maxDuration, delay, task)); + } + + @Override + public IAction schedule(String name, Consumer task) { + return schedule(manager.create(name, task)); + } + + @Override + public IAction schedule(String name, int delay, Consumer task) { + return schedule(manager.create(name, delay, task)); + } + + @Override + public IAction schedule(String name, int maxDuration, int delay, Consumer task) { + return schedule(manager.create(name, maxDuration, delay, task)); + } + + @Override + public IAction scheduleActionAt(int index, IAction action) { + int size = queue.size(); + if (index <= 0) { + queue.addFirst(action); + } else if (index >= size) { + queue.addLast(action); + } else { + List tmp = new ArrayList<>(queue); + tmp.add(index, action); + queue.clear(); + queue.addAll(tmp); + } + ((Action) action).isScheduled = true; + return action; + } + + @Override + public int getIndex(IAction action) { + int i = 0; + for (IAction a : queue) { + if (a.equals(action)) + return i; + i++; + } + return -1; + } + + @Override + public IAction getCurrentAction() { + return queue.peekFirst(); + } + + @Override + public boolean has(IAction action) { + return has(action.getName()); + } + + @Override + public boolean has(String actionName) { + for (IAction act : queue) + if (act.getName().equals(actionName)) + return true; + + return false; + } + + @Override + public IAction get(String actionName) { + for (IAction action : queue) { + if (action.getName().equals(actionName)) + return action; + } + + return null; + } + + @Override + public boolean cancel(IAction action) { + return cancel(action.getName()); + } + + @Override + public boolean cancel(String actionName) { + Iterator acts = queue.iterator(); + while (acts.hasNext()) { + IAction act = acts.next(); + if (act.getName().equals(actionName)) { + act.kill(); + acts.remove(); + return true; + } + } + return false; + } + + protected void tick(int ticksExisted) { + if (!isWorking) + return; + + + if (!isParallel) { + IAction current = getCurrentAction(); + if (current instanceof Action) { + Action cab = (Action) current; + cab.tick(ticksExisted); + if (cab.isDone()) { + cab.kill(); + queue.pollFirst(); + } + } + } else { + Iterator pit = queue.iterator(); + while (pit.hasNext()) { + Action a = (Action) pit.next(); + a.tick(ticksExisted); + if (a.isDone()) { + a.kill(); + pit.remove(); + } + } + } + } + + @Override + public void clear() { + queue.forEach((act) -> act.kill()); + queue.clear(); + } +} From 25e6f39afd27b7c882e7ec5222c8ade419a52f4e Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 20:56:54 +0300 Subject: [PATCH 059/154] Rewrote ActionManager with the new IActionQueue framework --- .../data/action/ActionManager.java | 356 ++++++------------ .../controllers/data/action/ActionQueue.java | 26 +- 2 files changed, 144 insertions(+), 238 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 1f7db6f5c..7305551fc 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -3,13 +3,12 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.action.ConditionalAction; import noppes.npcs.controllers.data.action.chain.ActionChain; import noppes.npcs.controllers.data.action.chain.ParallelActionChain; -import java.util.*; -import java.util.concurrent.ConcurrentLinkedDeque; import java.util.function.Consumer; import java.util.function.Function; @@ -22,11 +21,27 @@ import java.util.function.Function; * - cancellation & clearing */ public class ActionManager implements IActionManager { - private boolean isWorking = false; + protected boolean isWorking = false; - private final Deque actionQueue = new ConcurrentLinkedDeque<>(); - private final Deque parallelActions = new ConcurrentLinkedDeque<>(); - private final Deque conditionalActions = new ConcurrentLinkedDeque<>(); + protected final IActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); + protected final IActionQueue parallelQueue = new ActionQueue(this, "mainParallel").setParallel(true); + protected final IActionQueue conditionalQueue = new ActionQueue(this, "mainConditional").setParallel(true); + + @Override + public IActionManager start() { + isWorking = true; + return this; + } + + @Override + public IActionManager stop() { + isWorking = false; + return this; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Creators @Override public IAction create(String name) { @@ -92,157 +107,139 @@ public class ActionManager implements IActionManager { return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); } - @Override - public IActionManager start() { - isWorking = true; - return this; - } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Sequential @Override - public IActionManager stop() { - isWorking = false; - return this; + public IActionQueue getSequentialQueue() { + return sequentialQueue; } @Override public IAction schedule(IAction action) { if (action instanceof IConditionalAction) - return schedule((IConditionalAction) action); + return conditionalQueue.schedule(action); - Action act = (Action) action; - if (act.unscheduledBefore != null) - act.scheduleAllBefore(actionQueue); - - actionQueue.addLast(action); - - if (act.unscheduledAfter != null) - act.scheduleAllAfter(actionQueue); - - act.isScheduled = true; - return action; + return sequentialQueue.schedule(action); } @Override public void schedule(IAction... actions) { - for (IAction act : actions) - schedule(act); + sequentialQueue.schedule(actions); } @Override public void schedule(Consumer... tasks) { - for (Consumer task : tasks) - schedule(task); + sequentialQueue.schedule(tasks); } @Override public IAction schedule(Consumer task) { - return schedule(create(task)); + return sequentialQueue.schedule(task); } @Override public IAction schedule(int delay, Consumer task) { - return schedule(create(delay, task)); + return sequentialQueue.schedule(delay, task); } @Override public IAction schedule(int maxDuration, int delay, Consumer task) { - return schedule(create(maxDuration, delay, task)); + return sequentialQueue.schedule(maxDuration, delay, task); } @Override public IAction schedule(String name, Consumer task) { - return schedule(create(name, task)); + return sequentialQueue.schedule(name, task); } @Override public IAction schedule(String name, int delay, Consumer task) { - return schedule(create(name, delay, task)); + return sequentialQueue.schedule(name, delay, task); } @Override public IAction schedule(String name, int maxDuration, int delay, Consumer task) { - return schedule(create(name, maxDuration, delay, task)); + return sequentialQueue.schedule(name, maxDuration, delay, task); } @Override public IAction scheduleActionAt(int index, IAction action) { - int size = actionQueue.size(); - if (index <= 0) { - actionQueue.addFirst(action); - } else if (index >= size) { - actionQueue.addLast(action); - } else { - List tmp = new ArrayList<>(actionQueue); - tmp.add(index, action); - actionQueue.clear(); - actionQueue.addAll(tmp); - } - ((Action) action).isScheduled = true; - return action; + return sequentialQueue.scheduleActionAt(index, action); + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Parallels + + @Override + public IActionQueue getParallelQueue() { + return parallelQueue; } @Override - public int getIndex(IAction action) { - int i = 0; - for (IAction a : actionQueue) { - if (a.equals(action)) return i; - i++; - } - return -1; + public IAction scheduleParallel(IAction action) { + return parallelQueue.schedule(action); } @Override - public IAction getCurrentAction() { - return actionQueue.peekFirst(); + public void scheduleParallel(IAction... actions) { + parallelQueue.schedule(actions); } @Override - public IAction getAction(String name) { - for (IAction action : actionQueue) { - if (action.getName().equals(name)) - return action; - } - - for (IAction action : parallelActions) { - if (action.getName().equals(name)) - return action; - } - - for (IAction action : conditionalActions) { - if (action.getName().equals(name)) - return action; - } - - return null; + public void scheduleParallel(Consumer... tasks) { + parallelQueue.schedule(tasks); } @Override - public Queue getActionQueue() { - return actionQueue; + public IAction scheduleParallel(Consumer task) { + return parallelQueue.schedule(task); } @Override - public boolean hasAction(String name) { - for (IAction act : actionQueue) - if (act.getName().equals(name)) - return true; + public IAction scheduleParallel(int delay, Consumer task) { + return parallelQueue.schedule(delay, task); + } - return false; + @Override + public IAction scheduleParallel(int maxDuration, int delay, Consumer task) { + return parallelQueue.schedule(maxDuration, delay, task); + } + + @Override + public IAction scheduleParallel(String name, Consumer task) { + return parallelQueue.schedule(name, task); } @Override - public boolean hasAny(String name) { - if (hasAction(name)) - return true; - else if (hasParallel(name)) - return true; - else if (hasConditional(name)) - return true; + public IAction scheduleParallel(String name, int delay, Consumer task) { + return parallelQueue.schedule(delay, task); + } - return false; + @Override + public IAction scheduleParallel(String name, int maxDuration, int delay, Consumer task) { + return parallelQueue.schedule(name, maxDuration, delay, task); } /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Conditionals + + @Override + public IActionQueue getConditionalQueue() { + return conditionalQueue; + } + + @Override + public IConditionalAction schedule(IConditionalAction action) { + return (IConditionalAction) conditionalQueue.schedule(action); + } + + @Override + public void schedule(IConditionalAction... actions) { + conditionalQueue.schedule(actions); + } + @Override public IConditionalAction schedule(Function condition, Consumer task) { return schedule(new ConditionalAction(this, condition, task)); @@ -274,81 +271,49 @@ public class ActionManager implements IActionManager { return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Handling + @Override - public IConditionalAction schedule(IConditionalAction action) { - conditionalActions.add(action); - ((Action) action).isScheduled = true; - return action; + public boolean hasAny(String name) { + return getAny(name) != null; } @Override - public void schedule(IConditionalAction... actions) { - for (IConditionalAction act : actions) - schedule(act); + public IAction getAny(String name) { + IAction act = sequentialQueue.get(name); + if (act != null) + return act; + + act = parallelQueue.get(name); + if (act != null) + return act; + + act = conditionalQueue.get(name); + if (act != null) + return act; + + return null; } @Override - public List getConditionalActions() { - return new ArrayList<>(conditionalActions); - } + public boolean cancelAny(String name) { + boolean canceled = sequentialQueue.cancel(name); + if (canceled) + return true; - @Override - public boolean hasConditional(String name) { - for (IAction act : conditionalActions) - if (act.getName().equals(name)) - return true; + canceled = parallelQueue.cancel(name); + if (canceled) + return true; + + canceled = conditionalQueue.cancel(name); + if (canceled) + return true; return false; } - @Override - public IAction scheduleParallel(IAction action) { - parallelActions.add(action); - ((Action) action).isScheduled = true; - return action; - } - - @Override - public void scheduleParallel(IAction... actions) { - for (IAction act : actions) - scheduleParallel(act); - } - - @Override - public void scheduleParallel(Consumer... tasks) { - for (Consumer task : tasks) - scheduleParallel(task); - } - - @Override - public IAction scheduleParallel(Consumer task) { - return scheduleParallel(create(task)); - } - - @Override - public IAction scheduleParallel(int delay, Consumer task) { - return scheduleParallel(create(delay, task)); - } - @Override - public IAction scheduleParallel(int maxDuration, int delay, Consumer task) { - return scheduleParallel(create(maxDuration, delay, task)); - } - - @Override - public IAction scheduleParallel(String name, Consumer task) { - return scheduleParallel(create(name, task)); - } - @Override - public IAction scheduleParallel(String name, int delay, Consumer task) { - return scheduleParallel(create(name, delay, task)); - } - - @Override - public IAction scheduleParallel(String name, int maxDuration, int delay, Consumer task) { - return scheduleParallel(create(name, maxDuration, delay, task)); - } - - /** * Call once per tick from your main loop. * @@ -358,79 +323,20 @@ public class ActionManager implements IActionManager { if (!isWorking) return; // ─── Sequential (head only) ───────────────────────────────── - IAction current = getCurrentAction(); - if (current instanceof Action) { - Action cab = (Action) current; - cab.tick(ticksExisted); - if (cab.isDone()) { - cab.kill(); - actionQueue.pollFirst(); - } - } + ((ActionQueue) sequentialQueue).tick(ticksExisted); // ─── Parallel (all) ─────────────────────────────────────── - Iterator pit = parallelActions.iterator(); - while (pit.hasNext()) { - Action a = (Action) pit.next(); - a.tick(ticksExisted); - if (a.isDone()) { - a.kill(); - pit.remove(); - } - } + ((ActionQueue) parallelQueue).tick(ticksExisted); // ─── Conditionals ───────────────────────────────────────── - Iterator cit = conditionalActions.iterator(); - while (cit.hasNext()) { - ConditionalAction con = (ConditionalAction) cit.next(); - con.tick(ticksExisted); - if (con.isDone()) { - con.kill(); - cit.remove(); - } - } + ((ActionQueue) conditionalQueue).tick(ticksExisted); } @Override public void clear() { - actionQueue.forEach((act) -> act.kill()); - actionQueue.clear(); - - parallelActions.forEach((act) -> act.kill()); - parallelActions.clear(); - - conditionalActions.forEach((act) -> act.kill()); - conditionalActions.clear(); - } - - @Override - public boolean cancelAction(String name) { - Iterator acts = actionQueue.iterator(); - while (acts.hasNext()) { - IAction act = acts.next(); - if (act.getName().equals(name)) { - acts.remove(); - return true; - } - } - - Iterator pit = parallelActions.iterator(); - while (pit.hasNext()) { - if (pit.next().getName().equals(name)) { - pit.remove(); - return true; - } - } - - Iterator cons = conditionalActions.iterator(); - while (cons.hasNext()) { - IConditionalAction con = cons.next(); - if (con.getName().equals(name)) { - cons.remove(); - return true; - } - } - return false; + sequentialQueue.clear(); + parallelQueue.clear(); + conditionalQueue.clear(); } @Override @@ -442,18 +348,4 @@ public class ActionManager implements IActionManager { public IActionChain parallelChain() { return new ParallelActionChain(this); } - - @Override - public Queue getParallelActions() { - return parallelActions; - } - - @Override - public boolean hasParallel(String name) { - for (IAction act : parallelActions) - if (act.getName().equals(name)) - return true; - - return false; - } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 46e42ccf6..a231f6e3a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -20,6 +20,11 @@ public class ActionQueue implements IActionQueue { this.name = name; } + public ActionQueue(ActionManager manager, String name, boolean isParallel) { + this(manager, name); + this.isParallel = isParallel; + } + @Override public IActionQueue start() { isWorking = true; @@ -45,6 +50,11 @@ public class ActionQueue implements IActionQueue { return isParallel; } + public IActionQueue setParallel(boolean parallel) { + isParallel = parallel; + return this; + } + @Override public Queue getQueue() { return queue; @@ -53,12 +63,15 @@ public class ActionQueue implements IActionQueue { @Override public IAction schedule(IAction action) { Action act = (Action) action; - if (act.unscheduledBefore != null) + + if (!isParallel && act.unscheduledBefore != null) act.scheduleAllBefore(queue); + queue.addLast(action); - if (act.unscheduledAfter != null) + + if (!isParallel && act.unscheduledAfter != null) act.scheduleAllAfter(queue); act.isScheduled = true; @@ -71,16 +84,17 @@ public class ActionQueue implements IActionQueue { schedule(act); } + @Override + public IAction schedule(Consumer task) { + return schedule(manager.create(task)); + } + @Override public void schedule(Consumer... tasks) { for (Consumer task : tasks) schedule(task); } - @Override - public IAction schedule(Consumer task) { - return schedule(manager.create(task)); - } @Override public IAction schedule(int delay, Consumer task) { From c1cfcc19d59c9a075f501b44eb8156848193e603 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 21:14:58 +0300 Subject: [PATCH 060/154] Implemented ActionQueue to Action --- .../npcs/controllers/data/action/Action.java | 101 ++++++++++++------ .../controllers/data/action/ActionQueue.java | 3 + 2 files changed, 74 insertions(+), 30 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 50b85198e..bebb138e7 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -1,6 +1,7 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.scripted.CustomNPCsException; @@ -15,6 +16,7 @@ import java.util.function.Function; public class Action implements IAction { protected final ActionManager manager; + protected IActionQueue queue; protected boolean isScheduled; protected final String name; protected int startAfterTicks; @@ -65,6 +67,23 @@ public class Action implements IAction { this.maxDuration = maxDuration; } + @Override + public IActionQueue getQueue() { + return queue; + } + + @Override + public IAction setQueue(IActionQueue queue) { + if (this.queue == queue) + return this; + + if (this.queue != null) + this.queue.getQueue().remove(this); + + this.queue = queue; + queue.schedule(this); + return this; + } @Override public IAction setTask(Consumer task) { @@ -289,31 +308,10 @@ public class Action implements IAction { return this; } - @Override - public IAction getNext() { - boolean seenMe = false; - for (IAction a : manager.getActionQueue()) { - if (seenMe) { - return a; - } - if (a == this) { - seenMe = true; - } - } - return null; - } - @Override - public IAction getPrevious() { - IAction prev = null; - for (IAction a : manager.getActionQueue()) { - if (a == this) { - return prev; - } - prev = a; - } - return null; - } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Sequential protected Action unscheduledBefore, unscheduledAfter; @@ -361,14 +359,46 @@ public class Action implements IAction { aft.isScheduled = true; }); } + + @Override + public IAction getNext() { + if (queue == null) + return null; + + boolean seenMe = false; + for (IAction a : queue.getQueue()) { + if (seenMe) { + return a; + } + if (a == this) { + seenMe = true; + } + } + return null; + } + + @Override + public IAction getPrevious() { + if (queue == null) + return null; + + IAction prev = null; + for (IAction a : queue.getQueue()) { + if (a == this) { + return prev; + } + prev = a; + } + return null; + } @Override public IAction after(IAction after) { if (after instanceof IConditionalAction) return conditional((IConditionalAction) after); - int idx = manager.getIndex(this); + int idx = queue == null ? -1 : queue.getIndex(this); if (idx >= 0) - manager.scheduleActionAt(idx + 1, after); + queue.scheduleActionAt(idx + 1, after); else { Action aft = (Action) after; unscheduledAfter = aft; @@ -423,9 +453,9 @@ public class Action implements IAction { if (before instanceof IConditionalAction) return conditional((IConditionalAction) before); - int idx = manager.getIndex(this); + int idx = queue == null ? -1 : queue.getIndex(this); if (idx >= 0) - manager.scheduleActionAt(Math.max(0, idx), before); + queue.scheduleActionAt(Math.max(0, idx), before); else { Action bef = (Action) before; unscheduledBefore = bef; @@ -464,6 +494,10 @@ public class Action implements IAction { return manager.schedule(after); } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Conditionals + @Override public void conditional(IConditionalAction... actions) { for (IConditionalAction act : actions) @@ -500,9 +534,16 @@ public class Action implements IAction { return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Parallels + @Override - public IAction parallel(IAction after) { - return manager.scheduleParallel(after); + public IAction parallel(IAction act) { + if (queue != null && queue.isParallel() && queue != manager.conditionalQueue) + return queue.schedule(act); + + return manager.scheduleParallel(act); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index a231f6e3a..a1d06089c 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -74,6 +74,9 @@ public class ActionQueue implements IActionQueue { if (!isParallel && act.unscheduledAfter != null) act.scheduleAllAfter(queue); + if (act.queue != this) + act.setQueue(this); + act.isScheduled = true; return action; } From c976b488f144b1a87c3d5f3cf471c30a6c873544 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 21:25:58 +0300 Subject: [PATCH 061/154] Re-organised Action class --- .../npcs/controllers/data/action/Action.java | 335 +++++++++--------- .../data/action/action/ConditionalAction.java | 88 ++--- 2 files changed, 216 insertions(+), 207 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index bebb138e7..8c12da222 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -67,6 +67,16 @@ public class Action implements IAction { this.maxDuration = maxDuration; } + @Override + public ActionManager getManager() { + return manager; + } + + @Override + public String getName() { + return name; + } + @Override public IActionQueue getQueue() { return queue; @@ -85,14 +95,117 @@ public class Action implements IAction { return this; } + @Override + public boolean isScheduled() { + return isScheduled; + } + @Override public IAction setTask(Consumer task) { this.task = task; return this; } + @Override + public int getDuration() { + return duration; + } + + + @Override + public int getMaxDuration() { + return maxDuration; + } + + @Override + public IAction setMaxDuration(int ticks) { + this.maxDuration = Math.max(-1, ticks); + return this; + } + + @Override + public int getStartAfterTicks() { + return startAfterTicks; + } + + @Override + public int getUpdateEvery() { + return updateEveryXTick; + } + + @Override + public IAction updateEvery(int x) { + this.updateEveryXTick = Math.max(1, x); + return this; + } + + @Override + public int getCount() { + return count; + } + + @Override + public int getMaxCount() { + return maxCount; + } + + @Override + public IAction times(int n) { + this.maxCount = Math.max(-1, n); + return this; + } + + @Override + public IAction once() { + this.maxCount = 1; + return this; + } + + @Override + public Object getData(String key) { + return dataStore.get(key); + } + + @Override + public IAction setData(String key, Object v) { + dataStore.put(key, v); + return this; + } + + @Override + public IAction removeData(String key) { + dataStore.remove(key); + return this; + } + + @Override + public boolean hasData(String key) { + return dataStore.containsKey(key); + } + + @Override + public void markDone() { + done = true; + } + + @Override + public boolean isDone() { + return done; + } + + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Handling + + @Override + public IAction start() { + manager.start(); + return this; + } + public void tick(int ticksExisted) { - if (done) return; + if (done) + return; if (startAfterTicks > 0) { startAfterTicks--; return; @@ -130,70 +243,6 @@ public class Action implements IAction { } } - @Override - public ActionManager getManager() { - return manager; - } - - @Override - public boolean isScheduled() { - return isScheduled; - } - - - @Override - public int getCount() { - return count; - } - - @Override - public int getDuration() { - return duration; - } - - @Override - public String getName() { - return name; - } - - @Override - public int getMaxDuration() { - return maxDuration; - } - - @Override - public IAction setMaxDuration(int ticks) { - this.maxDuration = Math.max(-1, ticks); - return this; - } - - @Override - public int getMaxCount() { - return maxCount; - } - - @Override - public IAction times(int n) { - this.maxCount = Math.max(-1, n); - return this; - } - - @Override - public IAction once() { - this.maxCount = 1; - return this; - } - - @Override - public void markDone() { - done = true; - } - - @Override - public boolean isDone() { - return done; - } - @Override public void kill() { if (actionThread != null) @@ -204,42 +253,32 @@ public class Action implements IAction { done = true; } - @Override - public Object getData(String key) { - return dataStore.get(key); - } + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Thread @Override - public IAction setData(String key, Object v) { - dataStore.put(key, v); + public IAction threadify() { + if (!isThreaded) { + isThreaded = true; + actionThread = new ActionThread(this); + } + return this; } @Override - public IAction removeData(String key) { - dataStore.remove(key); - return this; + public void resume() { + if (isThreaded) + actionThread.resume(); } @Override - public boolean hasData(String key) { - return dataStore.containsKey(key); - } - - @Override - public int getUpdateEvery() { - return updateEveryXTick; - } - - @Override - public IAction updateEvery(int x) { - this.updateEveryXTick = Math.max(1, x); - return this; - } - - @Override - public int getStartAfterTicks() { - return startAfterTicks; + public void pause() { + if (isThreaded) + actionThread.pause(); + else + throw new CustomNPCsException("Must threadify() IAction before pausing!"); } @Override @@ -262,14 +301,6 @@ public class Action implements IAction { return pauseFor((int) (millis / 50)); } - @Override - public void pause() { - if (isThreaded) - actionThread.pause(); - else - throw new CustomNPCsException("Must threadify() IAction before pausing!"); - } - @Override public void pauseUntil(Function until) { if (isThreaded) @@ -278,12 +309,6 @@ public class Action implements IAction { throw new CustomNPCsException("Must threadify() IAction before pausing!"); } - @Override - public void resume() { - if (isThreaded) - actionThread.resume(); - } - @Override public boolean isPaused() { if (isThreaded) @@ -292,23 +317,6 @@ public class Action implements IAction { return startAfterTicks > 0; } - @Override - public IAction threadify() { - if (!isThreaded) { - isThreaded = true; - actionThread = new ActionThread(this); - } - - return this; - } - - @Override - public IAction start() { - manager.start(); - return this; - } - - /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Sequential @@ -494,46 +502,6 @@ public class Action implements IAction { return manager.schedule(after); } - /////////////////////////////////////////////////// - /////////////////////////////////////////////////// - // Conditionals - - @Override - public void conditional(IConditionalAction... actions) { - for (IConditionalAction act : actions) - conditional(act); - } - - @Override - public IConditionalAction conditional(Function condition, Consumer task) { - return conditional(manager.create(condition, task)); - } - - @Override - public IConditionalAction conditional(String name, Function condition, Consumer task) { - return conditional(manager.create(name, condition, task)); - } - - @Override - public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { - return conditional(manager.create(condition, task, terminateWhen)); - } - - @Override - public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { - return conditional(manager.create(name, condition, task, terminateWhen)); - } - - @Override - public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { - return conditional(manager.create(condition, task, terminateWhen, onTermination)); - } - - @Override - public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { - return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); - } - /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Parallels @@ -581,4 +549,45 @@ public class Action implements IAction { public IAction parallel(String name, int maxDuration, int delay, Consumer t) { return parallel(manager.create(name, maxDuration, delay, t)); } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Conditionals + + @Override + public void conditional(IConditionalAction... actions) { + for (IConditionalAction act : actions) + conditional(act); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task) { + return conditional(manager.create(condition, task)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task) { + return conditional(manager.create(name, condition, task)); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen) { + return conditional(manager.create(condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen) { + return conditional(manager.create(name, condition, task, terminateWhen)); + } + + @Override + public IConditionalAction conditional(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return conditional(manager.create(condition, task, terminateWhen, onTermination)); + } + + @Override + public IConditionalAction conditional(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + return conditional(manager.create(name, condition, task, terminateWhen, onTermination)); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index c7be5b407..b2e81d344 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -48,6 +48,50 @@ public class ConditionalAction extends Action implements IConditionalAction { this.onTermination = onTermination; } + @Override + public int getCheckCount() { + return checkCount; + } + + @Override + public int getMaxChecks() { + return maxChecks; + } + + @Override + public IConditionalAction setMaxChecks(int maxChecks) { + this.maxChecks = Math.max(-1, maxChecks); + return this; + } + + @Override + public IConditionalAction setCondition(Function condition) { + this.condition = condition; + return this; + } + + @Override + public IConditionalAction terminateWhen(Function terminateWhen) { + this.terminateWhen = terminateWhen; + return this; + } + + @Override + public IConditionalAction onTermination(Consumer onTermination) { + this.onTermination = onTermination; + return this; + } + + @Override + public boolean wasTaskExecuted() { + return taskExecuted; + } + + @Override + public boolean isTerminated() { + return terminateWhen != null && terminateWhen.apply(this); + } + @Override public void tick(int ticksExisted) { if (done) @@ -115,48 +159,4 @@ public class ConditionalAction extends Action implements IConditionalAction { } } - @Override - public boolean isTerminated() { - return terminateWhen != null && terminateWhen.apply(this); - } - - @Override - public IConditionalAction setMaxChecks(int maxChecks) { - this.maxChecks = Math.max(-1, maxChecks); - return this; - } - - @Override - public IConditionalAction setCondition(Function condition) { - this.condition = condition; - return this; - } - - @Override - public IConditionalAction terminateWhen(Function terminateWhen) { - this.terminateWhen = terminateWhen; - return this; - } - - @Override - public IConditionalAction onTermination(Consumer onTermination) { - this.onTermination = onTermination; - return this; - } - - @Override - public boolean wasTaskExecuted() { - return taskExecuted; - } - - @Override - public int getCheckCount() { - return checkCount; - } - - @Override - public int getMaxChecks() { - return maxChecks; - } - } From c10b37f01d780fdc28125f88e3b4a26ef9ad1e95 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 21:46:44 +0300 Subject: [PATCH 062/154] Overhauled IActionChain --- src/api | 2 +- .../data/action/ActionManager.java | 6 +-- .../controllers/data/action/ActionQueue.java | 8 +++ .../data/action/chain/ActionChain.java | 50 +++++++++++++------ .../action/chain/ParallelActionChain.java | 27 ---------- 5 files changed, 47 insertions(+), 46 deletions(-) delete mode 100644 src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java diff --git a/src/api b/src/api index 6141ae147..1b96a3dc8 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 6141ae1472dcd944c3797927c66b1ad4892e2a53 +Subproject commit 1b96a3dc874a4b89ae751f63836a4257d3088d2e diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 7305551fc..b80f19092 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -6,8 +6,6 @@ import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import noppes.npcs.controllers.data.action.chain.ActionChain; -import noppes.npcs.controllers.data.action.chain.ParallelActionChain; import java.util.function.Consumer; import java.util.function.Function; @@ -341,11 +339,11 @@ public class ActionManager implements IActionManager { @Override public IActionChain chain() { - return new ActionChain(this); + return sequentialQueue.chain(); } @Override public IActionChain parallelChain() { - return new ParallelActionChain(this); + return parallelQueue.chain(); } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index a1d06089c..cf64c17e4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -1,7 +1,9 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.controllers.data.action.chain.ActionChain; import java.util.*; import java.util.concurrent.ConcurrentLinkedDeque; @@ -233,4 +235,10 @@ public class ActionQueue implements IActionQueue { queue.forEach((act) -> act.kill()); queue.clear(); } + + @Override + public IActionChain chain() { + return new ActionChain(manager, this, isParallel ? "parallel#" : "sequential#"); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java index acef1564a..3897f4091 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java @@ -2,6 +2,7 @@ package noppes.npcs.controllers.data.action.chain; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.controllers.data.action.ActionManager; import java.util.function.Consumer; @@ -11,31 +12,52 @@ import java.util.function.Consumer; */ public class ActionChain implements IActionChain { protected final ActionManager manager; - protected String defaultName = "sequential#"; - protected int index = 0; + protected final IActionQueue queue; + protected String name; + protected int index = 0, offset; - public ActionChain(ActionManager manager) { + public ActionChain(ActionManager manager, IActionQueue queue, String name) { this.manager = manager; + this.queue = queue; + this.name = name; } - /** - * schedule the next task ‘delay’ ticks after the previous one - */ @Override - public IActionChain after(int delay, String name, Consumer task) { - manager.schedule(name, delay, task).updateEvery(1).once(); - index++; + public IActionQueue getQueue() { + return queue; + } + + @Override + public String getName() { + return name; + } + + @Override + public IActionChain setName(String name) { + this.name = name; return this; } - @Override - public IActionChain after(int delay, Consumer task) { - return after(delay, defaultName + index, task); - } - @Override public IActionChain start() { manager.start(); return this; } + + /** + * schedule the next task ‘delay’ ticks after the previous one + */ + @Override + public IActionChain after(int delay, String name, Consumer task) { + offset = queue.isParallel() ? offset + delay : delay; + queue.schedule(name, offset, task).updateEvery(1).once(); + index++; + return this; + } + + @Override + public IActionChain after(int delay, Consumer task) { + return after(delay, name + index, task); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java deleted file mode 100644 index 88b76e8d4..000000000 --- a/src/main/java/noppes/npcs/controllers/data/action/chain/ParallelActionChain.java +++ /dev/null @@ -1,27 +0,0 @@ -package noppes.npcs.controllers.data.action.chain; - -import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionChain; -import noppes.npcs.controllers.data.action.ActionManager; - -import java.util.function.Consumer; - -public class ParallelActionChain extends ActionChain implements IActionChain { - private int offset; - - public ParallelActionChain(ActionManager manager) { - super(manager); - defaultName = "parallel#"; - } - - /** - * schedule the next task ‘delay’ ticks after the previous one, fully in parallel - */ - @Override - public IActionChain after(int delay, String name, Consumer task) { - offset += delay; - manager.scheduleParallel(name, offset, task).updateEvery(1).once(); - index++; - return this; - } -} From fc6c56e40d747cc5791f3380d65cb07fa1be0e48 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 22:07:15 +0300 Subject: [PATCH 063/154] Added Custom IActionQueues to ActionManager --- .../data/action/ActionManager.java | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index b80f19092..adfdc8e8d 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -7,6 +7,8 @@ import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.action.ConditionalAction; +import java.util.HashMap; +import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; @@ -25,6 +27,8 @@ public class ActionManager implements IActionManager { protected final IActionQueue parallelQueue = new ActionQueue(this, "mainParallel").setParallel(true); protected final IActionQueue conditionalQueue = new ActionQueue(this, "mainConditional").setParallel(true); + protected final Map otherQueues = new HashMap<>(); + @Override public IActionManager start() { isWorking = true; @@ -105,6 +109,47 @@ public class ActionManager implements IActionManager { return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Queues + + public IActionQueue createQueue(String name) { + return createQueue(name, false); + } + + public IActionQueue createQueue(String name, boolean isParallel) { + IActionQueue queue = new ActionQueue(this, name, isParallel); + otherQueues.put(name, queue); + return queue; + } + + public IActionQueue getOrCreateQueue(String name) { + return getOrCreateQueue(name, false); + } + + public IActionQueue getOrCreateQueue(String name, boolean isParallel) { + IActionQueue queue = getQueue(name); + + if (queue == null) + queue = createQueue(name, isParallel); + return queue; + } + + public IActionQueue getQueue(String name) { + return otherQueues.get(name); + } + + public boolean removeQueue(String name) { + IActionQueue queue = otherQueues.get(name); + + if (queue == null) + return false; + + otherQueues.remove(name); + queue.clear(); + return true; + } + /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Sequential @@ -292,6 +337,12 @@ public class ActionManager implements IActionManager { if (act != null) return act; + for (IActionQueue q : otherQueues.values()) { + act = q.get(name); + if (act != null) + return act; + } + return null; } @@ -309,6 +360,10 @@ public class ActionManager implements IActionManager { if (canceled) return true; + for (IActionQueue queue : otherQueues.values()) + if (queue.cancel(name)) + return true; + return false; } @@ -328,6 +383,9 @@ public class ActionManager implements IActionManager { // ─── Conditionals ───────────────────────────────────────── ((ActionQueue) conditionalQueue).tick(ticksExisted); + + // ─── Other Queues ───────────────────────────────────────── + otherQueues.forEach((name, queue) -> ((ActionQueue) queue).tick(ticksExisted)); } @Override @@ -335,6 +393,7 @@ public class ActionManager implements IActionManager { sequentialQueue.clear(); parallelQueue.clear(); conditionalQueue.clear(); + otherQueues.forEach((name, queue) -> queue.clear()); } @Override From ad4aac1e43e13600333b1fb4a0d0220f041d1afa Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Wed, 2 Jul 2025 22:35:39 +0300 Subject: [PATCH 064/154] Added killWhenEmpty and killAfterTicks to IActionQueue --- .../data/action/ActionManager.java | 14 ++-- .../controllers/data/action/ActionQueue.java | 66 ++++++++++++++++--- 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index adfdc8e8d..478decb46 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -23,9 +23,9 @@ import java.util.function.Function; public class ActionManager implements IActionManager { protected boolean isWorking = false; - protected final IActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); - protected final IActionQueue parallelQueue = new ActionQueue(this, "mainParallel").setParallel(true); - protected final IActionQueue conditionalQueue = new ActionQueue(this, "mainConditional").setParallel(true); + protected final ActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); + protected final ActionQueue parallelQueue = new ActionQueue(this, "mainParallel", true); + protected final ActionQueue conditionalQueue = new ActionQueue(this, "mainConditional", true); protected final Map otherQueues = new HashMap<>(); @@ -118,7 +118,7 @@ public class ActionManager implements IActionManager { } public IActionQueue createQueue(String name, boolean isParallel) { - IActionQueue queue = new ActionQueue(this, name, isParallel); + IActionQueue queue = new ActionQueue(this, name, isParallel).killWhenEmpty(true); otherQueues.put(name, queue); return queue; } @@ -376,13 +376,13 @@ public class ActionManager implements IActionManager { if (!isWorking) return; // ─── Sequential (head only) ───────────────────────────────── - ((ActionQueue) sequentialQueue).tick(ticksExisted); + sequentialQueue.tick(ticksExisted); // ─── Parallel (all) ─────────────────────────────────────── - ((ActionQueue) parallelQueue).tick(ticksExisted); + parallelQueue.tick(ticksExisted); // ─── Conditionals ───────────────────────────────────────── - ((ActionQueue) conditionalQueue).tick(ticksExisted); + conditionalQueue.tick(ticksExisted); // ─── Other Queues ───────────────────────────────────────── otherQueues.forEach((name, queue) -> ((ActionQueue) queue).tick(ticksExisted)); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index cf64c17e4..56a5fa6bc 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -14,8 +14,10 @@ public class ActionQueue implements IActionQueue { protected final ActionManager manager; protected final String name; - protected boolean isParallel; protected boolean isWorking; + protected boolean isParallel; + protected boolean killWhenEmpty; + protected int killAfterTicks = 100; public ActionQueue(ActionManager manager, String name) { this.manager = manager; @@ -47,21 +49,48 @@ public class ActionQueue implements IActionQueue { public String getName() { return name; } - @Override - public boolean isParallel() { - return isParallel; - } - - public IActionQueue setParallel(boolean parallel) { - isParallel = parallel; - return this; - } @Override public Queue getQueue() { return queue; } + @Override + public boolean isParallel() { + return isParallel; + } + + @Override + public IActionQueue setParallel(boolean parallel) { + isParallel = parallel; + return this; + } + @Override + public boolean isKilledWhenEmpty() { + return killWhenEmpty; + } + + @Override + public int getKillAfterTicks() { + return killAfterTicks; + } + + @Override + public IActionQueue killWhenEmpty(boolean killWhenEmpty) { + this.killWhenEmpty = killWhenEmpty; + return this; + } + + @Override + public IActionQueue killAfter(int ticks) { + this.killAfterTicks = ticks; + return this; + } + + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Schedulers + @Override public IAction schedule(IAction action) { Action act = (Action) action; @@ -143,6 +172,10 @@ public class ActionQueue implements IActionQueue { return action; } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Queue Data + @Override public int getIndex(IAction action) { int i = 0; @@ -202,6 +235,10 @@ public class ActionQueue implements IActionQueue { return false; } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Handling + protected void tick(int ticksExisted) { if (!isWorking) return; @@ -228,6 +265,15 @@ public class ActionQueue implements IActionQueue { } } } + + if (killWhenEmpty && queue.isEmpty()) + schedule(killAfterTicks, (act) -> { + if (!queue.isEmpty()) + act.markDone(); + + manager.removeQueue(name); + }); + } @Override From 7e1374d96ab4503a67512f944b5c4062b7ad2223 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 18:07:18 +0300 Subject: [PATCH 065/154] Adjusted ActionQueue killing logic --- .../npcs/controllers/data/action/Action.java | 20 ++++-- .../data/action/ActionManager.java | 15 ++++- .../controllers/data/action/ActionQueue.java | 65 ++++++++++++++----- .../data/action/action/ConditionalAction.java | 5 +- 4 files changed, 80 insertions(+), 25 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 8c12da222..29d4dfeb5 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -186,6 +186,10 @@ public class Action implements IAction { @Override public void markDone() { done = true; + + if (isThreaded && actionThread.inActionThread()) { + queue.cancel(this); + } } @Override @@ -335,13 +339,17 @@ public class Action implements IAction { return befores; } - protected void scheduleAllBefore(Deque actionQueue) { + protected void scheduleAllBefore(Deque deque) { allUnscheduledBefore().forEach((bef) -> { if (bef.unscheduledAfter != null) bef.unscheduledAfter.unscheduledBefore = null; bef.unscheduledAfter = null; - actionQueue.addLast(bef); + deque.addLast(bef); + + if (bef.queue != queue) + bef.queue = queue; + bef.isScheduled = true; }); } @@ -357,13 +365,17 @@ public class Action implements IAction { return afters; } - protected void scheduleAllAfter(Deque actionQueue) { + protected void scheduleAllAfter(Deque deque) { allUnscheduledAfter().forEach((aft) -> { if (aft.unscheduledBefore != null) aft.unscheduledBefore.unscheduledAfter = null; aft.unscheduledBefore = null; - actionQueue.addLast(aft); + deque.addLast(aft); + + if (aft.queue != queue) + aft.queue = queue; + aft.isScheduled = true; }); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 478decb46..9322fd836 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -8,6 +8,7 @@ import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.action.ConditionalAction; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; @@ -145,8 +146,7 @@ public class ActionManager implements IActionManager { if (queue == null) return false; - otherQueues.remove(name); - queue.clear(); + queue.kill(); return true; } @@ -385,7 +385,16 @@ public class ActionManager implements IActionManager { conditionalQueue.tick(ticksExisted); // ─── Other Queues ───────────────────────────────────────── - otherQueues.forEach((name, queue) -> ((ActionQueue) queue).tick(ticksExisted)); + Iterator it = otherQueues.values().iterator(); + while (it.hasNext()) { + IActionQueue other = it.next(); + ((ActionQueue) other).tick(ticksExisted); + + if (other.isKilled()) { + other.clear(); + it.remove(); + } + } } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 56a5fa6bc..a068121dc 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -14,11 +14,15 @@ public class ActionQueue implements IActionQueue { protected final ActionManager manager; protected final String name; - protected boolean isWorking; + protected boolean isWorking = true; protected boolean isParallel; + + protected boolean kill; protected boolean killWhenEmpty; protected int killAfterTicks = 100; + private Action autoKill; + public ActionQueue(ActionManager manager, String name) { this.manager = manager; this.name = name; @@ -87,6 +91,17 @@ public class ActionQueue implements IActionQueue { return this; } + @Override + public boolean isKilled() { + return kill; + } + + @Override + public IActionQueue kill() { + this.kill = true; + return this; + } + /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Schedulers @@ -95,20 +110,19 @@ public class ActionQueue implements IActionQueue { public IAction schedule(IAction action) { Action act = (Action) action; - if (!isParallel && act.unscheduledBefore != null) - act.scheduleAllBefore(queue); - - - queue.addLast(action); - - - if (!isParallel && act.unscheduledAfter != null) - act.scheduleAllAfter(queue); - if (act.queue != this) act.setQueue(this); act.isScheduled = true; + + if (!isParallel && act.unscheduledBefore != null) + act.scheduleAllBefore(queue); + + queue.addLast(action); + + if (!isParallel && act.unscheduledAfter != null) + act.scheduleAllAfter(queue); + return action; } @@ -176,6 +190,10 @@ public class ActionQueue implements IActionQueue { /////////////////////////////////////////////////// // Queue Data + public boolean hasActiveTasks() { + return !queue.isEmpty(); + } + @Override public int getIndex(IAction action) { int i = 0; @@ -218,7 +236,12 @@ public class ActionQueue implements IActionQueue { @Override public boolean cancel(IAction action) { - return cancel(action.getName()); + if (queue.remove(action)) { + action.kill(); + return true; + } + + return false; } @Override @@ -243,6 +266,7 @@ public class ActionQueue implements IActionQueue { if (!isWorking) return; + killWhenEmpty(ticksExisted); if (!isParallel) { IAction current = getCurrentAction(); @@ -265,15 +289,22 @@ public class ActionQueue implements IActionQueue { } } } + } - if (killWhenEmpty && queue.isEmpty()) - schedule(killAfterTicks, (act) -> { - if (!queue.isEmpty()) - act.markDone(); + protected void killWhenEmpty(int ticksExisted) { + if (killWhenEmpty && !hasActiveTasks() && autoKill == null) + autoKill = (Action) manager.create(killAfterTicks, (act) -> { + if (hasActiveTasks()) + return; manager.removeQueue(name); - }); + }).updateEvery(1).once(); + if (autoKill != null) { + autoKill.tick(ticksExisted); + if (autoKill.isDone()) + autoKill = null; + } } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index b2e81d344..73a326eab 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -94,7 +94,8 @@ public class ConditionalAction extends Action implements IConditionalAction { @Override public void tick(int ticksExisted) { - if (done) + updateEveryXTick = 10; + if (isDone()) return; if (maxChecks > -1 && checkCount > maxChecks || maxCount == 0) { @@ -103,6 +104,7 @@ public class ConditionalAction extends Action implements IConditionalAction { } if (ticksExisted % updateEveryXTick == 0) { + System.out.println("start"); checkCount++; Runnable execute = () -> { @@ -114,6 +116,7 @@ public class ConditionalAction extends Action implements IConditionalAction { executeOnTermination(); markDone(); } + System.out.println("exec'd!"); }; if (isThreaded) From e0c9bfffa529b3f73bf92a07e75830d53673e71e Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 18:29:53 +0300 Subject: [PATCH 066/154] Fixed updateEveryXTicks being inconsistent due to using entity's ticksExisted. IAction instances now track their own tick --- .../noppes/npcs/ScriptPlayerEventHandler.java | 4 +--- src/main/java/noppes/npcs/ServerTickHandler.java | 2 +- .../npcs/controllers/data/action/Action.java | 15 ++++++++------- .../controllers/data/action/ActionManager.java | 12 +++++------- .../npcs/controllers/data/action/ActionQueue.java | 12 ++++++------ .../controllers/data/action/ActionThread.java | 7 +++++-- .../data/action/action/ConditionalAction.java | 11 ++++------- .../noppes/npcs/entity/EntityNPCInterface.java | 2 +- 8 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index 63a9da703..ccd8c1cfa 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -36,10 +36,8 @@ import noppes.npcs.config.ConfigScript; import noppes.npcs.controllers.data.*; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemNpcTool; -import noppes.npcs.items.ItemScripted; import noppes.npcs.quests.QuestItem; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.ItemEvent; import static noppes.npcs.config.ConfigMain.TrackedQuestUpdateFrequency; @@ -74,7 +72,7 @@ public class ScriptPlayerEventHandler { if (PlayerDataController.Instance != null) { PlayerData playerData = PlayerData.get(player); - playerData.actionManager.tick(player.ticksExisted); + playerData.actionManager.tick(); if (playerData.updateClient) { SyncController.syncPlayerData((EntityPlayerMP) player, true); diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index ecfdce50a..6b5706b15 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -21,7 +21,7 @@ public class ServerTickHandler { @SubscribeEvent public void onServerTick(TickEvent.ServerTickEvent event) { if (event.phase == Phase.END) { - NpcAPI.actionManager.tick(MinecraftServer.getServer().getTickCounter()); + NpcAPI.actionManager.tick(); } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 29d4dfeb5..fbcfaf2ef 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -186,10 +186,6 @@ public class Action implements IAction { @Override public void markDone() { done = true; - - if (isThreaded && actionThread.inActionThread()) { - queue.cancel(this); - } } @Override @@ -207,9 +203,14 @@ public class Action implements IAction { return this; } - public void tick(int ticksExisted) { + public void tick() { if (done) return; + + + duration++; + System.out.println(duration); + if (startAfterTicks > 0) { startAfterTicks--; return; @@ -218,7 +219,8 @@ public class Action implements IAction { markDone(); return; } - if (ticksExisted % updateEveryXTick == 0 && task != null) { + + if (duration % updateEveryXTick == 0 && task != null) { if (isThreaded) actionThread.execute("task", this::executeTask); else @@ -228,7 +230,6 @@ public class Action implements IAction { if (maxCount > -1 && count >= maxCount) markDone(); - duration++; } protected void executeTask() { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 9322fd836..57dbad834 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -369,26 +369,24 @@ public class ActionManager implements IActionManager { /** * Call once per tick from your main loop. - * - * @param ticksExisted the global tick count, used for modulo checks. */ - public void tick(int ticksExisted) { + public void tick() { if (!isWorking) return; // ─── Sequential (head only) ───────────────────────────────── - sequentialQueue.tick(ticksExisted); + sequentialQueue.tick(); // ─── Parallel (all) ─────────────────────────────────────── - parallelQueue.tick(ticksExisted); + parallelQueue.tick(); // ─── Conditionals ───────────────────────────────────────── - conditionalQueue.tick(ticksExisted); + conditionalQueue.tick(); // ─── Other Queues ───────────────────────────────────────── Iterator it = otherQueues.values().iterator(); while (it.hasNext()) { IActionQueue other = it.next(); - ((ActionQueue) other).tick(ticksExisted); + ((ActionQueue) other).tick(); if (other.isKilled()) { other.clear(); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index a068121dc..bd987f12e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -262,17 +262,17 @@ public class ActionQueue implements IActionQueue { /////////////////////////////////////////////////// // Handling - protected void tick(int ticksExisted) { + protected void tick() { if (!isWorking) return; - killWhenEmpty(ticksExisted); + killWhenEmpty(); if (!isParallel) { IAction current = getCurrentAction(); if (current instanceof Action) { Action cab = (Action) current; - cab.tick(ticksExisted); + cab.tick(); if (cab.isDone()) { cab.kill(); queue.pollFirst(); @@ -282,7 +282,7 @@ public class ActionQueue implements IActionQueue { Iterator pit = queue.iterator(); while (pit.hasNext()) { Action a = (Action) pit.next(); - a.tick(ticksExisted); + a.tick(); if (a.isDone()) { a.kill(); pit.remove(); @@ -291,7 +291,7 @@ public class ActionQueue implements IActionQueue { } } - protected void killWhenEmpty(int ticksExisted) { + protected void killWhenEmpty() { if (killWhenEmpty && !hasActiveTasks() && autoKill == null) autoKill = (Action) manager.create(killAfterTicks, (act) -> { if (hasActiveTasks()) @@ -301,7 +301,7 @@ public class ActionQueue implements IActionQueue { }).updateEvery(1).once(); if (autoKill != null) { - autoKill.tick(ticksExisted); + autoKill.tick(); if (autoKill.isDone()) autoKill = null; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index ae5db82d6..0701c58c0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -92,6 +92,10 @@ public class ActionThread { } } + public boolean isTaskRunning(String taskKey) { + return runningTasks.contains(taskKey); + } + public boolean inActionThread() { return Thread.currentThread() == thread; } @@ -108,13 +112,12 @@ public class ActionThread { if (threadPaused && pauseUntil != null && pauseUntil.apply(action)) resume(); - if (runningKeys.contains(taskKey)) + if (!runningKeys.add(taskKey)) return; final AtomicReference> taskRef = new AtomicReference<>(); taskRef.set(executor.submit(() -> { runningTasks.add(taskRef.get()); - runningKeys.add(taskKey); try { task.run(); } finally { diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 73a326eab..c8b890bf8 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -93,18 +93,18 @@ public class ConditionalAction extends Action implements IConditionalAction { } @Override - public void tick(int ticksExisted) { - updateEveryXTick = 10; + public void tick() { if (isDone()) return; + duration++; + if (maxChecks > -1 && checkCount > maxChecks || maxCount == 0) { markDone(); return; } - if (ticksExisted % updateEveryXTick == 0) { - System.out.println("start"); + if (duration % updateEveryXTick == 0) { checkCount++; Runnable execute = () -> { @@ -116,7 +116,6 @@ public class ConditionalAction extends Action implements IConditionalAction { executeOnTermination(); markDone(); } - System.out.println("exec'd!"); }; if (isThreaded) @@ -127,8 +126,6 @@ public class ConditionalAction extends Action implements IConditionalAction { if (maxCount > -1 && count >= maxCount) markDone(); - - duration++; } protected void executeTask() { diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 7fd5525e2..5bd0bdd43 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -367,7 +367,7 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti combatHandler.update(); onCollide(); - actionManager.tick(ticksExisted); + actionManager.tick(); } if (wasKilled != isKilled() && wasKilled) { From e017ad1f839d4fa010e803f128064c6e2278d40f Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 18:35:00 +0300 Subject: [PATCH 067/154] Fixed player.getActionManager() NULL (data was null) --- src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 93b7aa6e7..cffd0696d 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -58,6 +58,7 @@ public class ScriptPlayer extends ScriptLivingBase public ScriptPlayer(T player) { super(player); this.player = player; + this.data = getData(); } /** From 33b5de833d740151471035ba69e33bbf74420c57 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 18:40:24 +0300 Subject: [PATCH 068/154] forghoer --- src/main/java/noppes/npcs/controllers/data/action/Action.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index fbcfaf2ef..cf86f7a02 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -207,9 +207,7 @@ public class Action implements IAction { if (done) return; - duration++; - System.out.println(duration); if (startAfterTicks > 0) { startAfterTicks--; From a8a8094d7e5c6b4c3af4f7aaabe4f9c44a8db8e8 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 23:17:25 +0300 Subject: [PATCH 069/154] oops --- src/api | 2 +- src/main/java/noppes/npcs/controllers/data/action/Action.java | 3 ++- .../java/noppes/npcs/controllers/data/action/ActionQueue.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/api b/src/api index 1b96a3dc8..1f2c06f49 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 1b96a3dc874a4b89ae751f63836a4257d3088d2e +Subproject commit 1f2c06f4985e1bf927eae0bd3c9b84a260691554 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index cf86f7a02..f91d84f52 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -1,5 +1,6 @@ package noppes.npcs.controllers.data.action; +import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; @@ -68,7 +69,7 @@ public class Action implements IAction { } @Override - public ActionManager getManager() { + public IActionManager getManager() { return manager; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index bd987f12e..2356c9bed 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -1,5 +1,6 @@ package noppes.npcs.controllers.data.action; +import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; @@ -45,7 +46,7 @@ public class ActionQueue implements IActionQueue { return this; } @Override - public ActionManager getManager() { + public IActionManager getManager() { return manager; } From c147250784ff11784938768db63c5aad72a1693b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 23:45:16 +0300 Subject: [PATCH 070/154] Renamed killAfter to killWhenEmptyAfter --- .../npcs/controllers/data/action/ActionQueue.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 2356c9bed..6cd702771 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -20,7 +20,7 @@ public class ActionQueue implements IActionQueue { protected boolean kill; protected boolean killWhenEmpty; - protected int killAfterTicks = 100; + protected int killWhenEmptyAfter = 100; private Action autoKill; @@ -76,8 +76,8 @@ public class ActionQueue implements IActionQueue { } @Override - public int getKillAfterTicks() { - return killAfterTicks; + public int getKillWhenEmptyAfter() { + return killWhenEmptyAfter; } @Override @@ -87,8 +87,8 @@ public class ActionQueue implements IActionQueue { } @Override - public IActionQueue killAfter(int ticks) { - this.killAfterTicks = ticks; + public IActionQueue killWhenEmptyAfter(int ticks) { + this.killWhenEmptyAfter = ticks; return this; } @@ -294,7 +294,7 @@ public class ActionQueue implements IActionQueue { protected void killWhenEmpty() { if (killWhenEmpty && !hasActiveTasks() && autoKill == null) - autoKill = (Action) manager.create(killAfterTicks, (act) -> { + autoKill = (Action) manager.create(killWhenEmptyAfter, (act) -> { if (hasActiveTasks()) return; From 50aedd8f56a5f9509139624de68e6d3f9920a2f3 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Thu, 3 Jul 2025 23:52:05 +0300 Subject: [PATCH 071/154] IActionQueue methods to IActionManager --- .../noppes/npcs/controllers/data/action/ActionManager.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 57dbad834..abec9edf0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -114,20 +114,24 @@ public class ActionManager implements IActionManager { /////////////////////////////////////////////////// // Queues + @Override public IActionQueue createQueue(String name) { return createQueue(name, false); } + @Override public IActionQueue createQueue(String name, boolean isParallel) { IActionQueue queue = new ActionQueue(this, name, isParallel).killWhenEmpty(true); otherQueues.put(name, queue); return queue; } + @Override public IActionQueue getOrCreateQueue(String name) { return getOrCreateQueue(name, false); } + @Override public IActionQueue getOrCreateQueue(String name, boolean isParallel) { IActionQueue queue = getQueue(name); @@ -136,10 +140,12 @@ public class ActionManager implements IActionManager { return queue; } + @Override public IActionQueue getQueue(String name) { return otherQueues.get(name); } + @Override public boolean removeQueue(String name) { IActionQueue queue = otherQueues.get(name); From 44d76b638df492ce2692577cb5a0d796e18f2203 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Fri, 4 Jul 2025 00:10:12 +0300 Subject: [PATCH 072/154] Minor changes --- .../java/noppes/npcs/controllers/data/action/Action.java | 9 +++++---- .../noppes/npcs/controllers/data/action/ActionQueue.java | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index f91d84f52..ea7ce9ca0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -509,10 +509,6 @@ public class Action implements IAction { return before(manager.create(t)); } - @Override - public IConditionalAction conditional(IConditionalAction after) { - return manager.schedule(after); - } /////////////////////////////////////////////////// /////////////////////////////////////////////////// @@ -566,6 +562,11 @@ public class Action implements IAction { /////////////////////////////////////////////////// // Conditionals + @Override + public IConditionalAction conditional(IConditionalAction after) { + return manager.schedule(after); + } + @Override public void conditional(IConditionalAction... actions) { for (IConditionalAction act : actions) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 6cd702771..e079d6d24 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -267,8 +267,6 @@ public class ActionQueue implements IActionQueue { if (!isWorking) return; - killWhenEmpty(); - if (!isParallel) { IAction current = getCurrentAction(); if (current instanceof Action) { @@ -290,6 +288,8 @@ public class ActionQueue implements IActionQueue { } } } + + killWhenEmpty(); } protected void killWhenEmpty() { From 7786d8e271d4573bb02576cc317ce9748454d767 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 5 Jul 2025 10:19:11 +0300 Subject: [PATCH 073/154] a buncha IAction adjustments --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 12 ++++++++++++ .../controllers/data/action/ActionManager.java | 9 +++++++-- .../npcs/controllers/data/action/ActionQueue.java | 14 +++++++------- .../data/action/action/ConditionalAction.java | 12 ++++++------ .../controllers/data/action/chain/ActionChain.java | 2 +- 6 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/api b/src/api index 1f2c06f49..14f7bd3dd 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 1f2c06f4985e1bf927eae0bd3c9b84a260691554 +Subproject commit 14f7bd3dd402498e3217aca8d3de26f53340169b diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index ea7ce9ca0..18c1f2de4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -140,6 +140,18 @@ public class Action implements IAction { return this; } + @Override + public IAction everyTick() { + this.updateEveryXTick = 1; + return this; + } + + @Override + public IAction everySecond() { + this.updateEveryXTick = 20; + return this; + } + @Override public int getCount() { return count; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index abec9edf0..01f4edd32 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -27,9 +27,9 @@ public class ActionManager implements IActionManager { protected final ActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); protected final ActionQueue parallelQueue = new ActionQueue(this, "mainParallel", true); protected final ActionQueue conditionalQueue = new ActionQueue(this, "mainConditional", true); - protected final Map otherQueues = new HashMap<>(); + @Override public IActionManager start() { isWorking = true; @@ -145,6 +145,11 @@ public class ActionManager implements IActionManager { return otherQueues.get(name); } + @Override + public boolean hasQueue(String name) { + return otherQueues.containsKey(name); + } + @Override public boolean removeQueue(String name) { IActionQueue queue = otherQueues.get(name); @@ -394,7 +399,7 @@ public class ActionManager implements IActionManager { IActionQueue other = it.next(); ((ActionQueue) other).tick(); - if (other.isKilled()) { + if (other.isDead()) { other.clear(); it.remove(); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index e079d6d24..a6fc2c054 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -18,11 +18,11 @@ public class ActionQueue implements IActionQueue { protected boolean isWorking = true; protected boolean isParallel; - protected boolean kill; + protected boolean isDead; protected boolean killWhenEmpty; protected int killWhenEmptyAfter = 100; - private Action autoKill; + protected Action autoKill; public ActionQueue(ActionManager manager, String name) { this.manager = manager; @@ -93,13 +93,13 @@ public class ActionQueue implements IActionQueue { } @Override - public boolean isKilled() { - return kill; + public boolean isDead() { + return isDead; } @Override public IActionQueue kill() { - this.kill = true; + this.isDead = true; return this; } @@ -264,7 +264,7 @@ public class ActionQueue implements IActionQueue { // Handling protected void tick() { - if (!isWorking) + if (!isWorking || isDead) return; if (!isParallel) { @@ -299,7 +299,7 @@ public class ActionQueue implements IActionQueue { return; manager.removeQueue(name); - }).updateEvery(1).once(); + }).everyTick().once(); if (autoKill != null) { autoKill.tick(); diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index c8b890bf8..845f09c54 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -11,12 +11,12 @@ import java.util.function.Function; public class ConditionalAction extends Action implements IConditionalAction { - private Function condition; - private Function terminateWhen; - private Consumer onTermination; - private int maxChecks = -1; - private int checkCount; - private boolean taskExecuted; + protected Function condition; + protected Function terminateWhen; + protected Consumer onTermination; + protected int maxChecks = -1; + protected int checkCount; + protected boolean taskExecuted; public ConditionalAction(ActionManager manager, Function condition, Consumer task) { super(manager, task); diff --git a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java index 3897f4091..c5940a2a6 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java +++ b/src/main/java/noppes/npcs/controllers/data/action/chain/ActionChain.java @@ -50,7 +50,7 @@ public class ActionChain implements IActionChain { @Override public IActionChain after(int delay, String name, Consumer task) { offset = queue.isParallel() ? offset + delay : delay; - queue.schedule(name, offset, task).updateEvery(1).once(); + queue.schedule(name, offset, task).everyTick().once(); index++; return this; } From f100fb0ab1630530c64df46197e45bbf9585313b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 5 Jul 2025 11:44:29 +0300 Subject: [PATCH 074/154] Fixed NPC Target and TargetLost events firing redundantly --- .../npcs/entity/EntityNPCInterface.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 5bd0bdd43..77f78bda6 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -644,18 +644,21 @@ public abstract class EntityNPCInterface extends EntityCreature implements IEnti if (entity instanceof EntityPlayer && DBCAddon.instance.isKO(this, (EntityPlayer) entity)) return; if (!isRemote()) { - if (getAttackTarget() != entity && entity != null) { - NpcEvent.TargetEvent event = new NpcEvent.TargetEvent(wrappedNPC, entity); - if (EventHooks.onNPCTarget(this, event)) - return; + if (getAttackTarget() != entity) { + if (entity != null) { + NpcEvent.TargetEvent event = new NpcEvent.TargetEvent(wrappedNPC, entity); + if (EventHooks.onNPCTarget(this, event)) + return; - if (event.getTarget() == null) - entity = null; - else - entity = event.getTarget().getMCEntity(); - } else { - if (EventHooks.onNPCTargetLost(this, getAttackTarget(), entity)) - return; + if (event.getTarget() == null) + entity = null; + else + entity = event.getTarget().getMCEntity(); + } + if (getAttackTarget() != null) { + if (EventHooks.onNPCTargetLost(this, getAttackTarget(), entity)) + return; + } } if (entity != null && entity != this && ais.onAttack != 3 && !isAttacking()) { Line line = advanced.getAttackLine(); From 253bfd7e17ded738103c72d92fc6a359aeb56815 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sat, 5 Jul 2025 22:50:38 +0300 Subject: [PATCH 075/154] Revamped before() and after() chaining of unscheduled IActions --- .../npcs/controllers/data/action/Action.java | 82 +++++-------------- .../controllers/data/action/ActionList.java | 63 ++++++++++++++ .../controllers/data/action/ActionQueue.java | 10 +-- 3 files changed, 87 insertions(+), 68 deletions(-) create mode 100644 src/main/java/noppes/npcs/controllers/data/action/ActionList.java diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 18c1f2de4..02ca835df 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -31,6 +31,9 @@ public class Action implements IAction { protected ActionThread actionThread; protected ScriptContainer reportTo; + //allows chaining .before() and .after() on unscheduled actions + protected ActionList unscheduledList; + public Action(ActionManager manager, String name) { this.manager = manager; this.name = name; @@ -337,61 +340,6 @@ public class Action implements IAction { /////////////////////////////////////////////////// // Sequential - protected Action unscheduledBefore, unscheduledAfter; - - protected LinkedList allUnscheduledBefore() { - Action before = unscheduledBefore; - - LinkedList befores = new LinkedList<>(); - while (before != null) { - befores.addFirst(before); - before = before.unscheduledBefore; - } - - return befores; - } - - protected void scheduleAllBefore(Deque deque) { - allUnscheduledBefore().forEach((bef) -> { - if (bef.unscheduledAfter != null) - bef.unscheduledAfter.unscheduledBefore = null; - bef.unscheduledAfter = null; - - deque.addLast(bef); - - if (bef.queue != queue) - bef.queue = queue; - - bef.isScheduled = true; - }); - } - - protected LinkedList allUnscheduledAfter() { - Action after = unscheduledAfter; - - LinkedList afters = new LinkedList<>(); - while (after != null) { - afters.add(after); - after = after.unscheduledAfter; - } - return afters; - } - - protected void scheduleAllAfter(Deque deque) { - allUnscheduledAfter().forEach((aft) -> { - if (aft.unscheduledBefore != null) - aft.unscheduledBefore.unscheduledAfter = null; - aft.unscheduledBefore = null; - - deque.addLast(aft); - - if (aft.queue != queue) - aft.queue = queue; - - aft.isScheduled = true; - }); - } - @Override public IAction getNext() { if (queue == null) @@ -429,12 +377,13 @@ public class Action implements IAction { return conditional((IConditionalAction) after); int idx = queue == null ? -1 : queue.getIndex(this); - if (idx >= 0) + if (idx >= 0 && !queue.isParallel()) queue.scheduleActionAt(idx + 1, after); else { - Action aft = (Action) after; - unscheduledAfter = aft; - aft.unscheduledBefore = this; + if (unscheduledList == null) + unscheduledList = new ActionList(this); + + unscheduledList.after(this, (Action) after); } return after; } @@ -486,12 +435,13 @@ public class Action implements IAction { return conditional((IConditionalAction) before); int idx = queue == null ? -1 : queue.getIndex(this); - if (idx >= 0) + if (idx >= 0 && !queue.isParallel()) queue.scheduleActionAt(Math.max(0, idx), before); else { - Action bef = (Action) before; - unscheduledBefore = bef; - bef.unscheduledAfter = this; + if (unscheduledList == null) + unscheduledList = new ActionList(this); + + unscheduledList.before(this, (Action) before); } return before; } @@ -528,6 +478,9 @@ public class Action implements IAction { @Override public IAction parallel(IAction act) { + if (unscheduledList != null) + ((Action) act).unscheduledList = unscheduledList; + if (queue != null && queue.isParallel() && queue != manager.conditionalQueue) return queue.schedule(act); @@ -576,6 +529,9 @@ public class Action implements IAction { @Override public IConditionalAction conditional(IConditionalAction after) { + if (unscheduledList != null) + ((Action) after).unscheduledList = unscheduledList; + return manager.schedule(after); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java new file mode 100644 index 000000000..79ad8bcc0 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java @@ -0,0 +1,63 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionQueue; + +import java.util.LinkedList; +import java.util.function.Consumer; + +public class ActionList { + + protected final LinkedList list = new LinkedList<>(); + protected final Action first; + protected IActionQueue originalQueue; + + public ActionList(Action action) { + list.addFirst(first = action); + originalQueue = action.getQueue(); + } + + public Action after(Action current, Action aft) { + int currentIndex = list.indexOf(current); + + if (currentIndex == -1) + list.addLast(aft); + else + list.add(currentIndex + 1, aft); + + aft.unscheduledList = this; + return aft; + } + + public Action before(Action current, Action bef) { + int currentIndex = list.indexOf(current); + + if (currentIndex == -1) + list.addLast(bef); + else + list.add(Math.max(0, currentIndex), bef); + + bef.unscheduledList = this; + return bef; + } + + public ActionList scheduleAll(IActionQueue queue) { + list.forEach(act -> { + queue.getQueue().add(act); + act.queue = queue; + act.isScheduled = true; + }); + + return this; + } + + public ActionList forEach(Consumer task) { + list.forEach(task); + return this; + } + + public ActionList kill() { + list.clear(); + return this; + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index a6fc2c054..d611a70fd 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -116,14 +116,13 @@ public class ActionQueue implements IActionQueue { act.isScheduled = true; - if (!isParallel && act.unscheduledBefore != null) - act.scheduleAllBefore(queue); + if (!isParallel && act.unscheduledList != null) { + act.unscheduledList.scheduleAll(this).forEach((act1) -> act1.unscheduledList = null).kill(); + return action; + } queue.addLast(action); - if (!isParallel && act.unscheduledAfter != null) - act.scheduleAllAfter(queue); - return action; } @@ -183,6 +182,7 @@ public class ActionQueue implements IActionQueue { queue.clear(); queue.addAll(tmp); } + ((Action) action).queue = this; ((Action) action).isScheduled = true; return action; } From 5e48063311e1357bb333ea7682980580d433736e Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 6 Jul 2025 10:56:29 +0300 Subject: [PATCH 076/154] Added print debugging dump methods for most IAction framework components --- .../npcs/controllers/data/action/Action.java | 23 +++++++++++-- .../data/action/ActionManager.java | 32 +++++++++++++++++-- .../controllers/data/action/ActionQueue.java | 28 +++++++++++++--- .../data/action/action/ConditionalAction.java | 20 ++++++++++++ 4 files changed, 92 insertions(+), 11 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 02ca835df..de48ac9f0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -8,9 +8,7 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.scripted.CustomNPCsException; import org.apache.commons.lang3.exception.ExceptionUtils; -import java.util.Deque; import java.util.HashMap; -import java.util.LinkedList; import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; @@ -43,7 +41,7 @@ public class Action implements IAction { } public Action(ActionManager manager, Consumer task) { - this(manager, task.toString(), task); + this(manager, Integer.toHexString(task.hashCode()), task); } public Action(ActionManager manager, String name, Consumer task) { @@ -194,6 +192,22 @@ public class Action implements IAction { return this; } + @Override + public String printData() { + if (dataStore.isEmpty()) { + return String.format("Action[name=%s] dataStore is empty", name); + } + + StringBuilder sb = new StringBuilder(); + sb.append(String.format("Action[name=%s] dataStore contents:\n", name)); + + for (Map.Entry entry : dataStore.entrySet()) { + sb.append(String.format(" %s = %s\n", entry.getKey(), entry.getValue())); + } + + return sb.toString(); + } + @Override public boolean hasData(String key) { return dataStore.containsKey(key); @@ -272,6 +286,9 @@ public class Action implements IAction { done = true; } + public String toString() { + return String.format("Action '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + } /////////////////////////////////////////////////// ////////////////////////////////////////////////// // Thread diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 01f4edd32..95bbeb0de 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -7,9 +7,7 @@ import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.*; import java.util.function.Consumer; import java.util.function.Function; @@ -329,6 +327,18 @@ public class ActionManager implements IActionManager { /////////////////////////////////////////////////// // Handling + @Override + public IActionQueue[] getAllQueues() { + ArrayList allQueues = new ArrayList<>(); + + allQueues.add(sequentialQueue); + allQueues.add(parallelQueue); + allQueues.add(conditionalQueue); + + allQueues.addAll(otherQueues.values()); + + return allQueues.toArray(new IActionQueue[0]); + } @Override public boolean hasAny(String name) { return getAny(name) != null; @@ -423,4 +433,20 @@ public class ActionManager implements IActionManager { public IActionChain parallelChain() { return parallelQueue.chain(); } + + @Override + public String printQueues() { + + StringBuilder sb = new StringBuilder(); + sb.append(String.format("ActionManager [working=%s]\n", isWorking)); + + + int i = 0; + for (IActionQueue action : getAllQueues()) { + sb.append(String.format(" [%d] %s\n", i++, action.toString())); + } + + return sb.toString(); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index d611a70fd..d76bfdcb0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -111,11 +111,6 @@ public class ActionQueue implements IActionQueue { public IAction schedule(IAction action) { Action act = (Action) action; - if (act.queue != this) - act.setQueue(this); - - act.isScheduled = true; - if (!isParallel && act.unscheduledList != null) { act.unscheduledList.scheduleAll(this).forEach((act1) -> act1.unscheduledList = null).kill(); return action; @@ -123,6 +118,8 @@ public class ActionQueue implements IActionQueue { queue.addLast(action); + act.queue = this; + act.isScheduled = true; return action; } @@ -319,4 +316,25 @@ public class ActionQueue implements IActionQueue { return new ActionChain(manager, this, isParallel ? "parallel#" : "sequential#"); } + @Override + public String printQueue() { + if (queue.isEmpty()) { + return String.format("ActionQueue[name=%s] is empty", name); + } + + StringBuilder sb = new StringBuilder(); + sb.append(String.format("%s\n", this)); + + int i = 0; + for (IAction action : queue) { + sb.append(String.format(" [%d] %s\n", i++, action.toString())); + } + + return sb.toString(); + } + + public String toString() { + return String.format("ActionQueue '%s' [size=%d, parallel=%s, working=%s, dead=%s, killWhenEmpty=%s, killAfter=%d]", name, queue.size(), isParallel, isWorking, isDead, killWhenEmpty, killWhenEmptyAfter); + } + } diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 845f09c54..7d3d695a3 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -159,4 +159,24 @@ public class ConditionalAction extends Action implements IConditionalAction { } } + + public String toString() { + return String.format( + "ConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", + name != null ? name : "unnamed", + queue != null ? queue.getName() : "null", + isScheduled, + done, + isPaused(), + updateEveryXTick, + duration, + maxDuration, + count, + maxCount, + checkCount, + maxChecks, + taskExecuted, + isThreaded + ); + } } From ffd331fbc57aedac08788dfa15c41a9450b42c13 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 6 Jul 2025 23:29:25 +0300 Subject: [PATCH 077/154] More debugging stuff --- .../java/noppes/npcs/controllers/data/action/Action.java | 4 ++-- .../controllers/data/action/action/ConditionalAction.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index de48ac9f0..d27efe140 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -265,7 +265,7 @@ public class Action implements IAction { task.accept(this); count++; } catch (Throwable t) { - String err = "IAction '" + name + "' threw an exception:"; + String err = "Task of " + this + " threw an exception:"; if (reportTo != null) reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); @@ -287,7 +287,7 @@ public class Action implements IAction { } public String toString() { - return String.format("Action '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + return String.format("IAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); } /////////////////////////////////////////////////// ////////////////////////////////////////////////// diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 7d3d695a3..206be0ed0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -134,7 +134,7 @@ public class ConditionalAction extends Action implements IConditionalAction { count++; taskExecuted = true; } catch (Throwable t) { - String err = "IConditionalAction '" + getName() + "' threw an exception:"; + String err = "Task of " + this + " threw an exception:"; if (reportTo != null) reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); @@ -149,7 +149,7 @@ public class ConditionalAction extends Action implements IConditionalAction { try { onTermination.accept(this); } catch (Throwable t) { - String err = "IConditionalAction's onTermination '" + getName() + "' threw an exception:"; + String err = "Termination Task of " + this + " threw an exception:"; if (reportTo != null) reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); @@ -161,8 +161,7 @@ public class ConditionalAction extends Action implements IConditionalAction { public String toString() { - return String.format( - "ConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", + return String.format("IConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, From 8d63134a72956d81a1bacabf42bb655deac717d6 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 6 Jul 2025 23:57:20 +0300 Subject: [PATCH 078/154] Improved debugging --- .../npcs/controllers/data/action/Action.java | 43 +++++++++++++------ .../controllers/data/action/ActionList.java | 6 +-- .../controllers/data/action/ActionQueue.java | 5 +-- .../data/action/action/ConditionalAction.java | 22 ++-------- 4 files changed, 35 insertions(+), 41 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index d27efe140..b19748495 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -97,6 +97,13 @@ public class Action implements IAction { return this; } + protected void schedule(IActionQueue queue) { + queue.getQueue().add(this); + + this.queue = queue; + this.isScheduled = true; + } + @Override public boolean isScheduled() { return isScheduled; @@ -248,30 +255,27 @@ public class Action implements IAction { return; } - if (duration % updateEveryXTick == 0 && task != null) { - if (isThreaded) - actionThread.execute("task", this::executeTask); - else - executeTask(); - } + if (duration % updateEveryXTick == 0 && task != null) + execute("task", this::executeTask); if (maxCount > -1 && count >= maxCount) markDone(); } + public void execute(String taskName, Runnable task) { + if (isThreaded) + actionThread.execute(taskName, task); + else + task.run(); + } + protected void executeTask() { try { task.accept(this); count++; } catch (Throwable t) { - String err = "Task of " + this + " threw an exception:"; - - if (reportTo != null) - reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); - - System.err.println(err); - t.printStackTrace(); + logDebug("Task of " + this + " threw an exception:", t); markDone(); } } @@ -286,6 +290,19 @@ public class Action implements IAction { done = true; } + public void logDebug(String err) { + logDebug(err, null); + } + + public void logDebug(String err, Throwable t) { + if (reportTo != null) + reportTo.appendConsole(err + (t != null ? "\n" + ExceptionUtils.getStackTrace(t) : "")); + + System.err.println(err); + if (t != null) + t.printStackTrace(); + } + public String toString() { return String.format("IAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java index 79ad8bcc0..8cee13544 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java @@ -42,11 +42,7 @@ public class ActionList { } public ActionList scheduleAll(IActionQueue queue) { - list.forEach(act -> { - queue.getQueue().add(act); - act.queue = queue; - act.isScheduled = true; - }); + list.forEach(act -> act.schedule(queue)); return this; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index d76bfdcb0..1d2f47e26 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -116,10 +116,7 @@ public class ActionQueue implements IActionQueue { return action; } - queue.addLast(action); - - act.queue = this; - act.isScheduled = true; + act.schedule(this); return action; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 206be0ed0..7d2159915 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -4,7 +4,6 @@ import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.data.action.Action; import noppes.npcs.controllers.data.action.ActionManager; -import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.function.Consumer; import java.util.function.Function; @@ -118,10 +117,7 @@ public class ConditionalAction extends Action implements IConditionalAction { } }; - if (isThreaded) - actionThread.execute("task", execute); - else - execute.run(); + execute("task", execute); } if (maxCount > -1 && count >= maxCount) @@ -134,13 +130,7 @@ public class ConditionalAction extends Action implements IConditionalAction { count++; taskExecuted = true; } catch (Throwable t) { - String err = "Task of " + this + " threw an exception:"; - - if (reportTo != null) - reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); - - System.err.println(err); - t.printStackTrace(); + logDebug("Task of " + this + " threw an exception:", t); markDone(); } } @@ -149,13 +139,7 @@ public class ConditionalAction extends Action implements IConditionalAction { try { onTermination.accept(this); } catch (Throwable t) { - String err = "Termination Task of " + this + " threw an exception:"; - - if (reportTo != null) - reportTo.appendConsole(err + "\n" + ExceptionUtils.getStackTrace(t)); - - System.err.println(err); - t.printStackTrace(); + logDebug("Termination Task of " + this + " threw an exception:", t); } } From 835b32daa197bf67bdc95a61ba155ba366775d3b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Sun, 6 Jul 2025 23:59:31 +0300 Subject: [PATCH 079/154] Added onStart(task) and onDone(task) for IAction --- .../npcs/controllers/data/action/Action.java | 34 ++++++++++++++++++- .../controllers/data/action/ActionQueue.java | 4 +++ .../data/action/action/ConditionalAction.java | 3 ++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index b19748495..34c3a662b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -22,7 +22,7 @@ public class Action implements IAction { protected int count, maxCount = -1; protected int duration, maxDuration = -1; protected int updateEveryXTick = 5; - protected Consumer task; + protected Consumer task, onStart, onDone; protected boolean done; protected final Map dataStore = new HashMap<>(); protected boolean isThreaded; @@ -115,6 +115,18 @@ public class Action implements IAction { return this; } + @Override + public IAction onStart(Consumer task) { + this.onStart = task; + return this; + } + + @Override + public IAction onDone(Consumer task) { + this.onDone = task; + return this; + } + @Override public int getDuration() { return duration; @@ -244,6 +256,9 @@ public class Action implements IAction { if (done) return; + if (duration == 0 && onStart != null) + execute("start", this::executeOnStart); + duration++; if (startAfterTicks > 0) { @@ -270,6 +285,14 @@ public class Action implements IAction { task.run(); } + protected void executeOnStart() { + try { + onStart.accept(this); + } catch (Throwable t) { + logDebug("Start Task of " + this + " threw an exception:", t); + } + } + protected void executeTask() { try { task.accept(this); @@ -280,6 +303,15 @@ public class Action implements IAction { } } + protected void executeOnDone() { + try { + onDone.accept(this); + } catch (Throwable t) { + logDebug("Done Task of " + this + " threw an exception:", t); + } + } + + @Override public void kill() { if (actionThread != null) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 1d2f47e26..8becaf38a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -267,6 +267,8 @@ public class ActionQueue implements IActionQueue { Action cab = (Action) current; cab.tick(); if (cab.isDone()) { + if (cab.onDone != null) + cab.execute("task", cab::executeOnDone); cab.kill(); queue.pollFirst(); } @@ -277,6 +279,8 @@ public class ActionQueue implements IActionQueue { Action a = (Action) pit.next(); a.tick(); if (a.isDone()) { + if (a.onDone != null) + a.execute("complete", a::executeOnDone); a.kill(); pit.remove(); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 7d2159915..2d4cab4cc 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -96,6 +96,9 @@ public class ConditionalAction extends Action implements IConditionalAction { if (isDone()) return; + if (duration == 0 && onStart != null) + execute("start", this::executeOnStart); + duration++; if (maxChecks > -1 && checkCount > maxChecks || maxCount == 0) { From 3e6b37ac0542f0c55a9a04e1c7cddc3e42b4fa34 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 00:21:51 +0300 Subject: [PATCH 080/154] action.copyDataTo(IAction copyTo) --- .../java/noppes/npcs/controllers/data/action/Action.java | 6 ++++++ .../noppes/npcs/controllers/data/action/ActionThread.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 34c3a662b..c78310a0d 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -211,6 +211,12 @@ public class Action implements IAction { return this; } + @Override + public IAction copyDataTo(IAction to) { + ((Action) to).dataStore.putAll(dataStore); + return this; + } + @Override public String printData() { if (dataStore.isEmpty()) { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 0701c58c0..c043be3e5 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -93,7 +93,7 @@ public class ActionThread { } public boolean isTaskRunning(String taskKey) { - return runningTasks.contains(taskKey); + return runningKeys.contains(taskKey); } public boolean inActionThread() { From 6b63d89d5545da3b5edd964960e2b39b15bc316e Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 05:22:49 -0400 Subject: [PATCH 081/154] Reset player GUI state on respawn --- src/main/java/noppes/npcs/ServerEventsHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index f8333cc2b..5b98bdca4 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -285,6 +285,16 @@ public class ServerEventsHandler { } } + @SubscribeEvent + public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { + if (event.player == null || event.player.worldObj == null || event.player.worldObj.isRemote) + return; + + PlayerData data = PlayerData.get(event.player); + data.setGUIOpen(false); + data.editingNpc = null; + } + private void doExcalibur(EntityPlayer player, EntityLivingBase entity) { ItemStack item = player.getCurrentEquippedItem(); if (item == null || item.getItem() != CustomItems.excalibur) From 25ab7b2f710883f85747569adcfea7237cd0f252 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 12:23:34 +0300 Subject: [PATCH 082/154] IActionQueue ticking Optimisations --- .../npcs/controllers/data/action/Action.java | 3 ++ .../controllers/data/action/ActionQueue.java | 34 ++++++++----------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index c78310a0d..8d1e929e8 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -265,6 +265,9 @@ public class Action implements IAction { if (duration == 0 && onStart != null) execute("start", this::executeOnStart); + if (done) + return; + duration++; if (startAfterTicks > 0) { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 8becaf38a..627f0bbbf 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -257,34 +257,30 @@ public class ActionQueue implements IActionQueue { /////////////////////////////////////////////////// // Handling + protected boolean tick(Action a) { + a.tick(); + if (a.isDone()) { + if (a.onDone != null) + a.execute("done", a::executeOnDone); + a.kill(); + return true; + } + + return false; + } + protected void tick() { if (!isWorking || isDead) return; if (!isParallel) { - IAction current = getCurrentAction(); - if (current instanceof Action) { - Action cab = (Action) current; - cab.tick(); - if (cab.isDone()) { - if (cab.onDone != null) - cab.execute("task", cab::executeOnDone); - cab.kill(); + if (tick((Action) getCurrentAction())) queue.pollFirst(); - } - } } else { Iterator pit = queue.iterator(); - while (pit.hasNext()) { - Action a = (Action) pit.next(); - a.tick(); - if (a.isDone()) { - if (a.onDone != null) - a.execute("complete", a::executeOnDone); - a.kill(); + while (pit.hasNext()) + if (tick((Action) pit.next())) pit.remove(); - } - } } killWhenEmpty(); From ce0f5b7a78f09880b06b011ec6ae7fd79cd9175c Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 05:37:31 -0400 Subject: [PATCH 083/154] Improve biome detection imports --- .../npcs/client/gui/SubGuiNpcBiomes.java | 19 +++++++++++++++++++ .../java/noppes/npcs/scripted/NpcAPI.java | 10 ++++++++++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index 76b5d8150..8c262cb79 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -2,6 +2,7 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.GuiNpcLabel; @@ -9,7 +10,9 @@ import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; public class SubGuiNpcBiomes extends SubGuiInterface { private SpawnData data; @@ -45,7 +48,15 @@ public class SubGuiNpcBiomes extends SubGuiInterface { addLabel(new GuiNpcLabel(2, "spawning.spawningBiomes", guiLeft + 200, guiTop + 4)); List biomes = new ArrayList(); + Set allBiomes = new HashSet(); + for (BiomeDictionary.Type type : BiomeDictionary.Type.values()) { + allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { + if (base != null) + allBiomes.add(base); + } + for (BiomeGenBase base : allBiomes) { if (base != null && base.biomeName != null && !data.biomes.contains(base.biomeName)) { biomes.add(base.biomeName); } @@ -82,7 +93,15 @@ public class SubGuiNpcBiomes extends SubGuiInterface { } if (button.id == 3) { data.biomes.clear(); + Set allBiomes = new HashSet(); + for (BiomeDictionary.Type type : BiomeDictionary.Type.values()) { + allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { + if (base != null) + allBiomes.add(base); + } + for (BiomeGenBase base : allBiomes) { if (base != null) { data.biomes.add(base.biomeName); } diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 76a9936c2..d19c809bf 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -32,6 +32,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.BiomeDictionary; +import net.minecraftforge.common.BiomeDictionary.Type; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.*; @@ -277,7 +279,15 @@ public class NpcAPI extends AbstractNpcAPI { @Override public String[] getAllBiomeNames() { List biomes = new ArrayList<>(); + Set allBiomes = new HashSet(); + for (Type type : BiomeDictionary.Type.values()) { + allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { + if (base != null) + allBiomes.add(base); + } + for (BiomeGenBase base : allBiomes) { if (base != null && base.biomeName != null) { biomes.add(base.biomeName); } From 6bad9163a0d48db95434f062bf2f332d66392598 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 05:50:29 -0400 Subject: [PATCH 084/154] Avoid saving profile on every login --- .../java/kamkeel/npcs/controllers/ProfileController.java | 8 +++++++- .../kamkeel/npcs/controllers/data/profile/Profile.java | 3 ++- src/main/java/noppes/npcs/util/CustomNPCsThreader.java | 5 +++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index a8f2bf91c..77ee89578 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -97,6 +97,7 @@ public class ProfileController implements IProfileHandler { if (player == null) return; Profile profile; + boolean profileModified = false; if (activeProfiles.containsKey(player.getUniqueID())) { profile = activeProfiles.get(player.getUniqueID()); profile.player = player; @@ -109,6 +110,7 @@ public class ProfileController implements IProfileHandler { profile.getSlots().put(0, defaultSlot); profile.currentSlotId = 0; saveSlotData(player); + profileModified = true; } if (!profile.getSlots().containsKey(profile.currentSlotId)) { profile.currentSlotId = 0; @@ -117,7 +119,10 @@ public class ProfileController implements IProfileHandler { activeProfiles.put(player.getUniqueID(), profile); loadSlotData(player); verifySlotQuests(profile.player); - save(player, profile); + // Avoid saving on every login; only persist if the profile was + // modified (e.g. default slot creation). + if (profileModified) + save(player, profile); } } @@ -341,6 +346,7 @@ public class ProfileController implements IProfileHandler { return ProfileOperation.error(MSG_CANNOT_CLONE_CURRENT); } if (temporary) { + // Use a negative ID for temporary slots so they are never saved to disk. destinationSlotId = getNextAvailableTempSlot(profile); } else { if (destinationSlotId <= 0) { diff --git a/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java b/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java index 857d169f6..04ce9b66c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/profile/Profile.java @@ -81,7 +81,8 @@ public class Profile implements IProfile { compound.setInteger("CurrentSlotId", currentSlotId); NBTTagCompound slotsCompound = new NBTTagCompound(); for (Map.Entry entry : slots.entrySet()) { - // Save only non-temporary slots. + // Temporary slots (typically using negative IDs) are kept in memory + // only and skipped here so they never persist to disk. if (entry.getValue().isTemporary()) continue; slotsCompound.setTag(String.valueOf(entry.getKey()), entry.getValue().toNBT()); diff --git a/src/main/java/noppes/npcs/util/CustomNPCsThreader.java b/src/main/java/noppes/npcs/util/CustomNPCsThreader.java index 3019fb5b1..6ed04819d 100644 --- a/src/main/java/noppes/npcs/util/CustomNPCsThreader.java +++ b/src/main/java/noppes/npcs/util/CustomNPCsThreader.java @@ -4,5 +4,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; public class CustomNPCsThreader { + /** + * Executor used for all asynchronous profile and player data saves. + * It is single-threaded so submitted tasks run sequentially and the + * save order for a given player is preserved. + */ public static final Executor customNPCThread = Executors.newSingleThreadExecutor(); } From 23b55c343fc19b8b32d59be01340802091fd4d36 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 05:56:26 -0400 Subject: [PATCH 085/154] To Dev --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index 14f7bd3dd..9f85df41e 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 14f7bd3dd402498e3217aca8d3de26f53340169b +Subproject commit 9f85df41e02418c825a24ff82b764b10598088d2 From db55dee0480ed732012e46b4a11cfe1bf1bf3d10 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 05:58:38 -0400 Subject: [PATCH 086/154] Fix Respawn Event Issue --- src/main/java/noppes/npcs/ServerEventsHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index 5b98bdca4..c5b92db0a 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -286,7 +286,7 @@ public class ServerEventsHandler { } @SubscribeEvent - public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { + public void onPlayerRespawn(cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent event) { if (event.player == null || event.player.worldObj == null || event.player.worldObj.isRemote) return; From db899fe479af11da49ee9dbd186a66ce01fbb67b Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 06:06:05 -0400 Subject: [PATCH 087/154] Better Collection Handling --- .../java/noppes/npcs/client/gui/SubGuiNpcBiomes.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index 8c262cb79..95c11fd27 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -9,10 +9,7 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; public class SubGuiNpcBiomes extends SubGuiInterface { private SpawnData data; @@ -50,7 +47,7 @@ public class SubGuiNpcBiomes extends SubGuiInterface { List biomes = new ArrayList(); Set allBiomes = new HashSet(); for (BiomeDictionary.Type type : BiomeDictionary.Type.values()) { - allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { if (base != null) @@ -95,7 +92,7 @@ public class SubGuiNpcBiomes extends SubGuiInterface { data.biomes.clear(); Set allBiomes = new HashSet(); for (BiomeDictionary.Type type : BiomeDictionary.Type.values()) { - allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { if (base != null) From 5cb5e3da85a066450195272987b9095e46e8fb6d Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 13:08:51 +0300 Subject: [PATCH 088/154] ActionManager DEBUG MODE Implemented for Actions --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 63 +++++++++++++------ .../data/action/ActionManager.java | 30 ++++++++- .../controllers/data/action/ActionQueue.java | 4 ++ .../controllers/data/action/ActionThread.java | 17 ++++- .../data/action/action/ConditionalAction.java | 45 +++++++++++-- 6 files changed, 134 insertions(+), 27 deletions(-) diff --git a/src/api b/src/api index 14f7bd3dd..aa8ea101b 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 14f7bd3dd402498e3217aca8d3de26f53340169b +Subproject commit aa8ea101bd9caf3679ebfa02d0cc19c982a535e3 diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 8d1e929e8..e98b6c70a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -6,7 +6,6 @@ import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.scripted.CustomNPCsException; -import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.HashMap; import java.util.Map; @@ -84,6 +83,10 @@ public class Action implements IAction { return queue; } + public String getQueueName() { + return queue != null ? queue.getName() : "null"; + } + @Override public IAction setQueue(IActionQueue queue) { if (this.queue == queue) @@ -102,6 +105,9 @@ public class Action implements IAction { this.queue = queue; this.isScheduled = true; + + if (manager.debug) + manager.logDebug(String.format("Scheduled Action '%s' on queue '%s'", name, getQueueName())); } @Override @@ -241,6 +247,9 @@ public class Action implements IAction { @Override public void markDone() { done = true; + + if (manager.debug) + manager.logDebug(String.format("Marked done Action '%s' on queue '%s'", name, getQueueName())); } @Override @@ -270,11 +279,18 @@ public class Action implements IAction { duration++; + if (manager.debug) + manager.logDebug(String.format("Ticking Action '%s' (duration = %s/%s, count = %s/%s) on queue '%s'", name, duration, maxDuration, count, maxCount, getQueueName())); + if (startAfterTicks > 0) { startAfterTicks--; return; } + if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { + if (manager.debug) + manager.logDebug(String.format("Reached max duration of Action '%s' on queue '%s'", name, getQueueName())); + markDone(); return; } @@ -282,8 +298,12 @@ public class Action implements IAction { if (duration % updateEveryXTick == 0 && task != null) execute("task", this::executeTask); - if (maxCount > -1 && count >= maxCount) + if (maxCount > -1 && count >= maxCount) { + if (manager.debug) + manager.logDebug(String.format("Reached max count of Action '%s' on queue '%s'", name, getQueueName())); + markDone(); + } } @@ -295,29 +315,46 @@ public class Action implements IAction { } protected void executeOnStart() { + if (manager.debug) + manager.logDebug(String.format("Started executing onStart task of Action '%s' on queue '%s'", name, getQueueName())); try { onStart.accept(this); } catch (Throwable t) { - logDebug("Start Task of " + this + " threw an exception:", t); + manager.logDebug("Start Task of " + this + " threw an exception:", t); } + + if (manager.debug) + manager.logDebug(String.format("Finished executing onStart task of Action '%s' on queue '%s'", name, getQueueName())); } protected void executeTask() { + if (manager.debug) + manager.logDebug(String.format("Started executing task of Action '%s' on queue '%s'", name, getQueueName())); + try { task.accept(this); count++; } catch (Throwable t) { - logDebug("Task of " + this + " threw an exception:", t); + manager.logDebug("Task of " + this + " threw an exception:", t); markDone(); } + + if (manager.debug) + manager.logDebug(String.format("Finished executing task of Action '%s' on queue '%s'", name, getQueueName())); } protected void executeOnDone() { + if (manager.debug) + manager.logDebug(String.format("Started executing onDone task of Action '%s' on queue '%s'", name, getQueueName())); + try { onDone.accept(this); } catch (Throwable t) { - logDebug("Done Task of " + this + " threw an exception:", t); + manager.logDebug("Done Task of " + this + " threw an exception:", t); } + + if (manager.debug) + manager.logDebug(String.format("Finished executing onDone task of Action '%s' on queue '%s'", name, getQueueName())); } @@ -329,23 +366,13 @@ public class Action implements IAction { dataStore.clear(); isScheduled = false; done = true; - } - public void logDebug(String err) { - logDebug(err, null); - } - - public void logDebug(String err, Throwable t) { - if (reportTo != null) - reportTo.appendConsole(err + (t != null ? "\n" + ExceptionUtils.getStackTrace(t) : "")); - - System.err.println(err); - if (t != null) - t.printStackTrace(); + if (manager.debug) + manager.logDebug(String.format("Killing Action '%s' on queue '%s'", name, queue != null ? getQueueName() : "null")); } public String toString() { - return String.format("IAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", queue != null ? queue.getName() : "null", isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + return String.format("IAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", getQueueName(), isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); } /////////////////////////////////////////////////// ////////////////////////////////////////////////// diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 95bbeb0de..924fec103 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -5,7 +5,9 @@ import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; +import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.action.action.ConditionalAction; +import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.*; import java.util.function.Consumer; @@ -27,6 +29,9 @@ public class ActionManager implements IActionManager { protected final ActionQueue conditionalQueue = new ActionQueue(this, "mainConditional", true); protected final Map otherQueues = new HashMap<>(); + protected boolean debug; + protected ScriptContainer reportTo; + @Override public IActionManager start() { @@ -40,6 +45,17 @@ public class ActionManager implements IActionManager { return this; } + @Override + public boolean inDebugMode() { + return debug; + } + + @Override + public IActionManager setDebugMode(boolean debug) { + this.debug = debug; + return this; + } + /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Creators @@ -424,6 +440,19 @@ public class ActionManager implements IActionManager { otherQueues.forEach((name, queue) -> queue.clear()); } + public void logDebug(String err) { + logDebug(err, null); + } + + public void logDebug(String err, Throwable t) { + if (this.reportTo != null) + this.reportTo.appendConsole(err + (t != null ? "\n" + ExceptionUtils.getStackTrace(t) : "")); + + System.err.println(err); + if (t != null) + t.printStackTrace(); + } + @Override public IActionChain chain() { return sequentialQueue.chain(); @@ -448,5 +477,4 @@ public class ActionManager implements IActionManager { return sb.toString(); } - } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 627f0bbbf..69d0c5357 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -262,7 +262,11 @@ public class ActionQueue implements IActionQueue { if (a.isDone()) { if (a.onDone != null) a.execute("done", a::executeOnDone); + a.kill(); + + if (manager.debug) + a.manager.logDebug(String.format("Removing Action '%s' from queue '%s'", a.name, name)); return true; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index c043be3e5..684031c4e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -7,7 +7,6 @@ import java.util.Set; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; -import java.util.function.Supplier; public class ActionThread { private Action action; @@ -39,6 +38,10 @@ public class ActionThread { }); executor.shutdown(); + + + if (action.manager.debug) + action.manager.logDebug(String.format("Stopping thread of Action '%s' on queue '%s'", action.name, action.getQueueName())); } public void pauseFor(long millis) { @@ -47,11 +50,17 @@ public class ActionThread { try { threadSleeping = true; + if (action.manager.debug) + action.manager.logDebug(String.format("Sleeping thread of Action '%s' on queue '%s' for %s ticks", action.name, action.getQueueName(), millis / 50)); + Thread.sleep(millis); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } finally { threadSleeping = false; + + if (action.manager.debug) + action.manager.logDebug(String.format("Woken up thread of Action '%s' on queue '%s' after sleeping for %s ticks", action.name, action.getQueueName(), millis / 50)); } } @@ -67,6 +76,9 @@ public class ActionThread { synchronized (lock) { while (threadPaused) { try { + if (action.manager.debug) + action.manager.logDebug(String.format("Pausing thread of Action '%s' on queue '%s'", action.name, action.getQueueName())); + lock.wait(); // Wait until notified } catch (InterruptedException e) { Thread.currentThread().interrupt(); @@ -85,6 +97,9 @@ public class ActionThread { if (threadPaused) { threadPaused = false; lock.notify(); + + if (action.manager.debug) + action.manager.logDebug(String.format("Resumed thread of Action '%s' on queue '%s'", action.name, action.getQueueName())); } if (threadSleeping) diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 2d4cab4cc..bec6b50d0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -99,9 +99,26 @@ public class ConditionalAction extends Action implements IConditionalAction { if (duration == 0 && onStart != null) execute("start", this::executeOnStart); + if (isDone()) + return; + duration++; - if (maxChecks > -1 && checkCount > maxChecks || maxCount == 0) { + if (manager.inDebugMode()) + manager.logDebug(String.format("Ticking ConditionalAction '%s' (duration = %s/%s, count = %s/%s, checkCount = %s/%s) on queue '%s'", name, duration, maxDuration, count, maxCount, checkCount, maxChecks, getQueueName())); + + if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { + if (manager.inDebugMode()) + manager.logDebug(String.format("Reached max duration of Action '%s' on queue '%s'", name, getQueueName())); + + markDone(); + return; + } + + if (maxChecks > -1 && checkCount > maxChecks) { + if (manager.inDebugMode()) + manager.logDebug(String.format("Reached max check count of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + markDone(); return; } @@ -123,34 +140,50 @@ public class ConditionalAction extends Action implements IConditionalAction { execute("task", execute); } - if (maxCount > -1 && count >= maxCount) + if (maxCount > -1 && count >= maxCount) { + if (manager.inDebugMode()) + manager.logDebug(String.format("Reached max count of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + markDone(); + } } protected void executeTask() { + if (manager.inDebugMode()) + manager.logDebug(String.format("Started executing task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + try { task.accept(this); count++; taskExecuted = true; } catch (Throwable t) { - logDebug("Task of " + this + " threw an exception:", t); + manager.logDebug("Task of " + this + " threw an exception:", t); markDone(); } + + if (manager.inDebugMode()) + manager.logDebug(String.format("Finished executing task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + } protected void executeOnTermination() { + if (manager.inDebugMode()) + manager.logDebug(String.format("Started executing onTermination task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + try { onTermination.accept(this); } catch (Throwable t) { - logDebug("Termination Task of " + this + " threw an exception:", t); + manager.logDebug("Termination Task of " + this + " threw an exception:", t); } + + if (manager.inDebugMode()) + manager.logDebug(String.format("Finished executing onTermination task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); } public String toString() { return String.format("IConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", - name != null ? name : "unnamed", - queue != null ? queue.getName() : "null", + name != null ? name : "unnamed", getQueueName(), isScheduled, done, isPaused(), From 9850e4b751125d341946f760c246a323840eb5f4 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 06:12:33 -0400 Subject: [PATCH 089/154] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 755eef405..d7092be2b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2.3" +version = "1.10.2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" From e6d4e1f3fde47bba8d6bd72bba63d44e406919d3 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 13:21:39 +0300 Subject: [PATCH 090/154] ActionManager name --- .../npcs/controllers/data/action/ActionManager.java | 13 +++++++++++++ src/main/java/noppes/npcs/scripted/NpcAPI.java | 3 +++ .../java/noppes/npcs/scripted/entity/ScriptNpc.java | 3 +++ .../noppes/npcs/scripted/entity/ScriptPlayer.java | 3 +++ 4 files changed, 22 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 924fec103..e15ff9cf2 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -23,6 +23,7 @@ import java.util.function.Function; */ public class ActionManager implements IActionManager { protected boolean isWorking = false; + protected String name = ""; protected final ActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); protected final ActionQueue parallelQueue = new ActionQueue(this, "mainParallel", true); @@ -45,6 +46,18 @@ public class ActionManager implements IActionManager { return this; } + @Override + public String getName() { + return name; + } + + @Override + public IActionManager setName(String name) { + this.name = name; + return this; + } + + @Override public boolean inDebugMode() { return debug; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 76a9936c2..363c75d4e 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -559,6 +559,9 @@ public class NpcAPI extends AbstractNpcAPI { } public IActionManager getActionManager() { + if (actionManager.getName().isEmpty()) + actionManager.setName("Global Action Manager"); + return actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 7ba7136df..ab1d21f4e 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -1408,6 +1408,9 @@ public class ScriptNpc extends ScriptLiving imp } public IActionManager getActionManager() { + if (npc.actionManager.getName().isEmpty()) + npc.actionManager.setName(String.format("%s's Action Manager", npc.getCommandSenderName())); + return npc.actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index cffd0696d..d3cf85e61 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -851,6 +851,9 @@ public class ScriptPlayer extends ScriptLivingBase @Override public IActionManager getActionManager() { + if (data.actionManager.getName().isEmpty()) + data.actionManager.setName(String.format("%s's Action Manager", player.getDisplayName())); + return data.actionManager; } } From 9e6f341d77873e62eb90dc3e6e8383fd9ea50019 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 06:30:37 -0400 Subject: [PATCH 091/154] Fix biome collection bug and add spawn GUI tooltip --- .../java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java | 1 + src/main/java/noppes/npcs/scripted/NpcAPI.java | 2 +- src/main/resources/assets/customnpcs/lang/en_US.lang | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java index ca5b7fe9e..aba615c0e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -66,6 +66,7 @@ public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, I addButton(new GuiNpcButton(4, guiLeft + 90, y - 5, 50, 20, "selectServer.edit")); addSlider(new GuiNpcSlider(this, 5, guiLeft + 4, y += 17, 180, 20, (float) this.spawn.itemWeight / 100)); + addExtra(new GuiHoverText(1, "spawning.naturalInfo", guiLeft + 188, y + 5)); this.spawnEntryScroll.guiLeft = guiLeft + 4; this.spawnEntryScroll.guiTop = y + 40; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index d19c809bf..deadb8b6d 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -281,7 +281,7 @@ public class NpcAPI extends AbstractNpcAPI { List biomes = new ArrayList<>(); Set allBiomes = new HashSet(); for (Type type : BiomeDictionary.Type.values()) { - allBiomes.addAll(BiomeDictionary.getBiomesForType(type)); + Collections.addAll(allBiomes, BiomeDictionary.getBiomesForType(type)); } for (BiomeGenBase base : BiomeGenBase.getBiomeGenArray()) { if (base != null) diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 92f6c1c8e..ad733fa6b 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -405,6 +405,7 @@ spawning.liquidSpawning=Spawns in Liquid spawning.airSpawning=Spawns in Air spawning.minHeight=Minimum Height spawning.maxHeight=Maximum Height +spawning.naturalInfo=Add at least one spawn entry and configure spawn options for the NPC to spawn naturally role.name=Role role.none=No Role From e186bb0bd077d1b46af62d2179d635a9a5eb4215 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 13:39:45 +0300 Subject: [PATCH 092/154] Implemented debug mode for ActionQueue and ActionManager --- .../data/action/ActionManager.java | 15 ++++++++++++ .../controllers/data/action/ActionQueue.java | 23 +++++++++++++++++-- 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index e15ff9cf2..152048992 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -423,6 +423,9 @@ public class ActionManager implements IActionManager { public void tick() { if (!isWorking) return; + if (debug) + logDebug(String.format("Started '%s' Tick Cycle", getInternalName())); + // ─── Sequential (head only) ───────────────────────────────── sequentialQueue.tick(); @@ -440,9 +443,14 @@ public class ActionManager implements IActionManager { if (other.isDead()) { other.clear(); + if (debug) + logDebug(String.format("Removing queue '%s' from '%s'", other.getName(), getInternalName())); it.remove(); } } + + if (debug) + logDebug(String.format("Finished '%s' Tick Cycle", getInternalName())); } @Override @@ -451,6 +459,13 @@ public class ActionManager implements IActionManager { parallelQueue.clear(); conditionalQueue.clear(); otherQueues.forEach((name, queue) -> queue.clear()); + + if (debug) + logDebug(String.format("Cleared '%s'", getInternalName())); + } + + public String getInternalName() { + return name.isEmpty() ? "Action Manager" : name; } public void logDebug(String err) { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 69d0c5357..744822cfd 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -100,6 +100,9 @@ public class ActionQueue implements IActionQueue { @Override public IActionQueue kill() { this.isDead = true; + + if (manager.debug) + manager.logDebug(String.format("Killing queue '%s' on '%s'", name, manager.getInternalName())); return this; } @@ -277,6 +280,9 @@ public class ActionQueue implements IActionQueue { if (!isWorking || isDead) return; + if (manager.debug) + manager.logDebug(String.format("Started ticking queue '%s'", name)); + if (!isParallel) { if (tick((Action) getCurrentAction())) queue.pollFirst(); @@ -288,16 +294,26 @@ public class ActionQueue implements IActionQueue { } killWhenEmpty(); + + if (manager.debug) + manager.logDebug(String.format("Finished ticking queue '%s'", name)); } protected void killWhenEmpty() { - if (killWhenEmpty && !hasActiveTasks() && autoKill == null) + if (killWhenEmpty && !hasActiveTasks() && autoKill == null) { + if (manager.debug) + manager.logDebug(String.format("Queue '%s' is empty! Killing in %s ticks", name, killWhenEmptyAfter)); + autoKill = (Action) manager.create(killWhenEmptyAfter, (act) -> { - if (hasActiveTasks()) + if (hasActiveTasks()) { + if (manager.debug) + manager.logDebug(String.format("Scheduled Actions found! Aborted kill process for queue '%s'", name)); return; + } manager.removeQueue(name); }).everyTick().once(); + } if (autoKill != null) { autoKill.tick(); @@ -310,6 +326,9 @@ public class ActionQueue implements IActionQueue { public void clear() { queue.forEach((act) -> act.kill()); queue.clear(); + + if (manager.debug) + manager.logDebug(String.format("Cleared queue '%s' on '%s'", name, manager.getInternalName())); } @Override From fa450214af0da53141261cf9bcba0faa3a0b8cce Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 13:50:49 -0400 Subject: [PATCH 093/154] Increase Gradle memory to prevent daemon OOM --- gradle.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle.properties b/gradle.properties index 83a8d5e6c..39f2d510a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -200,3 +200,7 @@ disableCheckstyle = true # Non-GTNH properties modVersion = 1.10 + +# Increase Gradle's JVM memory usage to avoid daemon expiration due to +# insufficient heap space on CI builds. +org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=1g From 69eb728e59fa3b76874f1f549a9ae4511af07637 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 14:09:42 -0400 Subject: [PATCH 094/154] Update api --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index aa8ea101b..9c67b3316 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit aa8ea101bd9caf3679ebfa02d0cc19c982a535e3 +Subproject commit 9c67b33169b6552974f9583d13cd7cd62784b6cc From fd43cd6b675f2f9932e4ce0af5f8502ba9b165d3 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 14:22:27 -0400 Subject: [PATCH 095/154] Fix Tooltip --- src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java | 6 ++++-- .../java/noppes/npcs/client/gui/util/GuiNPCInterface.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java index 8e5d3f722..2471ef0a6 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java @@ -1,10 +1,13 @@ package noppes.npcs.client.gui.util; +import kamkeel.npcs.util.TextSplitter; import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class GuiHoverText extends GuiScreen { @@ -28,8 +31,7 @@ public class GuiHoverText extends GuiScreen { this.drawTexturedModalRect(this.x, this.y, 0, 0, 12, 12); if (inArea(x, y, 12, 12, par1, par2)) { - List lines = new ArrayList(); - lines.add(text); + List lines = TextSplitter.splitText(StatCollector.translateToLocal(text), 30); this.drawHoveringText(lines, x + 8, y + 6, this.fontRendererObj); GL11.glDisable(GL11.GL_LIGHTING); } diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java index 2ce62726b..27e5da0ec 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java @@ -314,8 +314,6 @@ public abstract class GuiNPCInterface extends GuiScreen { scroll.updateSubGUI(subGui); scroll.drawScreen(i, j, f, !subGui && scroll.isMouseOver(i, j) ? Mouse.getDWheel() : 0); } - for (GuiScreen gui : extra.values()) - gui.drawScreen(i, j, f); // Draw scrollable windows. for (GuiScrollWindow guiScrollableComponent : scrollWindows.values()) { guiScrollableComponent.drawScreen(i, j, f, !subGui && guiScrollableComponent.isMouseOver(i, j) ? Mouse.getDWheel() : 0); @@ -335,6 +333,9 @@ public abstract class GuiNPCInterface extends GuiScreen { } } + for (GuiScreen gui : extra.values()) + gui.drawScreen(i, j, f); + if (subgui != null) { subgui.drawScreen(i, j, f); } From d58b4bb90540a19a820c00233ead0657573977fa Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 21:22:34 +0300 Subject: [PATCH 096/154] ActionLogger !! --- .../npcs/controllers/data/action/Action.java | 31 +-- .../controllers/data/action/ActionLogger.java | 190 ++++++++++++++++++ .../data/action/ActionManager.java | 32 ++- .../controllers/data/action/ActionQueue.java | 32 ++- .../controllers/data/action/ActionThread.java | 10 +- .../data/action/action/ConditionalAction.java | 21 +- .../java/noppes/npcs/scripted/NpcAPI.java | 2 +- .../npcs/scripted/entity/ScriptNpc.java | 2 +- .../npcs/scripted/entity/ScriptPlayer.java | 2 +- 9 files changed, 258 insertions(+), 64 deletions(-) create mode 100644 src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index e98b6c70a..9bad65fa8 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -107,7 +107,7 @@ public class Action implements IAction { this.isScheduled = true; if (manager.debug) - manager.logDebug(String.format("Scheduled Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log(String.format("Scheduled Action '%s'", name), queue); } @Override @@ -249,7 +249,7 @@ public class Action implements IAction { done = true; if (manager.debug) - manager.logDebug(String.format("Marked done Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Marked done!", this); } @Override @@ -280,7 +280,7 @@ public class Action implements IAction { duration++; if (manager.debug) - manager.logDebug(String.format("Ticking Action '%s' (duration = %s/%s, count = %s/%s) on queue '%s'", name, duration, maxDuration, count, maxCount, getQueueName())); + manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s)", duration, maxDuration, count, maxCount), this); if (startAfterTicks > 0) { startAfterTicks--; @@ -289,7 +289,7 @@ public class Action implements IAction { if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { if (manager.debug) - manager.logDebug(String.format("Reached max duration of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Reached max duration", this); markDone(); return; @@ -300,7 +300,7 @@ public class Action implements IAction { if (maxCount > -1 && count >= maxCount) { if (manager.debug) - manager.logDebug(String.format("Reached max count of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Reached max count of Action '%s' on queue '%s'", this); markDone(); } @@ -316,45 +316,46 @@ public class Action implements IAction { protected void executeOnStart() { if (manager.debug) - manager.logDebug(String.format("Started executing onStart task of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Executing onStart task...", this); + try { onStart.accept(this); } catch (Throwable t) { - manager.logDebug("Start Task of " + this + " threw an exception:", t); + manager.LOGGER.error("onStart Task of " + this + " threw an exception:", t); } if (manager.debug) - manager.logDebug(String.format("Finished executing onStart task of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Finished executing onStart task", this); } protected void executeTask() { if (manager.debug) - manager.logDebug(String.format("Started executing task of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Executing task...", this); try { task.accept(this); count++; } catch (Throwable t) { - manager.logDebug("Task of " + this + " threw an exception:", t); + manager.LOGGER.error("Task of " + this + " threw an exception:", t); markDone(); } if (manager.debug) - manager.logDebug(String.format("Finished executing task of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Finished executing task", this); } protected void executeOnDone() { if (manager.debug) - manager.logDebug(String.format("Started executing onDone task of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Executing onDone task...", this); try { onDone.accept(this); } catch (Throwable t) { - manager.logDebug("Done Task of " + this + " threw an exception:", t); + manager.LOGGER.error("onDone Task of " + this + " threw an exception:", t); } if (manager.debug) - manager.logDebug(String.format("Finished executing onDone task of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Finished executing onDone task", this); } @@ -368,7 +369,7 @@ public class Action implements IAction { done = true; if (manager.debug) - manager.logDebug(String.format("Killing Action '%s' on queue '%s'", name, queue != null ? getQueueName() : "null")); + manager.LOGGER.log(String.format("Killed Action '%s'", name), queue); } public String toString() { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java new file mode 100644 index 000000000..34eacb9a5 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -0,0 +1,190 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.LogWriter; +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionQueue; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; + +import java.util.*; + +public class ActionLogger { + // private final Map> snapshot = new HashMap<>(); + private final ActionManager manager; + private final Deque stack = new ArrayDeque<>(); + private TreeNode root, currentNode; + + static class TreeNode { + public final Object component; //ActionManager, or ActionQueue, or Action, etc... + public final List children = new ArrayList<>(); + public TreeNode parent; + + public boolean isLastChild() { + if (parent == null) + return true; + List siblings = parent.children; + return siblings.get(siblings.size() - 1) == this; + } + + public TreeNode(Object component) { + this.component = component; + } + + public TreeNode addChild(Object component) { + TreeNode child = new TreeNode(component); + children.add(child); + child.parent = this; + return child; + } + } + + public ActionLogger(ActionManager manager) { + this.manager = manager; + } + + public ActionLogger beginTick(ActionManager manager) { + stack.clear(); + + root = currentNode = new TreeNode(manager); + for (IActionQueue queue : manager.getAllQueues()) { + if (!queue.hasActiveTasks()) + continue; + TreeNode queueNode = root.addChild(queue); + + for (IAction action : queue.getQueue()) + queueNode.addChild(action); + } + + return this; + } + + public ActionLogger push(Object component) { + for (TreeNode child : currentNode.children) { + if (child.component.equals(component)) { + currentNode = child; + break; + } + } + + stack.push(currentNode); + return this; + } + + public ActionLogger pop() { + if (!stack.isEmpty()) + currentNode = stack.pop(); + + return this; + } + + public ActionLogger finish(String finished, Object component) { + log(finished, component); + log(StringUtils.repeat("-", finished.length()), component, true); + return this; + } + + public ActionLogger log(String message, Object source) { + return log(message, source, false); + } + + public ActionLogger log(String message, Object source, boolean isLast) { + StringBuilder prefix = new StringBuilder(); + + ListIterator it = new ArrayList<>(stack).listIterator(stack.size()); + + while (it.hasPrevious()) { + TreeNode node = it.previous(); + if (it.hasPrevious()) { + prefix.append("│ "); + } else { + prefix.append(isLast ? "└──── " : "├──── "); + } + } + + String header = getLogHeader(source); + LogWriter.info(prefix + header + message); + + return this; + } + + public void error(String err, Throwable t) { + if (manager.reportTo != null) + manager.reportTo.appendConsole(err + (t != null ? "\n" + ExceptionUtils.getStackTrace(t) : "")); + + LogWriter.error(err); + if (t != null) + t.printStackTrace(); + } + + private String getLogHeader(Object obj) { + String type = obj.getClass().getSimpleName(); + String name = ""; + + if (obj instanceof ActionManager) { + name = ((ActionManager) obj).getName(); + } else if (obj instanceof IActionQueue) { + name = ((IActionQueue) obj).getName(); + } else if (obj instanceof IAction) { + name = ((IAction) obj).getName(); + } + + return String.format("[%s/'%s'] ", type, name); + } + + + // public ActionLogger beginTick1(ActionManager manager) { + // snapshot.clear(); + // stack.clear(); + // + // List queues = Arrays.stream(manager.getAllQueues()).filter(IActionQueue::hasActiveTasks).collect(Collectors.toList()); + // snapshot.put(manager, queues); + // + // for (IActionQueue queue : queues) { + // LinkedList contents = new LinkedList<>(); + // contents.add(queue); + // + // for (IAction a : queue.getQueue()) + // contents.add(a); + // + // // Actions only (not the queue itself) + // snapshot.put(queue, contents.subList(1, contents.size())); + // } + // + // return this; + // } + + // + // private Object getParent() { + // return stack.isEmpty() ? null : stack.peek().component; + // } + + // public ActionLogger push1(Object component) { + // List siblings = snapshot.get(getParent()); + // boolean isLast = siblings != null && !siblings.isEmpty() && siblings.get(siblings.size() - 1).equals(component); + // + // stack.push(new TreeNode(component)); + // return this; + // } + + // + // public void log(String message, Object source, int in) { + // StringBuilder prefix = new StringBuilder(); + // Deque branches = branchStack.get(); + // int depth = branches.size(); + // + // Iterator iter = branches.descendingIterator(); + // for (int i = 0; i < depth - 1; i++) { + // prefix.append(iter.next() ? " " : "│ "); + // } + // + // if (depth > 0) { + // prefix.append(branches.peek() ? "└── " : "├── "); + // } + // + // String header = getHeader(source); + // int pad = Math.max(0, maxHeaderLength - header.length()); + // String formatted = prefix + header + StringUtils.repeat(" ", pad) + message; + // + // output.accept(formatted); + // } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 152048992..f379d5dd5 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -7,7 +7,6 @@ import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import org.apache.commons.lang3.exception.ExceptionUtils; import java.util.*; import java.util.function.Consumer; @@ -23,6 +22,7 @@ import java.util.function.Function; */ public class ActionManager implements IActionManager { protected boolean isWorking = false; + public ActionLogger LOGGER = new ActionLogger(this); protected String name = ""; protected final ActionQueue sequentialQueue = new ActionQueue(this, "mainSequential"); @@ -368,6 +368,10 @@ public class ActionManager implements IActionManager { return allQueues.toArray(new IActionQueue[0]); } + + public boolean hasActiveTasks() { + return Arrays.stream(getAllQueues()).anyMatch(queue -> queue.hasActiveTasks()); + } @Override public boolean hasAny(String name) { return getAny(name) != null; @@ -423,8 +427,9 @@ public class ActionManager implements IActionManager { public void tick() { if (!isWorking) return; - if (debug) - logDebug(String.format("Started '%s' Tick Cycle", getInternalName())); + boolean active = hasActiveTasks(); + if (debug && active) + LOGGER.beginTick(this).log("Started Tick Cycle", this); // ─── Sequential (head only) ───────────────────────────────── sequentialQueue.tick(); @@ -444,13 +449,13 @@ public class ActionManager implements IActionManager { if (other.isDead()) { other.clear(); if (debug) - logDebug(String.format("Removing queue '%s' from '%s'", other.getName(), getInternalName())); + LOGGER.log(String.format("Removing queue '%s' from '%s'", other.getName(), getInternalName()), this); it.remove(); } } - if (debug) - logDebug(String.format("Finished '%s' Tick Cycle", getInternalName())); + if (debug && active) + LOGGER.finish("Finished Tick Cycle",this); } @Override @@ -461,26 +466,13 @@ public class ActionManager implements IActionManager { otherQueues.forEach((name, queue) -> queue.clear()); if (debug) - logDebug(String.format("Cleared '%s'", getInternalName())); + LOGGER.log("Cleared all queues!", this); } public String getInternalName() { return name.isEmpty() ? "Action Manager" : name; } - public void logDebug(String err) { - logDebug(err, null); - } - - public void logDebug(String err, Throwable t) { - if (this.reportTo != null) - this.reportTo.appendConsole(err + (t != null ? "\n" + ExceptionUtils.getStackTrace(t) : "")); - - System.err.println(err); - if (t != null) - t.printStackTrace(); - } - @Override public IActionChain chain() { return sequentialQueue.chain(); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 744822cfd..d55b44101 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -102,7 +102,7 @@ public class ActionQueue implements IActionQueue { this.isDead = true; if (manager.debug) - manager.logDebug(String.format("Killing queue '%s' on '%s'", name, manager.getInternalName())); + manager.LOGGER.log(String.format("Killing queue '%s' on '%s'", name, manager.getInternalName()), this); return this; } @@ -188,6 +188,7 @@ public class ActionQueue implements IActionQueue { /////////////////////////////////////////////////// // Queue Data + @Override public boolean hasActiveTasks() { return !queue.isEmpty(); } @@ -261,7 +262,17 @@ public class ActionQueue implements IActionQueue { // Handling protected boolean tick(Action a) { + if (a == null) + return false; + + if (manager.debug) + manager.LOGGER.push(this).log(String.format("Started ticking Action '%s' ", a.name), this).push(a); + a.tick(); + + if (manager.debug) + manager.LOGGER.pop().finish(String.format("Finished ticking Action '%s' ", a.name), this).pop(); + if (a.isDone()) { if (a.onDone != null) a.execute("done", a::executeOnDone); @@ -269,7 +280,7 @@ public class ActionQueue implements IActionQueue { a.kill(); if (manager.debug) - a.manager.logDebug(String.format("Removing Action '%s' from queue '%s'", a.name, name)); + manager.LOGGER.finish(String.format("Removing Action '%s' from queue", a.name), this); return true; } @@ -280,8 +291,9 @@ public class ActionQueue implements IActionQueue { if (!isWorking || isDead) return; - if (manager.debug) - manager.logDebug(String.format("Started ticking queue '%s'", name)); + boolean active = hasActiveTasks(); + if (manager.debug && active) + manager.LOGGER.push(manager).log(String.format("Started ticking queue '%s' ", name), manager).push(this); if (!isParallel) { if (tick((Action) getCurrentAction())) @@ -295,19 +307,19 @@ public class ActionQueue implements IActionQueue { killWhenEmpty(); - if (manager.debug) - manager.logDebug(String.format("Finished ticking queue '%s'", name)); + if (manager.debug && active) + manager.LOGGER.pop().finish(String.format("Finished ticking queue '%s' ", name), manager).pop(); } protected void killWhenEmpty() { if (killWhenEmpty && !hasActiveTasks() && autoKill == null) { if (manager.debug) - manager.logDebug(String.format("Queue '%s' is empty! Killing in %s ticks", name, killWhenEmptyAfter)); + manager.LOGGER.log(String.format("Queue is empty! Killing in %s ticks", killWhenEmptyAfter), this); - autoKill = (Action) manager.create(killWhenEmptyAfter, (act) -> { + autoKill = (Action) manager.create(String.format("Kill '%s'", name), killWhenEmptyAfter, (act) -> { if (hasActiveTasks()) { if (manager.debug) - manager.logDebug(String.format("Scheduled Actions found! Aborted kill process for queue '%s'", name)); + manager.LOGGER.log("Scheduled Actions found! Aborted kill process", this); return; } @@ -328,7 +340,7 @@ public class ActionQueue implements IActionQueue { queue.clear(); if (manager.debug) - manager.logDebug(String.format("Cleared queue '%s' on '%s'", name, manager.getInternalName())); + manager.LOGGER.log("Cleared queue!", this); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 684031c4e..c4df4858c 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -41,7 +41,7 @@ public class ActionThread { if (action.manager.debug) - action.manager.logDebug(String.format("Stopping thread of Action '%s' on queue '%s'", action.name, action.getQueueName())); + action.manager.LOGGER.log("Stopping thread", action); } public void pauseFor(long millis) { @@ -51,7 +51,7 @@ public class ActionThread { try { threadSleeping = true; if (action.manager.debug) - action.manager.logDebug(String.format("Sleeping thread of Action '%s' on queue '%s' for %s ticks", action.name, action.getQueueName(), millis / 50)); + action.manager.LOGGER.log(String.format("Sleeping thread for %s ticks", millis / 50), action); Thread.sleep(millis); } catch (InterruptedException e) { @@ -60,7 +60,7 @@ public class ActionThread { threadSleeping = false; if (action.manager.debug) - action.manager.logDebug(String.format("Woken up thread of Action '%s' on queue '%s' after sleeping for %s ticks", action.name, action.getQueueName(), millis / 50)); + action.manager.LOGGER.log(String.format("Woken up thread after sleeping for %s ticks", millis / 50), action); } } @@ -77,7 +77,7 @@ public class ActionThread { while (threadPaused) { try { if (action.manager.debug) - action.manager.logDebug(String.format("Pausing thread of Action '%s' on queue '%s'", action.name, action.getQueueName())); + action.manager.LOGGER.log(String.format("Pausing thread"), action); lock.wait(); // Wait until notified } catch (InterruptedException e) { @@ -99,7 +99,7 @@ public class ActionThread { lock.notify(); if (action.manager.debug) - action.manager.logDebug(String.format("Resumed thread of Action '%s' on queue '%s'", action.name, action.getQueueName())); + action.manager.LOGGER.log(String.format("Resumed thread"), action); } if (threadSleeping) diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index bec6b50d0..4b04ece5d 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -105,11 +105,11 @@ public class ConditionalAction extends Action implements IConditionalAction { duration++; if (manager.inDebugMode()) - manager.logDebug(String.format("Ticking ConditionalAction '%s' (duration = %s/%s, count = %s/%s, checkCount = %s/%s) on queue '%s'", name, duration, maxDuration, count, maxCount, checkCount, maxChecks, getQueueName())); + manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s, checkCount = %s/%s)", duration, maxDuration, count, maxCount, checkCount, maxChecks), this); if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { if (manager.inDebugMode()) - manager.logDebug(String.format("Reached max duration of Action '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Reached max duration", this); markDone(); return; @@ -117,7 +117,7 @@ public class ConditionalAction extends Action implements IConditionalAction { if (maxChecks > -1 && checkCount > maxChecks) { if (manager.inDebugMode()) - manager.logDebug(String.format("Reached max check count of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Reached max check count", this); markDone(); return; @@ -142,7 +142,7 @@ public class ConditionalAction extends Action implements IConditionalAction { if (maxCount > -1 && count >= maxCount) { if (manager.inDebugMode()) - manager.logDebug(String.format("Reached max count of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Reached max count", this); markDone(); } @@ -150,34 +150,33 @@ public class ConditionalAction extends Action implements IConditionalAction { protected void executeTask() { if (manager.inDebugMode()) - manager.logDebug(String.format("Started executing task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); - + manager.LOGGER.log("Executing task...", this); try { task.accept(this); count++; taskExecuted = true; } catch (Throwable t) { - manager.logDebug("Task of " + this + " threw an exception:", t); + manager.LOGGER.error("Task of " + this + " threw an exception:", t); markDone(); } if (manager.inDebugMode()) - manager.logDebug(String.format("Finished executing task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Finished executing task", this); } protected void executeOnTermination() { if (manager.inDebugMode()) - manager.logDebug(String.format("Started executing onTermination task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Executing onTermination task...", this); try { onTermination.accept(this); } catch (Throwable t) { - manager.logDebug("Termination Task of " + this + " threw an exception:", t); + manager.LOGGER.error("Termination Task of " + this + " threw an exception:", t); } if (manager.inDebugMode()) - manager.logDebug(String.format("Finished executing onTermination task of ConditionalAction '%s' on queue '%s'", name, getQueueName())); + manager.LOGGER.log("Finished executing onTermination task", this); } diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 86e237352..34dc85b54 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -570,7 +570,7 @@ public class NpcAPI extends AbstractNpcAPI { public IActionManager getActionManager() { if (actionManager.getName().isEmpty()) - actionManager.setName("Global Action Manager"); + actionManager.setName("Global"); return actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index ab1d21f4e..356d3bf5a 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -1409,7 +1409,7 @@ public class ScriptNpc extends ScriptLiving imp public IActionManager getActionManager() { if (npc.actionManager.getName().isEmpty()) - npc.actionManager.setName(String.format("%s's Action Manager", npc.getCommandSenderName())); + npc.actionManager.setName(npc.getCommandSenderName()); return npc.actionManager; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index d3cf85e61..346a3385a 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -852,7 +852,7 @@ public class ScriptPlayer extends ScriptLivingBase @Override public IActionManager getActionManager() { if (data.actionManager.getName().isEmpty()) - data.actionManager.setName(String.format("%s's Action Manager", player.getDisplayName())); + data.actionManager.setName(player.getDisplayName()); return data.actionManager; } From f7489f1526cb071c9642a2fad456f7a2f8a05732 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:20:27 -0400 Subject: [PATCH 097/154] Fix Side Only Issues --- .../kamkeel/npcs/network/packets/player/MailActionPacket.java | 1 - .../network/packets/request/feather/DimensionTeleportPacket.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java index eb5e12d97..06440e1f2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java @@ -168,7 +168,6 @@ public class MailActionPacket extends AbstractPacket { } @Override - @SideOnly(Side.SERVER) protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) return; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java index 65f18be9f..1104f837a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/feather/DimensionTeleportPacket.java @@ -46,7 +46,6 @@ public final class DimensionTeleportPacket extends AbstractPacket { out.writeInt(dimensionID); } - @SideOnly(Side.SERVER) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { if (!(player instanceof EntityPlayerMP)) From 12ad5abba5fb886abb03238d4810ed8b0c2b4641 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:39:20 -0400 Subject: [PATCH 098/154] Improve Soulbind requirement apply logic --- .../types/SoulbindRequirement.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java index a8ceb2031..e38c1561b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; +import kamkeel.npcs.controllers.ProfileController; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -83,7 +84,25 @@ public class SoulbindRequirement implements IRequirementChecker { @Override public void apply(NBTTagCompound nbt, Object value) { if (value instanceof String) { - nbt.setString(getKey(), (String) value); + String entry = (String) value; + if (entry.isEmpty()) + return; + + // Check if the provided value is already a valid UUID + UUID uuid = null; + try { + uuid = UUID.fromString(entry); + } catch (Exception ignored) { + } + + // If not a UUID, attempt to treat the value as a username + if (uuid == null) { + uuid = ProfileController.Instance.getUUIDFromUsername(entry); + } + + if (uuid != null) { + nbt.setString(getKey(), uuid.toString()); + } } } From 48518998daf4b08aaf67d26ea55afc573b5472ec Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:40:01 -0400 Subject: [PATCH 099/154] Update api --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index 9c67b3316..9ce413ee0 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 9c67b33169b6552974f9583d13cd7cd62784b6cc +Subproject commit 9ce413ee074f975378287f52b5aaf80105d297cd From fe786babc6e9d1b84a6119f8df2b1bbc525e4782 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 7 Jul 2025 22:41:58 +0300 Subject: [PATCH 100/154] IAction optimisations --- .../npcs/controllers/data/action/Action.java | 31 +++++++++------- .../data/action/action/ConditionalAction.java | 36 +++---------------- 2 files changed, 24 insertions(+), 43 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 9bad65fa8..b6d7dad2b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -271,6 +271,12 @@ public class Action implements IAction { if (done) return; + if (startAfterTicks > 0) { + manager.LOGGER.log(String.format("Starts after %s ticks...", startAfterTicks), this); + startAfterTicks--; + return; + } + if (duration == 0 && onStart != null) execute("start", this::executeOnStart); @@ -279,13 +285,7 @@ public class Action implements IAction { duration++; - if (manager.debug) - manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s)", duration, maxDuration, count, maxCount), this); - - if (startAfterTicks > 0) { - startAfterTicks--; - return; - } + inheritedTick(); if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { if (manager.debug) @@ -295,18 +295,25 @@ public class Action implements IAction { return; } - if (duration % updateEveryXTick == 0 && task != null) - execute("task", this::executeTask); if (maxCount > -1 && count >= maxCount) { if (manager.debug) - manager.LOGGER.log("Reached max count of Action '%s' on queue '%s'", this); + manager.LOGGER.log("Reached max count", this); markDone(); } } + public void inheritedTick() { + if (manager.debug) + manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s)", duration, maxDuration, count, maxCount), this); + + + if (duration % updateEveryXTick == 0 && task != null) + execute("task", this::executeTask); + } + public void execute(String taskName, Runnable task) { if (isThreaded) actionThread.execute(taskName, task); @@ -341,7 +348,7 @@ public class Action implements IAction { } if (manager.debug) - manager.LOGGER.log("Finished executing task", this); + manager.LOGGER.log(String.format("Finished executing task (count = %s/%s)", count, maxCount), this); } protected void executeOnDone() { @@ -373,7 +380,7 @@ public class Action implements IAction { } public String toString() { - return String.format("IAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", name != null ? name : "unnamed", getQueueName(), isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + return String.format("%s '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", getClass().getSimpleName(), name != null ? name : "unnamed", getQueueName(), isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); } /////////////////////////////////////////////////// ////////////////////////////////////////////////// diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 4b04ece5d..04eddd3b3 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -91,31 +91,11 @@ public class ConditionalAction extends Action implements IConditionalAction { return terminateWhen != null && terminateWhen.apply(this); } - @Override - public void tick() { - if (isDone()) - return; - - if (duration == 0 && onStart != null) - execute("start", this::executeOnStart); - - if (isDone()) - return; - - duration++; - + public void inheritedTick() { if (manager.inDebugMode()) manager.LOGGER.log(String.format("Ticking... (duration = %s/%s, count = %s/%s, checkCount = %s/%s)", duration, maxDuration, count, maxCount, checkCount, maxChecks), this); - if (maxDuration > -1 && duration >= maxDuration || maxCount == 0) { - if (manager.inDebugMode()) - manager.LOGGER.log("Reached max duration", this); - - markDone(); - return; - } - - if (maxChecks > -1 && checkCount > maxChecks) { + if (maxChecks > -1 && checkCount >= maxChecks) { if (manager.inDebugMode()) manager.LOGGER.log("Reached max check count", this); @@ -139,18 +119,12 @@ public class ConditionalAction extends Action implements IConditionalAction { execute("task", execute); } - - if (maxCount > -1 && count >= maxCount) { - if (manager.inDebugMode()) - manager.LOGGER.log("Reached max count", this); - - markDone(); - } } protected void executeTask() { if (manager.inDebugMode()) manager.LOGGER.log("Executing task...", this); + try { task.accept(this); count++; @@ -161,7 +135,7 @@ public class ConditionalAction extends Action implements IConditionalAction { } if (manager.inDebugMode()) - manager.LOGGER.log("Finished executing task", this); + manager.LOGGER.log(String.format("Finished executing task (count = %s/%s)", count, maxCount), this); } @@ -181,7 +155,7 @@ public class ConditionalAction extends Action implements IConditionalAction { public String toString() { - return String.format("IConditionalAction '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", + return String.format("%s '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", getClass().getSimpleName(), name != null ? name : "unnamed", getQueueName(), isScheduled, done, From b370ccf1de2cdc9096489e7146d8bb389e524014 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:43:25 -0400 Subject: [PATCH 101/154] 1.10.2 Beta --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d7092be2b..31d92a838 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2" +version = "1.10.2-beta" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index fddea1379..940902185 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -41,7 +41,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") From fb66252b2a23980bf20d27f0f451d52a84fcf3a2 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 15:53:26 -0400 Subject: [PATCH 102/154] Update ProfileController.java --- src/main/java/kamkeel/npcs/controllers/ProfileController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 77ee89578..11dc11b9d 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -644,6 +644,8 @@ public class ProfileController implements IProfileHandler { if (ConfigMain.AttributesEnabled) AttributeController.getTracker(player).recalcAttributes(player); + + // pdata.save(); } public List getProfileInfo(EntityPlayer player, int slotId) { From 8a497f82a0e55a3bc3f94e73cf97d34c9ef781fb Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 17:27:35 -0400 Subject: [PATCH 103/154] Fix Bad Packet --- src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 346a3385a..68ce55aff 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -58,7 +58,6 @@ public class ScriptPlayer extends ScriptLivingBase public ScriptPlayer(T player) { super(player); this.player = player; - this.data = getData(); } /** @@ -851,7 +850,7 @@ public class ScriptPlayer extends ScriptLivingBase @Override public IActionManager getActionManager() { - if (data.actionManager.getName().isEmpty()) + if (getData().actionManager.getName().isEmpty()) data.actionManager.setName(player.getDisplayName()); return data.actionManager; From 66c4d64fb07e2f65e69b1c8870d86e9c551bea48 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 7 Jul 2025 17:28:08 -0400 Subject: [PATCH 104/154] Bump Version --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 31d92a838..0ae75baa7 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2-beta" +version = "1.10.2-beta2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 940902185..b6882083c 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -41,7 +41,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta2") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") From 7c24caf004b9276ee6d64c610d1760da99aab76f Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 8 Jul 2025 11:34:32 +0300 Subject: [PATCH 105/154] More ActionLogger and ActionThread optimisations --- .../npcs/controllers/data/action/Action.java | 5 ++-- .../controllers/data/action/ActionLogger.java | 18 +++++++---- .../data/action/ActionManager.java | 3 ++ .../controllers/data/action/ActionQueue.java | 28 +++++++++-------- .../controllers/data/action/ActionThread.java | 30 +++++++++++++++---- 5 files changed, 59 insertions(+), 25 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index b6d7dad2b..3951b09b2 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -368,6 +368,9 @@ public class Action implements IAction { @Override public void kill() { + if (manager.debug) + manager.LOGGER.log(String.format("Killing Action '%s'...", name), queue); + if (actionThread != null) actionThread.stop(); @@ -375,8 +378,6 @@ public class Action implements IAction { isScheduled = false; done = true; - if (manager.debug) - manager.LOGGER.log(String.format("Killed Action '%s'", name), queue); } public String toString() { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java index 34eacb9a5..f4b6cbc2b 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -93,17 +93,14 @@ public class ActionLogger { ListIterator it = new ArrayList<>(stack).listIterator(stack.size()); while (it.hasPrevious()) { - TreeNode node = it.previous(); - if (it.hasPrevious()) { + if (it.hasPrevious()) prefix.append("│ "); - } else { + else prefix.append(isLast ? "└──── " : "├──── "); - } } String header = getLogHeader(source); - LogWriter.info(prefix + header + message); - + println(prefix + header + message); return this; } @@ -126,11 +123,20 @@ public class ActionLogger { name = ((IActionQueue) obj).getName(); } else if (obj instanceof IAction) { name = ((IAction) obj).getName(); + } else if (obj instanceof ActionThread) { + name = ((ActionThread) obj).getAction().getName(); } return String.format("[%s/'%s'] ", type, name); } + private static final String ANSI_CYAN = "\u001B[96m"; + private static final String ANSI_GOLD = "\u001B[93m"; + private static final String ANSI_RESET = "\u001B[0m"; + + public void println(String str) { + System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); + } // public ActionLogger beginTick1(ActionManager manager) { // snapshot.clear(); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index f379d5dd5..167ee729e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -66,6 +66,9 @@ public class ActionManager implements IActionManager { @Override public IActionManager setDebugMode(boolean debug) { this.debug = debug; + + if (debug) + LOGGER.log("Enabled debug mode", this); return this; } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index d55b44101..1a07eee03 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -261,18 +261,7 @@ public class ActionQueue implements IActionQueue { /////////////////////////////////////////////////// // Handling - protected boolean tick(Action a) { - if (a == null) - return false; - - if (manager.debug) - manager.LOGGER.push(this).log(String.format("Started ticking Action '%s' ", a.name), this).push(a); - - a.tick(); - - if (manager.debug) - manager.LOGGER.pop().finish(String.format("Finished ticking Action '%s' ", a.name), this).pop(); - + public boolean finish(Action a) { if (a.isDone()) { if (a.onDone != null) a.execute("done", a::executeOnDone); @@ -286,6 +275,21 @@ public class ActionQueue implements IActionQueue { return false; } + protected boolean tick(Action a) { + if (a == null) + return false; + + boolean wasDone = a.isDone(); + if (manager.debug && !wasDone) + manager.LOGGER.push(this).log(String.format("Started ticking Action '%s' ", a.name), this).push(a); + + a.tick(); + + if (manager.debug && !wasDone) + manager.LOGGER.pop().finish(String.format("Finished ticking Action '%s' ", a.name), this).pop(); + + return finish(a); + } protected void tick() { if (!isWorking || isDead) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index c4df4858c..813efd476 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -29,6 +29,9 @@ public class ActionThread { thread.setName(String.format("ActionThread (%s)", action.getName())); return thread; }); + + if (action.manager.debug) + action.manager.LOGGER.log("Created Action thread!", this); } public void stop() { @@ -41,7 +44,11 @@ public class ActionThread { if (action.manager.debug) - action.manager.LOGGER.log("Stopping thread", action); + action.manager.LOGGER.log("Stopping thread", this); + } + + public Action getAction() { + return action; } public void pauseFor(long millis) { @@ -51,7 +58,7 @@ public class ActionThread { try { threadSleeping = true; if (action.manager.debug) - action.manager.LOGGER.log(String.format("Sleeping thread for %s ticks", millis / 50), action); + action.manager.LOGGER.log(String.format("Sleeping thread for %s ticks", millis / 50), this); Thread.sleep(millis); } catch (InterruptedException e) { @@ -60,7 +67,7 @@ public class ActionThread { threadSleeping = false; if (action.manager.debug) - action.manager.LOGGER.log(String.format("Woken up thread after sleeping for %s ticks", millis / 50), action); + action.manager.LOGGER.log(String.format("Woken up thread after sleeping for %s ticks", millis / 50), this); } } @@ -77,7 +84,7 @@ public class ActionThread { while (threadPaused) { try { if (action.manager.debug) - action.manager.LOGGER.log(String.format("Pausing thread"), action); + action.manager.LOGGER.log(String.format("Pausing thread"), this); lock.wait(); // Wait until notified } catch (InterruptedException e) { @@ -99,7 +106,7 @@ public class ActionThread { lock.notify(); if (action.manager.debug) - action.manager.LOGGER.log(String.format("Resumed thread"), action); + action.manager.LOGGER.log(String.format("Resumed thread"), this); } if (threadSleeping) @@ -130,14 +137,27 @@ public class ActionThread { if (!runningKeys.add(taskKey)) return; + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Delegating task '%s' to Action thread...", taskKey), action); + final AtomicReference> taskRef = new AtomicReference<>(); taskRef.set(executor.submit(() -> { + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Started executing task '%s' on Action thread...", taskKey), this); + runningTasks.add(taskRef.get()); try { task.run(); } finally { runningTasks.remove(taskRef.get()); runningKeys.remove(taskKey); + + if (action.manager.debug) + action.manager.LOGGER.log(String.format("Finished executing task '%s' on Action thread", taskKey), this); + + if (((ActionQueue) action.queue).finish(action)) + action.queue.getQueue().remove(action); + } })); } From b6ac84d4c4d10c2006c60dc68896b3541a5c98cf Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 8 Jul 2025 11:59:22 +0300 Subject: [PATCH 106/154] oops --- .../java/noppes/npcs/controllers/data/action/ActionLogger.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java index f4b6cbc2b..fc24c79e8 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -93,6 +93,7 @@ public class ActionLogger { ListIterator it = new ArrayList<>(stack).listIterator(stack.size()); while (it.hasPrevious()) { + TreeNode node = it.previous(); if (it.hasPrevious()) prefix.append("│ "); else From b37f9a7ea4ea686029ac6c631c5e490e75cd300c Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 8 Jul 2025 12:00:37 +0300 Subject: [PATCH 107/154] Added Action.getIdentifier --- .../noppes/npcs/controllers/data/action/Action.java | 13 +++++++++---- .../npcs/controllers/data/action/ActionQueue.java | 8 ++++---- .../data/action/action/ConditionalAction.java | 3 +-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 3951b09b2..76df3d8e6 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -107,7 +107,7 @@ public class Action implements IAction { this.isScheduled = true; if (manager.debug) - manager.LOGGER.log(String.format("Scheduled Action '%s'", name), queue); + manager.LOGGER.log(String.format("Scheduled %s", getIdentifier()), queue); } @Override @@ -278,7 +278,7 @@ public class Action implements IAction { } if (duration == 0 && onStart != null) - execute("start", this::executeOnStart); + execute("onStart", this::executeOnStart); if (done) return; @@ -369,7 +369,7 @@ public class Action implements IAction { @Override public void kill() { if (manager.debug) - manager.LOGGER.log(String.format("Killing Action '%s'...", name), queue); + manager.LOGGER.log(String.format("Killing %s...", getIdentifier()), queue); if (actionThread != null) actionThread.stop(); @@ -380,8 +380,13 @@ public class Action implements IAction { } + @Override + public String getIdentifier() { + return String.format("%s '%s'", getClass().getSimpleName(), name); + } + public String toString() { - return String.format("%s '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", getClass().getSimpleName(), name != null ? name : "unnamed", getQueueName(), isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); + return String.format("%s [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, threaded=%s]", getIdentifier(), getQueueName(), isScheduled, done, isPaused(), updateEveryXTick, duration, maxDuration, count, maxCount, isThreaded); } /////////////////////////////////////////////////// ////////////////////////////////////////////////// diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 1a07eee03..cd06bacf2 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -264,12 +264,12 @@ public class ActionQueue implements IActionQueue { public boolean finish(Action a) { if (a.isDone()) { if (a.onDone != null) - a.execute("done", a::executeOnDone); + a.execute("onDone", a::executeOnDone); a.kill(); if (manager.debug) - manager.LOGGER.finish(String.format("Removing Action '%s' from queue", a.name), this); + manager.LOGGER.finish(String.format("Removing %s from queue", a.getIdentifier()), this); return true; } @@ -281,12 +281,12 @@ public class ActionQueue implements IActionQueue { boolean wasDone = a.isDone(); if (manager.debug && !wasDone) - manager.LOGGER.push(this).log(String.format("Started ticking Action '%s' ", a.name), this).push(a); + manager.LOGGER.push(this).log(String.format("Started ticking %s", a.getIdentifier(), a.name), this).push(a); a.tick(); if (manager.debug && !wasDone) - manager.LOGGER.pop().finish(String.format("Finished ticking Action '%s' ", a.name), this).pop(); + manager.LOGGER.pop().finish(String.format("Finished ticking %s", a.getIdentifier(), a.name), this).pop(); return finish(a); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java index 04eddd3b3..7bcd0ef97 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java +++ b/src/main/java/noppes/npcs/controllers/data/action/action/ConditionalAction.java @@ -155,8 +155,7 @@ public class ConditionalAction extends Action implements IConditionalAction { public String toString() { - return String.format("%s '%s' [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", getClass().getSimpleName(), - name != null ? name : "unnamed", getQueueName(), + return String.format("%s [queue='%s', scheduled=%s, done=%s, paused=%s, updateEvery=%s, duration=%d/%d, count=%d/%d, checks=%d/%d, taskExecuted=%s, threaded=%s]", getIdentifier(), getQueueName(), isScheduled, done, isPaused(), From 70f0ab1e6f6dc7bb09a8d136479f33de31641542 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 8 Jul 2025 14:22:49 +0300 Subject: [PATCH 108/154] ActionQueue.stopWhenEmpty --- .../controllers/data/action/ActionQueue.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index cd06bacf2..0a20f4a5a 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -19,6 +19,8 @@ public class ActionQueue implements IActionQueue { protected boolean isParallel; protected boolean isDead; + protected boolean stopWhenEmpty; + protected boolean killWhenEmpty; protected int killWhenEmptyAfter = 100; @@ -70,6 +72,18 @@ public class ActionQueue implements IActionQueue { isParallel = parallel; return this; } + + @Override + public boolean isStoppedWhenEmpty() { + return stopWhenEmpty; + } + + @Override + public IActionQueue stopWhenEmpty(boolean stopWhenEmpty) { + this.stopWhenEmpty = stopWhenEmpty; + return this; + } + @Override public boolean isKilledWhenEmpty() { return killWhenEmpty; @@ -309,6 +323,9 @@ public class ActionQueue implements IActionQueue { pit.remove(); } + if (stopWhenEmpty && !hasActiveTasks()) + stop(); + killWhenEmpty(); if (manager.debug && active) From 91dc56bf87ff624ed7ea5da0dbc7a470f0e1d4ff Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 8 Jul 2025 14:34:39 +0300 Subject: [PATCH 109/154] Moved NpcAPI.actionManager to ActionManager.GLOBAL --- src/main/java/noppes/npcs/ServerTickHandler.java | 4 ++-- .../controllers/data/action/ActionManager.java | 16 ++++++++++++++++ src/main/java/noppes/npcs/scripted/NpcAPI.java | 6 +----- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index 6b5706b15..2cb6d4e6d 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -11,7 +11,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.WorldServer; import noppes.npcs.client.AnalyticsTracking; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.controllers.data.action.ActionManager; import java.net.InetAddress; import java.net.UnknownHostException; @@ -21,7 +21,7 @@ public class ServerTickHandler { @SubscribeEvent public void onServerTick(TickEvent.ServerTickEvent event) { if (event.phase == Phase.END) { - NpcAPI.actionManager.tick(); + ActionManager.GLOBAL.tick(); } } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 167ee729e..01173b4ce 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -7,6 +7,7 @@ import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.action.action.ConditionalAction; +import noppes.npcs.scripted.NpcAPI; import java.util.*; import java.util.function.Consumer; @@ -21,6 +22,8 @@ import java.util.function.Function; * - cancellation & clearing */ public class ActionManager implements IActionManager { + public static final ActionManager GLOBAL = new ActionManager("GLOBAL"); + protected boolean isWorking = false; public ActionLogger LOGGER = new ActionLogger(this); protected String name = ""; @@ -33,6 +36,19 @@ public class ActionManager implements IActionManager { protected boolean debug; protected ScriptContainer reportTo; + private static final Map listeners = new WeakHashMap<>(); + + public IActionListener getOrCreateListener(Object obj) { + return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); + } + + public ActionManager() { + } + + public ActionManager(String name) { + this.name = name; + } + @Override public IActionManager start() { diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 34dc85b54..984c929b9 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -79,7 +79,6 @@ public class NpcAPI extends AbstractNpcAPI { private static final CacheHashMap> scriptItemCache = new CacheHashMap<>(60 * 1000); public static final HashMap engineObjects = new HashMap<>(); public static final EventBus EVENT_BUS = new EventBus(); - public static final ActionManager actionManager = new ActionManager(); private static AbstractNpcAPI instance = null; private final static String API_USER_AGENT = "CNPC+API"; @@ -569,10 +568,7 @@ public class NpcAPI extends AbstractNpcAPI { } public IActionManager getActionManager() { - if (actionManager.getName().isEmpty()) - actionManager.setName("Global"); - - return actionManager; + return ActionManager.GLOBAL; } private void checkWorld() { From 993a8bd57cfefd585697d160e6e38519414e937a Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 14:24:59 -0400 Subject: [PATCH 110/154] Fix Data Loading Modification --- src/main/java/kamkeel/npcs/controllers/ProfileController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 11dc11b9d..f5ceed513 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -117,10 +117,7 @@ public class ProfileController implements IProfileHandler { } profile.player = player; activeProfiles.put(player.getUniqueID(), profile); - loadSlotData(player); verifySlotQuests(profile.player); - // Avoid saving on every login; only persist if the profile was - // modified (e.g. default slot creation). if (profileModified) save(player, profile); } From 5e9cc0444bfc5c7c895e0778155745ca5c05221f Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 14:27:29 -0400 Subject: [PATCH 111/154] Bump API --- build.gradle | 2 +- src/api | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0ae75baa7..d0b27a0e5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2-beta2" +version = "1.10.2-beta2.1" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/api b/src/api index 9ce413ee0..be190c563 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 9ce413ee074f975378287f52b5aaf80105d297cd +Subproject commit be190c563b13acbf47ae6b7cbe87ee7db97a9b10 From 994cadfc3bc0aeb4e700f0ab234a9a3c6a736661 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Tue, 8 Jul 2025 21:31:55 +0300 Subject: [PATCH 112/154] IActionListener W.I.P --- .../npcs/controllers/data/action/Action.java | 18 ++++ .../data/action/ActionListener.java | 90 +++++++++++++++++++ .../data/action/ActionManager.java | 43 +++++++-- 3 files changed, 143 insertions(+), 8 deletions(-) create mode 100644 src/main/java/noppes/npcs/controllers/data/action/ActionListener.java diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 76df3d8e6..852e43ee4 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -2,6 +2,7 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionListener; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; @@ -257,6 +258,23 @@ public class Action implements IAction { return done; } + /////////////////////////////////////////////////// + ////////////////////////////////////////////////// + // Listener + + public IAction listenTo(String hook, Object object) { + return listenTo(hook, manager.getOrCreateListener(object)); + } + + public IAction listenTo(String hook, IActionListener listener) { + return listenTo(listener.getOrCreateHook(hook)); + } + + public IAction listenTo(ActionListener.Hook hook) { + hook.schedule(this); + return this; + } + /////////////////////////////////////////////////// ////////////////////////////////////////////////// // Handling diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java new file mode 100644 index 000000000..5ff0d72db --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java @@ -0,0 +1,90 @@ +package noppes.npcs.controllers.data.action; + +import noppes.npcs.api.handler.data.IAction; +import noppes.npcs.api.handler.data.IActionListener; +import noppes.npcs.api.handler.data.IActionQueue; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; + +public class ActionListener implements IActionListener { + private static final ActionManager manager = ActionManager.GLOBAL; + + private final Object object; //object listener is attached to + private final Map hooks = new ConcurrentHashMap<>(); + + public ActionListener(Object target) { + this.object = target; + } + + public void tick() { + Iterator> it = hooks.entrySet().iterator(); + while (it.hasNext()) { + Map.Entry entry = it.next(); + Hook hook = entry.getValue(); + ActionQueue hookQueue = (ActionQueue) hook.queue; + hookQueue.tick(); + + if (hookQueue.isDead()) { + hookQueue.clear(); + if (manager.debug) + manager.LOGGER.log(String.format("Removing queue '%s'", hookQueue.getName()), manager); + it.remove(); + } + } + } + + public Object getObject() { + return object; + } + + @Override + public Hook getOrCreateHook(String hookName) { + return hooks.computeIfAbsent(hookName, Hook::new); + } + + @Override + public Hook getHook(String hookName) { + return hooks.get(hookName); + } + + @Override + public boolean fire(String hookName) { + Hook hook = hooks.get(hookName); + if (hook != null) { + hook.fire(); + return true; + } + + return false; + } + + public IAction schedule(String hookName, IAction action) { + return getOrCreateHook(hookName).schedule(action); + } + + public class Hook { + public final String name; + public final IActionQueue queue; + + public Hook(String hookName) { + this.name = hookName; + + String queueName = String.format("ActionListener#%s:%s", object, hookName); + this.queue = manager.createQueue(queueName).stopWhenEmpty(true).killWhenEmpty(false); + } + + public String getName() { + return name; + } + + public void fire() { + queue.getManager().start(); // just in case, ensures the manager is ticking + queue.start(); + } + + public IAction schedule(IAction action) { + return queue.schedule(action); + } + } +} diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 01173b4ce..e8405c033 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -3,13 +3,14 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionChain; +import noppes.npcs.api.handler.data.IActionListener; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import noppes.npcs.scripted.NpcAPI; import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; @@ -23,6 +24,7 @@ import java.util.function.Function; */ public class ActionManager implements IActionManager { public static final ActionManager GLOBAL = new ActionManager("GLOBAL"); + private static final Map listeners = new ConcurrentHashMap<>(); protected boolean isWorking = false; public ActionLogger LOGGER = new ActionLogger(this); @@ -36,12 +38,6 @@ public class ActionManager implements IActionManager { protected boolean debug; protected ScriptContainer reportTo; - private static final Map listeners = new WeakHashMap<>(); - - public IActionListener getOrCreateListener(Object obj) { - return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); - } - public ActionManager() { } @@ -73,7 +69,6 @@ public class ActionManager implements IActionManager { return this; } - @Override public boolean inDebugMode() { return debug; @@ -88,6 +83,34 @@ public class ActionManager implements IActionManager { return this; } + /////////////////////////////////////////////////// + /////////////////////////////////////////////////// + // Listeners + + public IActionListener getOrCreateListener(Object obj) { + return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); + } + + public IActionListener getListener(Object obj) { + return listeners.get(obj); + } + + public boolean removeListener(Object obj) { + if (listeners.containsKey(obj)) { + listeners.remove(obj); + return true; + } + + return false; + } + + public boolean fireListener(String hookName, Object obj) { + IActionListener listener = getListener(obj); + if (listener != null) + return listener.fire(hookName); + + return false; + } /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Creators @@ -472,6 +495,10 @@ public class ActionManager implements IActionManager { it.remove(); } } + // ─── All Listeners ───────────────────────────────────────── + if (this == GLOBAL) { + listeners.forEach((obj, listener) -> ((ActionListener) listener).tick()); + } if (debug && active) LOGGER.finish("Finished Tick Cycle",this); From e284dfa4a266b6410fb5d2459dab54b56b854f48 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 14:33:25 -0400 Subject: [PATCH 113/154] Update api --- src/api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api b/src/api index be190c563..33d221d83 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit be190c563b13acbf47ae6b7cbe87ee7db97a9b10 +Subproject commit 33d221d83a9478ff9f7442d2da71e8e79bec5f87 From 131815ff069bb5f3389b41cacd7a1fe9b5b4e283 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 14:38:51 -0400 Subject: [PATCH 114/154] Oof --- src/api | 2 +- .../noppes/npcs/controllers/data/action/ActionListener.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api b/src/api index 33d221d83..20e07bfc5 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 33d221d83a9478ff9f7442d2da71e8e79bec5f87 +Subproject commit 20e07bfc5025d5bb613180ea03879b154fcf0a79 diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java index 5ff0d72db..c249a6b2c 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java @@ -38,17 +38,17 @@ public class ActionListener implements IActionListener { return object; } - @Override +// @Override public Hook getOrCreateHook(String hookName) { return hooks.computeIfAbsent(hookName, Hook::new); } - @Override +// @Override public Hook getHook(String hookName) { return hooks.get(hookName); } - @Override +// @Override public boolean fire(String hookName) { Hook hook = hooks.get(hookName); if (hook != null) { From 3730046b3cbc10826e6e8bc4214c925d90d0d8f1 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 15:36:03 -0400 Subject: [PATCH 115/154] Fix Paint Brush Error --- src/main/java/noppes/npcs/items/ItemNpcTool.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/java/noppes/npcs/items/ItemNpcTool.java b/src/main/java/noppes/npcs/items/ItemNpcTool.java index d4286d8a5..a6ebe0587 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcTool.java +++ b/src/main/java/noppes/npcs/items/ItemNpcTool.java @@ -146,6 +146,13 @@ public class ItemNpcTool extends Item { public static boolean isPaintbrush(ItemStack itemStack) { if(itemStack == null) return false; + + if(itemStack.getItem() == null) + return false; + + if(!(itemStack.getItem() instanceof ItemNpcTool)) + return false; + return itemStack.getItemDamage() == 1; } From 41d4ca8c27741ca1d28ad44e19206714d22d13ff Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 15:39:13 -0400 Subject: [PATCH 116/154] Add Checks to other Tools --- .../java/noppes/npcs/items/ItemNpcTool.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/noppes/npcs/items/ItemNpcTool.java b/src/main/java/noppes/npcs/items/ItemNpcTool.java index a6ebe0587..3243fdc29 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcTool.java +++ b/src/main/java/noppes/npcs/items/ItemNpcTool.java @@ -157,10 +157,28 @@ public class ItemNpcTool extends Item { } public static boolean isHammer(ItemStack itemStack) { + if(itemStack == null) + return false; + + if(itemStack.getItem() == null) + return false; + + if(!(itemStack.getItem() instanceof ItemNpcTool)) + return false; + return itemStack.getItemDamage() == 0; } public static boolean isMagicBook(ItemStack itemStack) { + if(itemStack == null) + return false; + + if(itemStack.getItem() == null) + return false; + + if(!(itemStack.getItem() instanceof ItemNpcTool)) + return false; + return itemStack.getItemDamage() == 2; } From 1b76f1ab7e2441c69bfee70a60978c6a7ec08f81 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 16:34:34 -0400 Subject: [PATCH 117/154] IActionListener Comments --- src/api | 2 +- .../npcs/controllers/data/action/Action.java | 24 ++++----- .../data/action/ActionManager.java | 52 ++++++++++--------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/api b/src/api index 20e07bfc5..a58b6383a 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit 20e07bfc5025d5bb613180ea03879b154fcf0a79 +Subproject commit a58b6383aaff639777d7389ccc81083bf179292d diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index 852e43ee4..aa24e6710 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -262,18 +262,18 @@ public class Action implements IAction { ////////////////////////////////////////////////// // Listener - public IAction listenTo(String hook, Object object) { - return listenTo(hook, manager.getOrCreateListener(object)); - } - - public IAction listenTo(String hook, IActionListener listener) { - return listenTo(listener.getOrCreateHook(hook)); - } - - public IAction listenTo(ActionListener.Hook hook) { - hook.schedule(this); - return this; - } +// public IAction listenTo(String hook, Object object) { +// return listenTo(hook, manager.getOrCreateListener(object)); +// } +// +// public IAction listenTo(String hook, IActionListener listener) { +// return listenTo(listener.getOrCreateHook(hook)); +// } +// +// public IAction listenTo(ActionListener.Hook hook) { +// hook.schedule(this); +// return this; +// } /////////////////////////////////////////////////// ////////////////////////////////////////////////// diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index e8405c033..f4b7fc430 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -38,8 +38,7 @@ public class ActionManager implements IActionManager { protected boolean debug; protected ScriptContainer reportTo; - public ActionManager() { - } + public ActionManager() {} public ActionManager(String name) { this.name = name; @@ -87,30 +86,32 @@ public class ActionManager implements IActionManager { /////////////////////////////////////////////////// // Listeners - public IActionListener getOrCreateListener(Object obj) { - return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); - } + // IActionListener Comments +// public IActionListener getOrCreateListener(Object obj) { +// return listeners.computeIfAbsent(obj, o -> new ActionListener(o)); +// } - public IActionListener getListener(Object obj) { - return listeners.get(obj); - } +// public IActionListener getListener(Object obj) { +// return listeners.get(obj); +// } - public boolean removeListener(Object obj) { - if (listeners.containsKey(obj)) { - listeners.remove(obj); - return true; - } +// public boolean removeListener(Object obj) { +// if (listeners.containsKey(obj)) { +// listeners.remove(obj); +// return true; +// } +// +// return false; +// } - return false; - } +// public boolean fireListener(String hookName, Object obj) { +// IActionListener listener = getListener(obj); +// if (listener != null) +// return listener.fire(hookName); +// +// return false; +// } - public boolean fireListener(String hookName, Object obj) { - IActionListener listener = getListener(obj); - if (listener != null) - return listener.fire(hookName); - - return false; - } /////////////////////////////////////////////////// /////////////////////////////////////////////////// // Creators @@ -496,9 +497,10 @@ public class ActionManager implements IActionManager { } } // ─── All Listeners ───────────────────────────────────────── - if (this == GLOBAL) { - listeners.forEach((obj, listener) -> ((ActionListener) listener).tick()); - } + // IActionListener Comments +// if (this == GLOBAL) { +// listeners.forEach((obj, listener) -> ((ActionListener) listener).tick()); +// } if (debug && active) LOGGER.finish("Finished Tick Cycle",this); From 3867ab43b7295879993fcba1485799dac2a52799 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 16:56:35 -0400 Subject: [PATCH 118/154] Implement ScriptArrow, ScriptThrowable, ScriptFishHook --- src/api | 2 +- .../java/noppes/npcs/scripted/NpcAPI.java | 9 ++++ .../npcs/scripted/constants/EntityType.java | 3 ++ .../npcs/scripted/entity/ScriptArrow.java | 41 +++++++++++++++++++ .../npcs/scripted/entity/ScriptFishHook.java | 36 ++++++++++++++++ .../npcs/scripted/entity/ScriptThrowable.java | 35 ++++++++++++++++ 6 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java create mode 100644 src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java create mode 100644 src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java diff --git a/src/api b/src/api index a58b6383a..b60245f21 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit a58b6383aaff639777d7389ccc81083bf179292d +Subproject commit b60245f21a43398a8d499f397ac9baaa690fff88 diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 984c929b9..45f6b4644 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -17,6 +17,9 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntityFishHook; +import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; @@ -327,6 +330,12 @@ public class NpcAPI extends AbstractNpcAPI { data = new ScriptEntityData(new ScriptProjectile<>((EntityProjectile) entity)); else if (entity instanceof EntityItem) data = new ScriptEntityData(new ScriptEntityItem<>((EntityItem) entity)); + else if (entity instanceof EntityThrowable) + data = new ScriptEntityData(new ScriptThrowable<>((EntityThrowable) entity)); + else if (entity instanceof EntityArrow) + data = new ScriptEntityData(new ScriptArrow<>((EntityArrow) entity)); + else if (entity instanceof EntityFishHook) + data = new ScriptEntityData(new ScriptFishHook<>((EntityFishHook) entity)); else data = new ScriptEntityData(new ScriptEntity<>(entity)); entity.registerExtendedProperties("ScriptedObject", data); diff --git a/src/main/java/noppes/npcs/scripted/constants/EntityType.java b/src/main/java/noppes/npcs/scripted/constants/EntityType.java index c14aa6786..bfe576856 100644 --- a/src/main/java/noppes/npcs/scripted/constants/EntityType.java +++ b/src/main/java/noppes/npcs/scripted/constants/EntityType.java @@ -11,4 +11,7 @@ public class EntityType { public static final int PROJECTILE = 7; public static final int PIXELMON = 8; public static final int VILLAGER = 9; + public static final int ARROW = 10; + public static final int THROWABLE = 11; + public static final int FISH_HOOK = 12; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java new file mode 100644 index 000000000..4e745a168 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java @@ -0,0 +1,41 @@ +package noppes.npcs.scripted.entity; + +import net.minecraft.entity.projectile.EntityArrow; +import noppes.npcs.api.entity.IArrow; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; + +public class ScriptArrow extends ScriptEntity implements IArrow { + + public ScriptArrow(T entity) { + super(entity); + } + + @Override + public IEntity getShooter() { + if(entity.shootingEntity != null) + return NpcAPI.Instance().getIEntity(entity.shootingEntity); + return null; + } + + @Override + public double getDamage() { + return entity.getDamage(); + } + + @Override + public void kill() { + entity.setDead(); + } + + @Override + public int getType() { + return EntityType.ARROW; + } + + @Override + public boolean typeOf(int type) { + return type == EntityType.ARROW || super.typeOf(type); + } +} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java new file mode 100644 index 000000000..0455fa43b --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java @@ -0,0 +1,36 @@ +package noppes.npcs.scripted.entity; + +import net.minecraft.entity.projectile.EntityFishHook; +import noppes.npcs.api.entity.IFishHook; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; + +public class ScriptFishHook extends ScriptEntity implements IFishHook { + + public ScriptFishHook(T entity) { + super(entity); + } + + @Override + public IPlayer getCaster() { + if(entity.field_146042_b != null) + return (IPlayer) NpcAPI.Instance().getIEntity(entity.field_146042_b); + return null; + } + + @Override + public void kill() { + entity.setDead(); + } + + @Override + public int getType() { + return EntityType.FISH_HOOK; + } + + @Override + public boolean typeOf(int type) { + return type == EntityType.FISH_HOOK || super.typeOf(type); + } +} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java new file mode 100644 index 000000000..53d639335 --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java @@ -0,0 +1,35 @@ +package noppes.npcs.scripted.entity; + +import net.minecraft.entity.projectile.EntityThrowable; +import noppes.npcs.api.entity.*; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.constants.EntityType; + +public class ScriptThrowable extends ScriptEntity implements IThrowable { + + public ScriptThrowable(T entity) { + super(entity); + } + + @Override + public IEntityLivingBase getThrower() { + if(entity.getThrower() != null) + return (IEntityLivingBase) NpcAPI.Instance().getIEntity(entity.getThrower()); + return null; + } + + @Override + public void kill() { + entity.setDead(); + } + + @Override + public int getType() { + return EntityType.THROWABLE; + } + + @Override + public boolean typeOf(int type) { + return type == EntityType.THROWABLE || super.typeOf(type); + } +} From 2860cc5cf31bb359ecbb9ccefd63aaff1dc14886 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 8 Jul 2025 16:58:39 -0400 Subject: [PATCH 119/154] Beta 3 --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index d0b27a0e5..5096903ef 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2-beta2.1" +version = "1.10.2-beta3" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index b6882083c..ec85394fb 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -41,7 +41,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta2") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta3") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") From bacfb5eba019f4d1ec520e34179b9a5e0c725436 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 15:40:31 -0400 Subject: [PATCH 120/154] Create First Push of Recipe Events --- .../npcs/controllers/SyncController.java | 17 +- .../kamkeel/npcs/network/PacketHandler.java | 1 + .../npcs/network/enums/EnumRequestPacket.java | 5 +- .../request/script/RecipeScriptPacket.java | 120 ++++++++++++++ src/main/java/noppes/npcs/EventHooks.java | 33 +++- .../gui/global/GuiNpcManageRecipes.java | 34 +++- .../client/gui/script/GuiScriptRecipe.java | 89 ++++++++++ .../npcs/containers/ContainerAnvilRepair.java | 18 ++ .../containers/ContainerCarpentryBench.java | 35 +++- .../npcs/controllers/RecipeController.java | 35 ++-- .../npcs/controllers/data/CustomEffect.java | 1 - .../npcs/controllers/data/RecipeAnvil.java | 63 +++++-- .../controllers/data/RecipeCarpentry.java | 57 +++++-- .../npcs/controllers/data/RecipeScript.java | 154 ++++++++++++++++++ .../scripted/event/RecipeScriptEvent.java | 66 ++++++++ 15 files changed, 671 insertions(+), 57 deletions(-) create mode 100644 src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java create mode 100644 src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java create mode 100644 src/main/java/noppes/npcs/controllers/data/RecipeScript.java create mode 100644 src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index 982d7d494..8a18ebca4 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -108,7 +108,7 @@ public class SyncController { NBTTagList list = new NBTTagList(); NBTTagCompound compound = new NBTTagCompound(); for (RecipeCarpentry recipe : controller.globalRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(false)); } compound.setTag("recipes", list); return compound; @@ -119,7 +119,7 @@ public class SyncController { NBTTagList list = new NBTTagList(); NBTTagCompound compound = new NBTTagCompound(); for (RecipeCarpentry recipe : controller.carpentryRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(false)); } compound.setTag("recipes", list); return compound; @@ -130,7 +130,7 @@ public class SyncController { NBTTagList list = new NBTTagList(); NBTTagCompound compound = new NBTTagCompound(); for (RecipeAnvil recipe : controller.anvilRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(false)); } compound.setTag("recipes", list); return compound; @@ -430,7 +430,9 @@ public class SyncController { return; for (int i = 0; i < list.tagCount(); i++) { - RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i)); + NBTTagCompound recipeCompound = list.getCompoundTagAt(i); + RecipeCarpentry recipe = RecipeCarpentry.create(recipeCompound); + recipe.readNBT(recipeCompound); RecipeController.syncRecipes.put(recipe.id, recipe); } @@ -444,7 +446,9 @@ public class SyncController { return; for (int i = 0; i < list.tagCount(); i++) { - RecipeCarpentry recipe = RecipeCarpentry.read(list.getCompoundTagAt(i)); + NBTTagCompound recipeCompound = list.getCompoundTagAt(i); + RecipeCarpentry recipe = RecipeCarpentry.create(recipeCompound); + recipe.readNBT(recipeCompound); RecipeController.syncRecipes.put(recipe.id, recipe); } @@ -458,7 +462,8 @@ public class SyncController { return; for (int i = 0; i < list.tagCount(); i++) { - RecipeAnvil recipe = RecipeAnvil.read(list.getCompoundTagAt(i)); + RecipeAnvil recipe = new RecipeAnvil(); + recipe.readNBT(list.getCompoundTagAt(i)); RecipeController.syncAnvilRecipes.put(recipe.id, recipe); } diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index d1a5df29b..bcb94e80f 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -173,6 +173,7 @@ public class PacketHandler { REQUEST_PACKET.registerPacket(new RecipeGetPacket()); REQUEST_PACKET.registerPacket(new RecipeRemovePacket()); REQUEST_PACKET.registerPacket(new RecipeSavePacket()); + REQUEST_PACKET.registerPacket(new RecipeScriptPacket()); // Natural Spawn Packets REQUEST_PACKET.registerPacket(new NaturalSpawnGetAllPacket()); diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java index 5503a8d24..0159fe719 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java @@ -192,5 +192,8 @@ public enum EnumRequestPacket { MagicGet, MagicSave, NpcMagicGet, - NpcMagicSave, Hammer, + NpcMagicSave, + Hammer, + + RecipeScript, } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java new file mode 100644 index 000000000..32b90e93e --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java @@ -0,0 +1,120 @@ +package kamkeel.npcs.network.packets.request.script; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.*; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.config.ConfigScript; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.IScriptHandler; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; + +import java.io.IOException; + +public final class RecipeScriptPacket extends AbstractPacket { + public static String packetName = "Request|RecipeScript"; + + private Action type; + private boolean anvil; + private int id; + private int tab; + private int maxSize; + private NBTTagCompound compound; + + public RecipeScriptPacket() {} + + public RecipeScriptPacket(Action type, boolean anvil, int id, int tab, int maxSize, NBTTagCompound compound) { + this.type = type; + this.anvil = anvil; + this.id = id; + this.tab = tab; + this.maxSize = maxSize; + this.compound = compound; + } + + @Override + public Enum getType() { + return EnumRequestPacket.RecipeScript; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_RECIPE; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(type.ordinal()); + out.writeBoolean(anvil); + out.writeInt(id); + if (type == Action.SAVE) { + out.writeInt(tab); + out.writeInt(maxSize); + ByteBufUtils.writeNBT(out, compound); + } + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!ConfigScript.canScript(player, CustomNpcsPermissions.SCRIPT)) + return; + + Action action = Action.values()[in.readInt()]; + boolean isAnvil = in.readBoolean(); + int recipeId = in.readInt(); + + if (isAnvil) { + RecipeAnvil recipe = RecipeController.Instance.getAnvilRecipe(recipeId); + if (recipe == null) + return; + handle(action, recipe.getOrCreateScriptHandler(), in, (EntityPlayerMP) player); + } else { + RecipeCarpentry recipe = RecipeController.Instance.getRecipe(recipeId); + if (recipe == null) + return; + handle(action, recipe.getOrCreateScriptHandler(), in, (EntityPlayerMP) player); + } + } + + private void handle(Action action, RecipeScript script, ByteBuf in, EntityPlayerMP player) throws IOException { + if (action == Action.GET) { + PacketUtil.getScripts(script, player); + } else { + script.saveScript(in); + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + // TODO: Log Recipe Script Saving + } + } + } + + public static void Save(boolean anvil, int id, int tab, int maxSize, NBTTagCompound compound) { + PacketClient.sendClient(new RecipeScriptPacket(Action.SAVE, anvil, id, tab, maxSize, compound)); + } + + public static void Get(boolean anvil, int id) { + PacketClient.sendClient(new RecipeScriptPacket(Action.GET, anvil, id, -1, -1, new NBTTagCompound())); + } + + private enum Action { + GET, + SAVE + } +} diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 17f9e2dd6..622781ce9 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -19,10 +19,7 @@ import noppes.npcs.api.entity.*; import noppes.npcs.api.event.IAnimationEvent; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.gui.IItemSlot; -import noppes.npcs.api.handler.data.IAnimation; -import noppes.npcs.api.handler.data.IFrame; -import noppes.npcs.api.handler.data.IPlayerEffect; -import noppes.npcs.api.handler.data.IProfile; +import noppes.npcs.api.handler.data.*; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.api.item.IItemLinked; import noppes.npcs.api.item.IItemStack; @@ -37,6 +34,7 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.*; import noppes.npcs.scripted.event.player.*; import noppes.npcs.scripted.event.player.PlayerEvent.*; +import noppes.npcs.scripted.item.ScriptItemStack; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -168,6 +166,33 @@ public class EventHooks { NpcAPI.EVENT_BUS.post(event); } + + public static boolean onRecipeScriptPre(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items) { + IItemStack[] iitems = new IItemStack[items.length]; + for (int i = 0; i < items.length; i++) { + iitems[i] = items[i] == null ? null : NpcAPI.Instance().getIItemStack(items[i]); + } + RecipeScriptEvent.Pre event = new RecipeScriptEvent.Pre(NoppesUtilServer.getIPlayer(player), recipe, recipe instanceof IAnvilRecipe, iitems); + if (script != null) { + script.callScript(RecipeScript.ScriptType.PRE.function, event); + } + return NpcAPI.EVENT_BUS.post(event); + } + + public static ItemStack onRecipeScriptPost(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items, ItemStack result) { + IItemStack[] iitems = new IItemStack[items.length]; + for (int i = 0; i < items.length; i++) { + iitems[i] = items[i] == null ? null : NpcAPI.Instance().getIItemStack(items[i]); + } + RecipeScriptEvent.Post event = new RecipeScriptEvent.Post(NoppesUtilServer.getIPlayer(player), recipe, recipe instanceof IAnvilRecipe, iitems, NpcAPI.Instance().getIItemStack(result)); + if (script != null) { + script.callScript(RecipeScript.ScriptType.POST.function, event); + } + NpcAPI.EVENT_BUS.post(event); + return event.getResult() == null ? null : ((ScriptItemStack) event.getCraft()).getMCItemStack(); + } + + public static void onLinkedItemVersionChange(IItemLinked item, int version, int prevVersion) { INpcScriptHandler handler = (INpcScriptHandler) item.getScriptHandler(); LinkedItemEvent.VersionChangeEvent event = new LinkedItemEvent.VersionChangeEvent(item, version, prevVersion); diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java index 4fa1dd407..57b3255c5 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -12,6 +12,7 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiNpcAvailability; +import noppes.npcs.client.gui.script.GuiScriptRecipe; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumScrollData; @@ -83,10 +84,12 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS buttonPos += 22; this.addButton(new GuiNpcButton(15, guiLeft + 172, buttonPos - 5, 103, 20, "availability.options")); + this.addButton(new GuiNpcButton(16, guiLeft + 172, buttonPos + 17, 103, 20, "script.scripts")); this.getButton(5).setEnabled(false); this.getButton(6).setEnabled(false); this.getButton(15).setEnabled(false); + this.getButton(16).setEnabled(false); this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipe.name)); this.getTextField(0).enabled = false; @@ -116,11 +119,13 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS buttonPos += 22; this.addButton(new GuiNpcButton(15, guiLeft + 172, buttonPos - 5, 103, 20, "availability.options")); + this.addButton(new GuiNpcButton(16, guiLeft + 172, buttonPos + 17, 103, 20, "script.scripts")); this.getButton(7).setEnabled(false); this.getButton(8).setEnabled(false); this.getButton(9).setEnabled(false); this.getButton(15).setEnabled(false); + this.getButton(16).setEnabled(false); this.addTextField(new GuiNpcTextField(0, this, fontRendererObj, guiLeft + 8, guiTop + 8, 160, 20, container.recipeAnvil.name)); this.getTextField(0).enabled = false; @@ -200,6 +205,21 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS setSubGui(new SubGuiNpcAvailability(container.recipe.availability)); } } + + if (button.id == 16) { + save(); + if (container.width == 1) { + GuiScriptRecipe gui = new GuiScriptRecipe(this, container.recipeAnvil); + gui.setWorldAndResolution(mc, width, height); + gui.initGui(); + mc.currentScreen = gui; + } else if (!container.recipe.isGlobal) { + GuiScriptRecipe gui = new GuiScriptRecipe(this, container.recipe); + gui.setWorldAndResolution(mc, width, height); + gui.initGui(); + mc.currentScreen = gui; + } + } } @Override @@ -231,13 +251,15 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS @Override public void setGuiData(NBTTagCompound compound) { if (compound.hasKey("IsAnvil")) { - RecipeAnvil recipe = RecipeAnvil.read(compound); + RecipeAnvil recipe = new RecipeAnvil(); + recipe.readNBT(compound); container.setRecipe(recipe); container.width = 1; tab = 2; fixButtons(); } else { - RecipeCarpentry recipe = RecipeCarpentry.read(compound); + RecipeCarpentry recipe = RecipeCarpentry.create(compound); + recipe.readNBT(compound); container.setRecipe(recipe); fixButtons(); } @@ -273,6 +295,10 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS GuiNpcButton avail = this.getButton(15); if (avail != null) avail.setEnabled(true); + + GuiNpcButton script = this.getButton(16); + if (script != null) + script.setEnabled(true); } else { getTextField(0).setText(container.recipe.name); @@ -287,6 +313,10 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS GuiNpcButton avail = this.getButton(15); if (avail != null) avail.setEnabled(true); + + GuiNpcButton script = this.getButton(16); + if (script != null) + script.setEnabled(true); } } } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java new file mode 100644 index 000000000..60ca1fa54 --- /dev/null +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -0,0 +1,89 @@ +package noppes.npcs.client.gui.script; + +import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.NBTTags; +import noppes.npcs.client.gui.global.GuiNpcManageRecipes; +import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; + +import java.util.List; + +public class GuiScriptRecipe extends GuiScriptInterface { + private final GuiNpcManageRecipes parent; + private final RecipeScript scriptHandler; + private final boolean anvil; + private final int recipeId; + + public GuiScriptRecipe(GuiNpcManageRecipes parent, RecipeCarpentry recipe) { + this.parent = parent; + this.scriptHandler = recipe.getOrCreateScriptHandler(); + this.anvil = false; + this.recipeId = recipe.id; + hookList.add(RecipeScript.ScriptType.PRE.function); + hookList.add(RecipeScript.ScriptType.POST.function); + RecipeScriptPacket.Get(false, recipeId); + this.handler = scriptHandler; + } + + public GuiScriptRecipe(GuiNpcManageRecipes parent, RecipeAnvil recipe) { + this.parent = parent; + this.scriptHandler = recipe.getOrCreateScriptHandler(); + this.anvil = true; + this.recipeId = recipe.id; + hookList.add(RecipeScript.ScriptType.PRE.function); + hookList.add(RecipeScript.ScriptType.POST.function); + RecipeScriptPacket.Get(true, recipeId); + this.handler = scriptHandler; + } + + @Override + public void setGuiData(NBTTagCompound compound) { + if (!compound.hasKey("Tab")) { + scriptHandler.setLanguage(compound.getString("ScriptLanguage")); + scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled")); + copiedSetGuiData(compound); + } else { + int tab = compound.getInteger("Tab"); + ScriptContainer container = new ScriptContainer(scriptHandler); + container.readFromNBT(compound.getCompoundTag("Script")); + scriptHandler.setScripts(java.util.Collections.singletonList(container)); + } + loaded = true; + initGui(); + } + + private void copiedSetGuiData(NBTTagCompound compound) { + net.minecraft.nbt.NBTTagList data = compound.getTagList("Languages", 10); + java.util.HashMap languages = new java.util.HashMap(); + for (int i = 0; i < data.tagCount(); ++i) { + NBTTagCompound comp = data.getCompoundTagAt(i); + java.util.ArrayList scripts = new java.util.ArrayList(); + net.minecraft.nbt.NBTTagList list = comp.getTagList("Scripts", 8); + for (int j = 0; j < list.tagCount(); ++j) { + scripts.add(list.getStringTagAt(j)); + } + languages.put(comp.getString("Language"), scripts); + } + this.languages = languages; + } + + @Override + public void save() { + if (loaded) { + super.save(); + List containers = scriptHandler.getScripts(); + for (int i = 0; i < containers.size(); i++) { + ScriptContainer sc = containers.get(i); + RecipeScriptPacket.Save(anvil, recipeId, i, containers.size(), sc.writeToNBT(new NBTTagCompound())); + } + NBTTagCompound data = new NBTTagCompound(); + data.setString("ScriptLanguage", scriptHandler.getLanguage()); + data.setBoolean("ScriptEnabled", scriptHandler.getEnabled()); + data.setTag("ScriptConsole", NBTTags.NBTLongStringMap(scriptHandler.getConsoleText())); + RecipeScriptPacket.Save(anvil, recipeId, -1, containers.size(), data); + } + } +} diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index ff873ce58..24fedbd1f 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -6,6 +6,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import noppes.npcs.EventHooks; import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; @@ -25,6 +26,8 @@ public class ContainerAnvilRepair extends Container { public int repairCost = 0; public int repairMaterialConsumed = 0; + private RecipeAnvil currentRecipe; + public ContainerAnvilRepair(InventoryPlayer playerInv, World world, int x, int y, int z) { this.worldObj = world; this.posX = x; @@ -109,6 +112,8 @@ public class ContainerAnvilRepair extends Container { } } + currentRecipe = matchingRecipe; + ItemStack output = null; if (matchingRecipe != null) { if (!matchingRecipe.availability.isAvailable(player)) { @@ -272,6 +277,19 @@ public class ContainerAnvilRepair extends Container { @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + RecipeAnvil recipe = container.currentRecipe; + ItemStack[] items = new ItemStack[]{ + container.anvilMatrix.getStackInRowAndColumn(0, 0), + container.anvilMatrix.getStackInRowAndColumn(1, 0) + }; + if (recipe != null) { + if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { + return; + } + container.updateRepairResult(); + stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); + } + if (player.experienceTotal < container.repairCost) { container.updateRepairResult(); return; diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index ef5d3a9b3..4522bab1c 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; +import noppes.npcs.EventHooks; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; @@ -20,13 +21,15 @@ public class ContainerCarpentryBench extends Container { private int posY; private int posZ; + private RecipeCarpentry currentRecipe; + public ContainerCarpentryBench(InventoryPlayer par1InventoryPlayer, World par2World, int par3, int par4, int par5) { this.worldObj = par2World; this.posX = par3; this.posY = par4; this.posZ = par5; this.player = par1InventoryPlayer.player; - this.addSlotToContainer(new SlotCrafting(par1InventoryPlayer.player, this.craftMatrix, this.craftResult, 0, 133, 41)); + this.addSlotToContainer(new SlotCarpentryResult(this, par1InventoryPlayer.player, this.craftMatrix, this.craftResult, 0, 133, 41)); int var6; int var7; @@ -60,6 +63,7 @@ public class ContainerCarpentryBench extends Container { public void onCraftMatrixChanged(IInventory par1IInventory) { if (!this.worldObj.isRemote) { RecipeCarpentry recipe = RecipeController.Instance.findMatchingRecipe(this.craftMatrix); + this.currentRecipe = recipe; ItemStack item = null; if (recipe != null && recipe.availability.isAvailable(player)) { @@ -150,4 +154,33 @@ public class ContainerCarpentryBench extends Container { public boolean func_94530_a(ItemStack stack, Slot slotIn) { return slotIn.inventory != this.craftResult && super.func_94530_a(stack, slotIn); } + + // Custom result slot to handle recipe scripts + private class SlotCarpentryResult extends SlotCrafting { + private final ContainerCarpentryBench container; + private final InventoryCrafting matrix; + + public SlotCarpentryResult(ContainerCarpentryBench container, EntityPlayer player, InventoryCrafting matrix, IInventory result, int index, int x, int y) { + super(player, matrix, result, index, x, y); + this.container = container; + this.matrix = matrix; + } + + @Override + public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + RecipeCarpentry recipe = container.currentRecipe; + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); + } + if (recipe != null) { + if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { + container.onCraftMatrixChanged(matrix); + return; + } + stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); + } + super.onPickupFromSlot(player, stack); + } + } } diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index 77d877b40..33a3a31d8 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -11,9 +11,7 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.api.handler.IRecipeHandler; import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.api.handler.data.IRecipe; -import noppes.npcs.controllers.data.RecipeAnvil; -import noppes.npcs.controllers.data.RecipeCarpentry; -import noppes.npcs.controllers.data.RecipesDefault; +import noppes.npcs.controllers.data.*; import java.io.File; import java.io.FileInputStream; @@ -28,6 +26,9 @@ public class RecipeController implements IRecipeHandler { public HashMap carpentryRecipes = new HashMap(); public HashMap anvilRecipes = new HashMap(); + public HashMap carpentryScripts = new HashMap<>(); + public HashMap anvilScripts = new HashMap<>(); + public static RecipeController Instance; public static final int version = 1; @@ -104,12 +105,14 @@ public class RecipeController implements IRecipeHandler { for (int i = 0; i < list.tagCount(); i++) { NBTTagCompound compound = list.getCompoundTagAt(i); if (compound.hasKey("IsAnvil")) { - RecipeAnvil anvil = RecipeAnvil.read(compound); + RecipeAnvil anvil = new RecipeAnvil(); + anvil.readNBT(compound); anvilRecipes.put(anvil.id, anvil); if (anvil.id > nextAnvilId) nextAnvilId = anvil.id; } else { - RecipeCarpentry recipe = RecipeCarpentry.read(compound); + RecipeCarpentry recipe = RecipeCarpentry.create(compound); + recipe.readNBT(compound); if (recipe.isGlobal) globalRecipes.put(recipe.id, recipe); else @@ -130,13 +133,13 @@ public class RecipeController implements IRecipeHandler { File saveDir = CustomNpcs.getWorldSaveDirectory(); NBTTagList list = new NBTTagList(); for (RecipeCarpentry recipe : globalRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(true)); } for (RecipeCarpentry recipe : carpentryRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(true)); } for (RecipeAnvil recipe : anvilRecipes.values()) { - list.appendTag(recipe.writeNBT()); + list.appendTag(recipe.writeNBT(true)); } NBTTagCompound nbttagcompound = new NBTTagCompound(); nbttagcompound.setTag("Data", list); @@ -186,7 +189,8 @@ public class RecipeController implements IRecipeHandler { } public RecipeCarpentry saveRecipe(NBTTagCompound compound) throws IOException { - RecipeCarpentry recipe = RecipeCarpentry.read(compound); + RecipeCarpentry recipe = RecipeCarpentry.create(compound); + recipe.readNBT(compound); RecipeCarpentry current = getRecipe(recipe.id); if (current != null && !current.name.equals(recipe.name)) { @@ -212,7 +216,8 @@ public class RecipeController implements IRecipeHandler { } public RecipeAnvil saveAnvilRecipe(NBTTagCompound compound) throws IOException { - RecipeAnvil recipe = RecipeAnvil.read(compound); + RecipeAnvil recipe = new RecipeAnvil(); + recipe.readNBT(compound); RecipeAnvil current = getAnvilRecipe(recipe.id); if (current != null && !current.name.equals(recipe.name)) { @@ -270,8 +275,10 @@ public class RecipeController implements IRecipeHandler { SyncController.syncAllWorkbenchRecipes(); RecipeCarpentry carpentry = carpentryRecipes.remove(recipe.id); - if (carpentry != null) + if (carpentry != null){ + carpentryScripts.remove(recipe.id); SyncController.syncAllCarpentryRecipes(); + } saveCategories(); reloadGlobalRecipes(globalRecipes); @@ -329,7 +336,7 @@ public class RecipeController implements IRecipeHandler { recipe = RecipeCarpentry.saveRecipe(recipe, result, objects); try { - this.saveRecipe(recipe.writeNBT()); + this.saveRecipe(recipe.writeNBT(true)); } catch (Exception var7) { var7.printStackTrace(); } @@ -352,7 +359,7 @@ public class RecipeController implements IRecipeHandler { recipe.name = name; try { - this.saveRecipe(recipe.writeNBT()); + this.saveRecipe(recipe.writeNBT(true)); } catch (IOException var12) { var12.printStackTrace(); } @@ -362,7 +369,7 @@ public class RecipeController implements IRecipeHandler { public void addAnvilRecipe(String name, boolean global, ItemStack itemToRepair, ItemStack repairMaterial, int xpCost, float repairPercentage) { RecipeAnvil recipe = new RecipeAnvil(name, itemToRepair, repairMaterial, xpCost, repairPercentage); try { - this.saveAnvilRecipe(recipe.writeNBT()); + this.saveAnvilRecipe(recipe.writeNBT(true)); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java index dbe49560d..3834bef08 100644 --- a/src/main/java/noppes/npcs/controllers/data/CustomEffect.java +++ b/src/main/java/noppes/npcs/controllers/data/CustomEffect.java @@ -254,7 +254,6 @@ public class CustomEffect implements ICustomEffect { compound.setString("icon", icon); compound.setBoolean("lossOnDeath", lossOnDeath); -// if (saveScripts && scriptContainer != null) { if (saveScripts) { NBTTagCompound scriptData = new NBTTagCompound(); EffectScript handler = getScriptHandler(); diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java index fe6fd0905..7809f63a7 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java @@ -2,9 +2,11 @@ package noppes.npcs.controllers.data; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.Constants; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.handler.data.IAnvilRecipe; +import noppes.npcs.controllers.RecipeController; public class RecipeAnvil implements IAnvilRecipe { public int id = -1; @@ -21,8 +23,6 @@ public class RecipeAnvil implements IAnvilRecipe { public int xpCost; public float repairPercentage; - private boolean isAnvil = true; - public RecipeAnvil() { } @@ -34,23 +34,31 @@ public class RecipeAnvil implements IAnvilRecipe { this.repairPercentage = repairPercentage; } - public static RecipeAnvil read(NBTTagCompound compound) { - RecipeAnvil recipe = new RecipeAnvil(); - recipe.id = compound.getInteger("ID"); - recipe.name = compound.getString("Name"); - recipe.availability.readFromNBT(compound.getCompoundTag("Availability")); - recipe.xpCost = compound.getInteger("XPCost"); - recipe.repairPercentage = compound.getFloat("RepairPercentage"); - recipe.itemToRepair = NoppesUtilServer.readItem(compound.getCompoundTag("ItemToRepair")); - recipe.repairMaterial = NoppesUtilServer.readItem(compound.getCompoundTag("RepairMaterial")); - recipe.ignoreRepairMaterialNBT = compound.getBoolean("IgnoreRepairMatNBT"); - recipe.ignoreRepairItemNBT = compound.getBoolean("IgnoreRepairItemNBT"); - recipe.ignoreRepairMaterialDamage = compound.getBoolean("IgnoreRepairMatDamage"); - recipe.isAnvil = true; - return recipe; + public void readNBT(NBTTagCompound compound) { + this.id = compound.getInteger("ID"); + this.name = compound.getString("Name"); + this.availability.readFromNBT(compound.getCompoundTag("Availability")); + this.xpCost = compound.getInteger("XPCost"); + this.repairPercentage = compound.getFloat("RepairPercentage"); + this.itemToRepair = NoppesUtilServer.readItem(compound.getCompoundTag("ItemToRepair")); + this.repairMaterial = NoppesUtilServer.readItem(compound.getCompoundTag("RepairMaterial")); + this.ignoreRepairMaterialNBT = compound.getBoolean("IgnoreRepairMatNBT"); + this.ignoreRepairItemNBT = compound.getBoolean("IgnoreRepairItemNBT"); + this.ignoreRepairMaterialDamage = compound.getBoolean("IgnoreRepairMatDamage"); + + if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { + RecipeScript handler = new RecipeScript(); + handler.readFromNBT(compound.getCompoundTag("ScriptData")); + setScriptHandler(handler); + } } public NBTTagCompound writeNBT() { + return writeNBT(true); + } + + + public NBTTagCompound writeNBT(boolean saveScripts) { NBTTagCompound compound = new NBTTagCompound(); compound.setInteger("ID", id); compound.setString("Name", name); @@ -67,6 +75,14 @@ public class RecipeAnvil implements IAnvilRecipe { compound.setBoolean("IgnoreRepairItemNBT", ignoreRepairItemNBT); compound.setBoolean("IgnoreRepairMatDamage", ignoreRepairMaterialDamage); compound.setBoolean("IsAnvil", true); + + if (saveScripts) { + NBTTagCompound scriptData = new NBTTagCompound(); + RecipeScript handler = getScriptHandler(); + if (handler != null) + handler.writeToNBT(scriptData); + compound.setTag("ScriptData", scriptData); + } return compound; } @@ -146,7 +162,20 @@ public class RecipeAnvil implements IAnvilRecipe { this.ignoreRepairItemNBT = recipe.ignoreRepairItemNBT; this.ignoreRepairMaterialNBT = recipe.ignoreRepairMaterialNBT; this.repairPercentage = recipe.repairPercentage; - ; this.xpCost = recipe.xpCost; } + public RecipeScript getScriptHandler() { + return RecipeController.Instance.anvilScripts.get(this.id); + } + + public void setScriptHandler(RecipeScript handler) { + RecipeController.Instance.anvilScripts.put(this.id, handler); + } + + public RecipeScript getOrCreateScriptHandler() { + RecipeScript data = getScriptHandler(); + if (data == null) + setScriptHandler(data = new RecipeScript()); + return data; + } } diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java index da03b548c..ff574f133 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java @@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import net.minecraftforge.common.util.Constants; import noppes.npcs.NBTTags; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; @@ -24,7 +25,6 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public boolean ignoreDamage = false; public boolean ignoreNBT = false; - public RecipeCarpentry(int width, int height, ItemStack[] recipe, ItemStack result) { super(width, height, recipe, result); } @@ -34,20 +34,33 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { this.name = name; } - public static RecipeCarpentry read(NBTTagCompound compound) { - RecipeCarpentry recipe = new RecipeCarpentry(compound.getInteger("Width"), compound.getInteger("Height"), + public static RecipeCarpentry create(NBTTagCompound compound) { + return new RecipeCarpentry(compound.getInteger("Width"), compound.getInteger("Height"), NBTTags.getItemStackArray(compound.getTagList("Materials", 10)), NoppesUtilServer.readItem(compound.getCompoundTag("Item"))); - recipe.name = compound.getString("Name"); - recipe.id = compound.getInteger("ID"); - recipe.availability.readFromNBT(compound.getCompoundTag("Availability")); - recipe.ignoreDamage = compound.getBoolean("IgnoreDamage"); - recipe.ignoreNBT = compound.getBoolean("IgnoreNBT"); - recipe.isGlobal = compound.getBoolean("Global"); + } - return recipe; + public void readNBT(NBTTagCompound compound) { + this.name = compound.getString("Name"); + this.id = compound.getInteger("ID"); + this.availability.readFromNBT(compound.getCompoundTag("Availability")); + this.ignoreDamage = compound.getBoolean("IgnoreDamage"); + this.ignoreNBT = compound.getBoolean("IgnoreNBT"); + this.isGlobal = compound.getBoolean("Global"); + + if(!isGlobal){ + if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { + RecipeScript handler = new RecipeScript(); + handler.readFromNBT(compound.getCompoundTag("ScriptData")); + setScriptHandler(handler); + } + } } public NBTTagCompound writeNBT() { + return writeNBT(true); + } + + public NBTTagCompound writeNBT(boolean saveScripts) { NBTTagCompound compound = new NBTTagCompound(); compound.setInteger("ID", id); compound.setInteger("Width", recipeWidth); @@ -60,6 +73,13 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { compound.setBoolean("Global", isGlobal); compound.setBoolean("IgnoreDamage", ignoreDamage); compound.setBoolean("IgnoreNBT", ignoreNBT); + if (saveScripts) { + NBTTagCompound scriptData = new NBTTagCompound(); + RecipeScript handler = getScriptHandler(); + if (handler != null) + handler.writeToNBT(scriptData); + compound.setTag("ScriptData", scriptData); + } return compound; } @@ -253,7 +273,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public void save() { try { - RecipeController.Instance.saveRecipe(this.writeNBT()); + RecipeController.Instance.saveRecipe(this.writeNBT(true)); } catch (IOException var2) { } @@ -270,4 +290,19 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { public int getId() { return this.id; } + + public RecipeScript getScriptHandler() { + return RecipeController.Instance.carpentryScripts.get(this.id); + } + + public void setScriptHandler(RecipeScript handler) { + RecipeController.Instance.carpentryScripts.put(this.id, handler); + } + + public RecipeScript getOrCreateScriptHandler() { + RecipeScript data = getScriptHandler(); + if (data == null) + setScriptHandler(data = new RecipeScript()); + return data; + } } diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeScript.java b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java new file mode 100644 index 000000000..7095b02a5 --- /dev/null +++ b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java @@ -0,0 +1,154 @@ +package noppes.npcs.controllers.data; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.Event; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.Constants; +import noppes.npcs.config.ConfigScript; +import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.ScriptContainer; +import noppes.npcs.controllers.ScriptController; + +import java.io.IOException; +import java.util.*; + +public class RecipeScript implements INpcScriptHandler { + public ScriptContainer container; + public String scriptLanguage = "ECMAScript"; + public boolean enabled = false; + + public NBTTagCompound writeToNBT(NBTTagCompound compound) { + compound.setString("ScriptLanguage", scriptLanguage); + compound.setBoolean("ScriptEnabled", enabled); + if (container != null) + compound.setTag("ScriptContent", container.writeToNBT(new NBTTagCompound())); + return compound; + } + + public RecipeScript readFromNBT(NBTTagCompound compound) { + scriptLanguage = compound.getString("ScriptLanguage"); + enabled = compound.getBoolean("ScriptEnabled"); + if (compound.hasKey("ScriptContent", Constants.NBT.TAG_COMPOUND)) { + container = new ScriptContainer(this); + container.readFromNBT(compound.getCompoundTag("ScriptContent")); + } + return this; + } + + public boolean isEnabled() { + return this.enabled && ScriptController.HasStart && container != null && ConfigScript.ScriptingEnabled; + } + + @Override + public void callScript(EnumScriptType type, Event event) { + this.callScript(type.function, event); + } + + @Override + public void callScript(String s, Event event) { + if (!this.isEnabled()) + return; + container.run(s, event); + } + + @Override + public boolean isClient() { + return FMLCommonHandler.instance().getEffectiveSide().isClient(); + } + + @Override + public boolean getEnabled() { + return this.enabled; + } + + @Override + public void setEnabled(boolean b) { + this.enabled = b; + } + + @Override + public String getLanguage() { + return this.scriptLanguage; + } + + @Override + public void setLanguage(String s) { + this.scriptLanguage = s; + } + + @Override + public void setScripts(List list) { + if (list == null || list.isEmpty()) { + container = null; + return; + } + container = list.get(0); + } + + @Override + public List getScripts() { + if (container == null) + return new ArrayList<>(); + return Collections.singletonList(container); + } + + @Override + public String noticeString() { + return "RecipeScript"; + } + + @Override + public Map getConsoleText() { + TreeMap map = new TreeMap<>(); + int tab = 0; + for (ScriptContainer script : this.getScripts()) { + ++tab; + for (Map.Entry entry : script.console.entrySet()) { + map.put(entry.getKey(), " tab " + tab + ":\n" + entry.getValue()); + } + } + return map; + } + + @Override + public void clearConsole() { + for (ScriptContainer script : this.getScripts()) { + script.console.clear(); + } + } + + public void saveScript(ByteBuf buffer) throws IOException { + int tab = buffer.readInt(); + int totalScripts = buffer.readInt(); + if (totalScripts == 0) + this.container = null; + if (tab == 0) { + NBTTagCompound tabCompound = ByteBufUtils.readNBT(buffer); + ScriptContainer script = new ScriptContainer(this); + script.readFromNBT(tabCompound); + this.container = script; + } else { + NBTTagCompound compound = ByteBufUtils.readNBT(buffer); + this.setLanguage(compound.getString("ScriptLanguage")); + if (!ScriptController.Instance.languages.containsKey(this.getLanguage())) { + if (!ScriptController.Instance.languages.isEmpty()) { + this.setLanguage((String) ScriptController.Instance.languages.keySet().toArray()[0]); + } else { + this.setLanguage("ECMAScript"); + } + } + this.setEnabled(compound.getBoolean("ScriptEnabled")); + } + } + + public enum ScriptType { + PRE("pre"), + POST("post"); + public final String function; + ScriptType(String functionName) { + this.function = functionName; + } + } +} diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java new file mode 100644 index 000000000..745da129f --- /dev/null +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -0,0 +1,66 @@ +package noppes.npcs.scripted.event; + +import cpw.mods.fml.common.eventhandler.Cancelable; +import noppes.npcs.api.handler.data.IRecipe; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.item.IItemStack; +import noppes.npcs.constants.EnumScriptType; +import noppes.npcs.controllers.data.RecipeScript; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.player.PlayerEvent; + +public class RecipeScriptEvent extends PlayerEvent { + public final Object recipe; + public final IItemStack[] items; + public final boolean isAnvil; + + public RecipeScriptEvent(IPlayer player, Object recipe, boolean anvil, IItemStack[] items) { + super(player); + this.recipe = recipe; + this.items = items; + this.isAnvil = anvil; + } + + public Object getRecipe() { + return recipe; + } + + public IItemStack[] getItems() { + return items; + } + + public boolean isAnvil() { + return isAnvil; + } + + @Cancelable + public static class Pre extends RecipeScriptEvent { + public Pre(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items) { + super(player, recipe, isAnvil, items); + } + public String getHookName() { + return RecipeScript.ScriptType.PRE.function; + } + } + + public static class Post extends RecipeScriptEvent { + private IItemStack result; + + public Post(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items, IItemStack result) { + super(player, recipe, isAnvil, items); + this.result = result; + } + + public IItemStack getCraft() { + return result; + } + + public void setResult(IItemStack stack) { + this.result = stack; + } + + public String getHookName() { + return RecipeScript.ScriptType.POST.function; + } + } +} From 5fdb507784d832417792637668daa191855ee7be Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 16:01:05 -0400 Subject: [PATCH 121/154] Update GuiScriptRecipe.java --- .../client/gui/script/GuiScriptRecipe.java | 405 ++++++++++++++++-- 1 file changed, 367 insertions(+), 38 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java index 60ca1fa54..428bb0ee8 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -1,89 +1,418 @@ package noppes.npcs.client.gui.script; +import kamkeel.npcs.network.packets.request.script.EffectScriptPacket; 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 net.minecraft.nbt.NBTTagList; +import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; +import noppes.npcs.NoppesStringUtils; +import noppes.npcs.client.gui.global.GuiNPCManageEffects; import noppes.npcs.client.gui.global.GuiNpcManageRecipes; +import noppes.npcs.client.gui.util.*; import noppes.npcs.controllers.ScriptContainer; -import noppes.npcs.controllers.data.RecipeAnvil; -import noppes.npcs.controllers.data.RecipeCarpentry; -import noppes.npcs.controllers.data.RecipeScript; +import noppes.npcs.controllers.data.*; -import java.util.List; +import java.util.*; + +public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { + private int activeTab = 0; + public Map> languages = new HashMap(); + private final int scriptLimit = 1; + public List hookList = new ArrayList(); + public String previousHookClicked = ""; + + public final GuiNpcManageRecipes parent; + public final int recipeId; + public final boolean anvil; -public class GuiScriptRecipe extends GuiScriptInterface { - private final GuiNpcManageRecipes parent; private final RecipeScript scriptHandler; - private final boolean anvil; - private final int recipeId; + boolean loaded = false; public GuiScriptRecipe(GuiNpcManageRecipes parent, RecipeCarpentry recipe) { + this.drawDefaultBackground = true; + this.closeOnEsc = true; + this.xSize = 420; + this.setBackground("menubg.png"); + this.parent = parent; - this.scriptHandler = recipe.getOrCreateScriptHandler(); + + this.scriptHandler = new RecipeScript(); this.anvil = false; this.recipeId = recipe.id; + hookList.add(RecipeScript.ScriptType.PRE.function); hookList.add(RecipeScript.ScriptType.POST.function); + RecipeScriptPacket.Get(false, recipeId); - this.handler = scriptHandler; } public GuiScriptRecipe(GuiNpcManageRecipes parent, RecipeAnvil recipe) { + this.drawDefaultBackground = true; + this.closeOnEsc = true; + this.xSize = 420; + this.setBackground("menubg.png"); + this.parent = parent; - this.scriptHandler = recipe.getOrCreateScriptHandler(); + + this.scriptHandler = new RecipeScript(); this.anvil = true; this.recipeId = recipe.id; + hookList.add(RecipeScript.ScriptType.PRE.function); hookList.add(RecipeScript.ScriptType.POST.function); + RecipeScriptPacket.Get(true, recipeId); - this.handler = scriptHandler; } - @Override + public void initGui() { + this.ySize = (int) ((double) this.xSize * 0.56); + if ((double) this.ySize > (double) this.height * 0.95) { + this.ySize = (int) ((double) this.height * 0.95); + this.xSize = (int) ((double) this.ySize / 0.56); + } + + this.bgScale = (float) this.xSize / 400.0F; + super.initGui(); + this.guiTop += 10; + int yoffset = (int) ((double) this.ySize * 0.02); + GuiMenuTopButton top; + this.addTopButton(top = new GuiMenuTopButton(0, this.guiLeft + 4, this.guiTop - 17, "gui.settings")); + int topXoffset = 0; + int topYoffset = 0; + + if (this.scriptHandler.container != null) { + this.addTopButton(top = new GuiMenuTopButton(1, top.xPosition + top.width + topXoffset, top.yPosition + topYoffset, "Script")); + + } else { + this.addTopButton(new GuiMenuTopButton(this.scriptLimit, top.xPosition + top.width, top.yPosition, "+")); + } + + top = this.getTopButton(this.activeTab); + if (top == null) { + this.activeTab = 0; + top = this.getTopButton(0); + } + + top.active = true; + if (this.activeTab == 1) { + GuiCustomScroll hooks = new GuiCustomScroll(this, 1); + hooks.allowUserInput = false; + hooks.setSize(108, 198); + hooks.guiLeft = this.guiLeft - 110; + hooks.guiTop = this.guiTop + 14; + + hooks.setUnsortedList(this.hookList); + this.addScroll(hooks); + GuiNpcLabel hookLabel = new GuiNpcLabel(0, "script.hooks", hooks.guiLeft, this.guiTop + 5); + hookLabel.color = 11184810; + this.addLabel(hookLabel); + ScriptContainer container = this.scriptHandler.container; + GuiScriptTextArea ta = new GuiScriptTextArea(this, 2, this.guiLeft + 1 + yoffset, this.guiTop + yoffset, this.xSize - 108 - yoffset, (int) ((double) this.ySize * 0.96) - yoffset * 2, container == null ? "" : container.script); + ta.enableCodeHighlighting(); + ta.setListener(this); + this.addTextField(ta); + int left1 = this.guiLeft + this.xSize - 104; + this.addButton(new GuiNpcButton(102, left1, this.guiTop + yoffset, 60, 20, "gui.clear")); + this.addButton(new GuiNpcButton(101, left1 + 61, this.guiTop + yoffset, 60, 20, "gui.paste")); + this.addButton(new GuiNpcButton(100, left1, this.guiTop + 21 + yoffset, 60, 20, "gui.copy")); + this.addButton(new GuiNpcButton(105, left1 + 61, this.guiTop + 21 + yoffset, 60, 20, "gui.remove")); + + this.addButton(new GuiNpcButton(107, left1, this.guiTop + 66 + yoffset, 80, 20, "script.loadscript")); + this.getButton(107).enabled = false; + + GuiCustomScroll scroll = (new GuiCustomScroll(this, 0)).setUnselectable(); + scroll.setSize(100, (int) ((double) this.ySize * 0.54) - yoffset * 2); + scroll.guiLeft = left1; + scroll.guiTop = this.guiTop + 88 + yoffset; + if (container != null) { + scroll.setList(container.scripts); + } + + this.addScroll(scroll); + } else { + GuiNpcTextArea var8 = new GuiNpcTextArea(2, this, this.guiLeft + 4 + yoffset, this.guiTop + 6 + yoffset, this.xSize - 160 - yoffset, (int) ((float) this.ySize * 0.92F) - yoffset * 2, this.getConsoleText()); + var8.enabled = false; + this.addTextField(var8); + int var9 = this.guiLeft + this.xSize - 150; + this.addButton(new GuiNpcButton(100, var9, this.guiTop + 125, 60, 20, "gui.copy")); + this.addButton(new GuiNpcButton(102, var9, this.guiTop + 146, 60, 20, "gui.clear")); + this.addLabel(new GuiNpcLabel(1, "script.language", var9, this.guiTop + 15)); + this.addButton(new GuiNpcButton(103, var9 + 60, this.guiTop + 10, 80, 20, this.languages.keySet().toArray(new String[this.languages.keySet().size()]), this.getScriptIndex())); + this.getButton(103).enabled = !this.languages.isEmpty(); + this.addLabel(new GuiNpcLabel(2, "gui.enabled", var9, this.guiTop + 36)); + this.addButton(new GuiNpcButton(104, var9 + 60, this.guiTop + 31, 50, 20, new String[]{"gui.no", "gui.yes"}, this.scriptHandler.getEnabled() ? 1 : 0)); + + this.addButton(new GuiNpcButton(109, var9, this.guiTop + 78, 80, 20, "gui.website")); + this.addButton(new GuiNpcButton(112, var9 + 81, this.guiTop + 78, 80, 20, "gui.forum")); + this.addButton(new GuiNpcButton(110, var9, this.guiTop + 99, 80, 20, "script.apidoc")); + this.addButton(new GuiNpcButton(111, var9 + 81, this.guiTop + 99, 80, 20, "script.apisrc")); + } + + this.xSize = 420; + this.ySize = 256; + } + + public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) { + String hook = scroll.getSelected(); + if (this.previousHookClicked.equals(hook)) { + String addString = ""; + if (!this.getTextField(2).getText().isEmpty()) { + addString = addString + "\n"; + } + + addString = addString + "function " + hook + "(event) {\n \n}\n"; + this.getTextField(2).setText(this.getTextField(2).getText() + addString); + this.previousHookClicked = ""; + } else { + this.previousHookClicked = hook; + } + + } + + public void unFocused(GuiNpcTextField textfield) { + } + + private String getConsoleText() { + Map map = this.scriptHandler.getConsoleText(); + StringBuilder builder = new StringBuilder(); + Iterator var3 = map.entrySet().iterator(); + + while (var3.hasNext()) { + Map.Entry entry = (Map.Entry) var3.next(); + builder.insert(0, new Date((Long) entry.getKey()) + (String) entry.getValue() + "\n"); + } + + return builder.toString(); + } + + private int getScriptIndex() { + int i = 0; + + for (Iterator var2 = this.languages.keySet().iterator(); var2.hasNext(); ++i) { + String language = (String) var2.next(); + if (language.equalsIgnoreCase(this.scriptHandler.getLanguage())) { + return i; + } + } + + return 0; + } + + public void confirmClicked(boolean flag, int i) { + if (flag) { + if (i == 0) { + this.openLink("https://www.curseforge.com/minecraft/mc-mods/customnpc-plus"); + } + + if (i == 1) { + this.openLink("https://kamkeel.github.io/CustomNPC-Plus/"); + } + + if (i == 2) { + this.openLink("https://kamkeel.github.io/CustomNPC-Plus/"); + } + + if (i == 3) { + this.openLink("http://www.minecraftforge.net/forum/index.php/board,122.0.html"); + } + + if (i == 10) { + this.scriptHandler.container = null; + this.activeTab = 0; + } + + if (i == 101) { + this.getTextField(2).setText(NoppesStringUtils.getClipboardContents()); + this.setScript(); + } + + if (i == 102) { + if (this.activeTab == 1) { + ScriptContainer container = this.scriptHandler.container; + container.script = ""; + } else { + this.scriptHandler.clearConsole(); + } + + this.initGui(); + } + } + + this.displayGuiScreen(this); + } + + protected void actionPerformed(GuiButton guibutton) { + if (guibutton.id == 0) { + this.setScript(); + this.activeTab = 0; + this.initGui(); + } + + if (guibutton.id == this.scriptLimit) { + if (scriptHandler.container == null) + this.scriptHandler.container = new ScriptContainer(this.scriptHandler); + else + this.setScript(); + this.activeTab = 1; + this.initGui(); + } + + if (guibutton.id == 109) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://kamkeel.github.io/CustomNPC-Plus/", 0, true)); + } + + if (guibutton.id == 110) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/KAMKEEL/CustomNPC-Plus-API", 1, true)); + } + + if (guibutton.id == 111) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "https://github.com/Noppes/CustomNPCsAPI", 2, true)); + } + + if (guibutton.id == 112) { + this.displayGuiScreen(new GuiConfirmOpenLink(this, "http://www.minecraftforge.net/forum/index.php/board,122.0.html", 3, true)); + } + + if (guibutton.id == 100) { + NoppesStringUtils.setClipboardContents(this.getTextField(2).getText()); + } + + if (guibutton.id == 101) { + GuiYesNo guiyesno = new GuiYesNo(this, StatCollector.translateToLocal("gui.paste"), StatCollector.translateToLocal("gui.sure"), 101); + this.displayGuiScreen(guiyesno); + } + + GuiYesNo container1; + if (guibutton.id == 102) { + container1 = new GuiYesNo(this, StatCollector.translateToLocal("gui.clear"), StatCollector.translateToLocal("gui.sure"), 102); + this.displayGuiScreen(container1); + } + + if (guibutton.id == 103) { + this.scriptHandler.setLanguage(guibutton.displayString); + } + + if (guibutton.id == 104) { + this.scriptHandler.setEnabled(((GuiNpcButton) guibutton).getValue() == 1); + } + + if (guibutton.id == 105) { + container1 = new GuiYesNo(this, "", ((GuiNpcButton) guibutton).displayString, 10); + this.displayGuiScreen(container1); + } + + if (guibutton.id == 107) { + ScriptContainer container = this.scriptHandler.container; + if (container == null) { + container = new ScriptContainer(this.scriptHandler); + this.scriptHandler.container = container; + } + +// this.setSubGui(new EventGuiScriptList((List)this.languages.get(this.script.getLanguage()), container)); + } + + } + + private void setScript() { + if (this.activeTab == 1) { + ScriptContainer container = this.scriptHandler.container; + if (container == null) { + container = new ScriptContainer(this.scriptHandler); + this.scriptHandler.container = container; + } + + String text = this.getTextField(2).getText(); + text = text.replace("\r\n", "\n"); + text = text.replace("\r", "\n"); + container.script = text; + } + + } + public void setGuiData(NBTTagCompound compound) { + if(compound.hasKey("LoadComplete")){ + loaded = true; + return; + } + if (!compound.hasKey("Tab")) { - scriptHandler.setLanguage(compound.getString("ScriptLanguage")); - scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled")); - copiedSetGuiData(compound); + this.scriptHandler.setLanguage(compound.getString("ScriptLanguage")); + this.scriptHandler.setEnabled(compound.getBoolean("ScriptEnabled")); + this.copiedSetGuiData(compound); } else { int tab = compound.getInteger("Tab"); - ScriptContainer container = new ScriptContainer(scriptHandler); + ScriptContainer container = new ScriptContainer(this.scriptHandler); container.readFromNBT(compound.getCompoundTag("Script")); - scriptHandler.setScripts(java.util.Collections.singletonList(container)); + this.scriptHandler.container = container; + this.initGui(); } - loaded = true; - initGui(); } private void copiedSetGuiData(NBTTagCompound compound) { - net.minecraft.nbt.NBTTagList data = compound.getTagList("Languages", 10); - java.util.HashMap languages = new java.util.HashMap(); + NBTTagList data = compound.getTagList("Languages", 10); + HashMap languages = new HashMap(); + for (int i = 0; i < data.tagCount(); ++i) { NBTTagCompound comp = data.getCompoundTagAt(i); - java.util.ArrayList scripts = new java.util.ArrayList(); - net.minecraft.nbt.NBTTagList list = comp.getTagList("Scripts", 8); + ArrayList scripts = new ArrayList(); + NBTTagList list = comp.getTagList("Scripts", 8); + for (int j = 0; j < list.tagCount(); ++j) { scripts.add(list.getStringTagAt(j)); } + languages.put(comp.getString("Language"), scripts); } + this.languages = languages; + this.initGui(); + } + + public void save() { + if(loaded) { + this.setScript(); + + List containers = this.scriptHandler.getScripts(); + for (int i = 0; i < containers.size(); i++) { + ScriptContainer container = containers.get(i); + RecipeScriptPacket.Save(anvil, recipeId, i, containers.size(), container.writeToNBT(new NBTTagCompound())); + } + NBTTagCompound scriptData = new NBTTagCompound(); + scriptData.setString("ScriptLanguage", this.scriptHandler.getLanguage()); + scriptData.setBoolean("ScriptEnabled", this.scriptHandler.getEnabled()); + scriptData.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.scriptHandler.getConsoleText())); + + RecipeScriptPacket.Save(anvil, recipeId, -1, containers.size(), scriptData); + } + } + + public void textUpdate(String text) { + ScriptContainer container = this.scriptHandler.container; + if (container != null) { + container.script = text; + } + + } + + public void saveText(String text) { + ScriptContainer container = this.scriptHandler.container; + if (container != null) { + container.script = text; + } + + this.initGui(); } @Override - public void save() { - if (loaded) { - super.save(); - List containers = scriptHandler.getScripts(); - for (int i = 0; i < containers.size(); i++) { - ScriptContainer sc = containers.get(i); - RecipeScriptPacket.Save(anvil, recipeId, i, containers.size(), sc.writeToNBT(new NBTTagCompound())); - } - NBTTagCompound data = new NBTTagCompound(); - data.setString("ScriptLanguage", scriptHandler.getLanguage()); - data.setBoolean("ScriptEnabled", scriptHandler.getEnabled()); - data.setTag("ScriptConsole", NBTTags.NBTLongStringMap(scriptHandler.getConsoleText())); - RecipeScriptPacket.Save(anvil, recipeId, -1, containers.size(), data); - } + public void close() { + this.save(); + parent.setWorldAndResolution(mc, width, height); + parent.initGui(); + mc.currentScreen = parent; } } From be70f01377fe281549cb008f204dd9f712f21fa5 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 16:24:31 -0400 Subject: [PATCH 122/154] Prevent item pickup when recipe pre event is canceled --- .../npcs/containers/ContainerAnvilRepair.java | 41 +++++++++++++-- .../containers/ContainerCarpentryBench.java | 52 ++++++++++++++++--- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 24fedbd1f..7947c248d 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -217,6 +217,10 @@ public class ContainerAnvilRepair extends Container { ItemStack stack = slot.getStack(); copy = stack.copy(); if (index == 0) { // output slot + SlotAnvilOutput resultSlot = (SlotAnvilOutput) slot; + if (!resultSlot.preEvent(player)) { + return null; + } if (player.experienceTotal < this.repairCost) { return null; } @@ -259,12 +263,32 @@ public class ContainerAnvilRepair extends Container { // subtracts one from the damaged item stack. public class SlotAnvilOutput extends Slot { private final ContainerAnvilRepair container; + private boolean preChecked = false; + private boolean canPickup = true; public SlotAnvilOutput(ContainerAnvilRepair container, IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); this.container = container; } + public boolean preEvent(EntityPlayer player) { + preChecked = true; + RecipeAnvil recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[]{ + container.anvilMatrix.getStackInRowAndColumn(0, 0), + container.anvilMatrix.getStackInRowAndColumn(1, 0) + }; + canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + if (!canPickup) { + container.updateRepairResult(); + } + } else { + canPickup = true; + } + return canPickup; + } + @Override public boolean isItemValid(ItemStack stack) { return false; @@ -272,20 +296,27 @@ public class ContainerAnvilRepair extends Container { @Override public boolean canTakeStack(EntityPlayer player) { - return player.experienceTotal >= container.repairCost; + if (!preChecked) { + preEvent(player); + } + return canPickup && player.experienceTotal >= container.repairCost; } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!preChecked) { + if (!preEvent(player)) + return; + } + if (!canPickup) { + return; + } RecipeAnvil recipe = container.currentRecipe; ItemStack[] items = new ItemStack[]{ container.anvilMatrix.getStackInRowAndColumn(0, 0), container.anvilMatrix.getStackInRowAndColumn(1, 0) }; if (recipe != null) { - if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { - return; - } container.updateRepairResult(); stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); } @@ -319,6 +350,8 @@ public class ContainerAnvilRepair extends Container { } container.repairCost = 0; container.updateRepairResult(); + preChecked = false; + canPickup = true; super.onPickupFromSlot(player, stack); } } diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 4522bab1c..2ed0a0541 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -112,6 +112,10 @@ public class ContainerCarpentryBench extends Container { var2 = var4.copy(); if (par1 == 0) { + SlotCarpentryResult resultSlot = (SlotCarpentryResult) var3; + if (!resultSlot.preEvent(par1EntityPlayer)) { + return null; + } if (!this.mergeItemStack(var4, 17, 53, true)) { return null; } @@ -159,6 +163,8 @@ public class ContainerCarpentryBench extends Container { private class SlotCarpentryResult extends SlotCrafting { private final ContainerCarpentryBench container; private final InventoryCrafting matrix; + private boolean preChecked = false; + private boolean canPickup = true; public SlotCarpentryResult(ContainerCarpentryBench container, EntityPlayer player, InventoryCrafting matrix, IInventory result, int index, int x, int y) { super(player, matrix, result, index, x, y); @@ -166,20 +172,50 @@ public class ContainerCarpentryBench extends Container { this.matrix = matrix; } + public boolean preEvent(EntityPlayer player) { + preChecked = true; + RecipeCarpentry recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); + } + canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + if (!canPickup) { + container.onCraftMatrixChanged(matrix); + } + } else { + canPickup = true; + } + return canPickup; + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + if (!preChecked) { + preEvent(player); + } + return canPickup && super.canTakeStack(player); + } + @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - RecipeCarpentry recipe = container.currentRecipe; - ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; - for (int i = 0; i < items.length; i++) { - items[i] = matrix.getStackInSlot(i); - } - if (recipe != null) { - if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { - container.onCraftMatrixChanged(matrix); + if (!preChecked) { + if (!preEvent(player)) return; + } + if (!canPickup) + return; + RecipeCarpentry recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); } stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); } + preChecked = false; + canPickup = true; super.onPickupFromSlot(player, stack); } } From b3f3989d737c04215fad6439eac2eb537a1d4bf3 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 16:41:54 -0400 Subject: [PATCH 123/154] Fix pre-event slot sync --- .../npcs/containers/ContainerAnvilRepair.java | 42 ++++++++++++-- .../containers/ContainerCarpentryBench.java | 57 +++++++++++++++---- 2 files changed, 85 insertions(+), 14 deletions(-) diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 24fedbd1f..1d1c3052f 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -217,6 +217,10 @@ public class ContainerAnvilRepair extends Container { ItemStack stack = slot.getStack(); copy = stack.copy(); if (index == 0) { // output slot + SlotAnvilOutput resultSlot = (SlotAnvilOutput) slot; + if (!resultSlot.preEvent(player)) { + return null; + } if (player.experienceTotal < this.repairCost) { return null; } @@ -259,12 +263,33 @@ public class ContainerAnvilRepair extends Container { // subtracts one from the damaged item stack. public class SlotAnvilOutput extends Slot { private final ContainerAnvilRepair container; + private boolean preChecked = false; + private boolean canPickup = true; public SlotAnvilOutput(ContainerAnvilRepair container, IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); this.container = container; } + public boolean preEvent(EntityPlayer player) { + preChecked = true; + RecipeAnvil recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[]{ + container.anvilMatrix.getStackInRowAndColumn(0, 0), + container.anvilMatrix.getStackInRowAndColumn(1, 0) + }; + canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + if (!canPickup) { + container.updateRepairResult(); + preChecked = false; // reset for next attempt + } + } else { + canPickup = true; + } + return canPickup; + } + @Override public boolean isItemValid(ItemStack stack) { return false; @@ -272,20 +297,27 @@ public class ContainerAnvilRepair extends Container { @Override public boolean canTakeStack(EntityPlayer player) { - return player.experienceTotal >= container.repairCost; + if (!preChecked) { + preEvent(player); + } + return canPickup && player.experienceTotal >= container.repairCost; } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!preChecked) { + if (!preEvent(player)) + return; + } + if (!canPickup) { + return; + } RecipeAnvil recipe = container.currentRecipe; ItemStack[] items = new ItemStack[]{ container.anvilMatrix.getStackInRowAndColumn(0, 0), container.anvilMatrix.getStackInRowAndColumn(1, 0) }; if (recipe != null) { - if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { - return; - } container.updateRepairResult(); stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); } @@ -319,6 +351,8 @@ public class ContainerAnvilRepair extends Container { } container.repairCost = 0; container.updateRepairResult(); + preChecked = false; + canPickup = true; super.onPickupFromSlot(player, stack); } } diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 4522bab1c..05d5cf402 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -112,6 +112,10 @@ public class ContainerCarpentryBench extends Container { var2 = var4.copy(); if (par1 == 0) { + SlotCarpentryResult resultSlot = (SlotCarpentryResult) var3; + if (!resultSlot.preEvent(par1EntityPlayer)) { + return null; + } if (!this.mergeItemStack(var4, 17, 53, true)) { return null; } @@ -143,8 +147,8 @@ public class ContainerCarpentryBench extends Container { } // Update client-side inventory - if (!this.worldObj.isRemote && player instanceof EntityPlayerMP) { - ((EntityPlayerMP) player).sendContainerToPlayer(this); + if (!this.worldObj.isRemote && par1EntityPlayer instanceof EntityPlayerMP) { + ((EntityPlayerMP) par1EntityPlayer).sendContainerToPlayer(this); } return var2; @@ -159,6 +163,8 @@ public class ContainerCarpentryBench extends Container { private class SlotCarpentryResult extends SlotCrafting { private final ContainerCarpentryBench container; private final InventoryCrafting matrix; + private boolean preChecked = false; + private boolean canPickup = true; public SlotCarpentryResult(ContainerCarpentryBench container, EntityPlayer player, InventoryCrafting matrix, IInventory result, int index, int x, int y) { super(player, matrix, result, index, x, y); @@ -166,20 +172,51 @@ public class ContainerCarpentryBench extends Container { this.matrix = matrix; } + public boolean preEvent(EntityPlayer player) { + preChecked = true; + RecipeCarpentry recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); + } + canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + if (!canPickup) { + container.onCraftMatrixChanged(matrix); + preChecked = false; // reset for next attempt + } + } else { + canPickup = true; + } + return canPickup; + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + if (!preChecked) { + preEvent(player); + } + return canPickup && super.canTakeStack(player); + } + @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - RecipeCarpentry recipe = container.currentRecipe; - ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; - for (int i = 0; i < items.length; i++) { - items[i] = matrix.getStackInSlot(i); - } - if (recipe != null) { - if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { - container.onCraftMatrixChanged(matrix); + if (!preChecked) { + if (!preEvent(player)) return; + } + if (!canPickup) + return; + RecipeCarpentry recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); } stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); } + preChecked = false; + canPickup = true; super.onPickupFromSlot(player, stack); } } From c2b92a836d641b64f03d70a2d08a16cc7ba69d43 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 16:58:57 -0400 Subject: [PATCH 124/154] Fix recipe pre-event pickup checks --- .../npcs/containers/ContainerAnvilRepair.java | 46 +++++++++++-- .../containers/ContainerCarpentryBench.java | 65 +++++++++++++++---- 2 files changed, 94 insertions(+), 17 deletions(-) diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 24fedbd1f..eb7278323 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -217,6 +217,10 @@ public class ContainerAnvilRepair extends Container { ItemStack stack = slot.getStack(); copy = stack.copy(); if (index == 0) { // output slot + SlotAnvilOutput resultSlot = (SlotAnvilOutput) slot; + if (!resultSlot.preEvent(player)) { + return null; + } if (player.experienceTotal < this.repairCost) { return null; } @@ -259,12 +263,35 @@ public class ContainerAnvilRepair extends Container { // subtracts one from the damaged item stack. public class SlotAnvilOutput extends Slot { private final ContainerAnvilRepair container; + private boolean preChecked = false; + private boolean canPickup = true; public SlotAnvilOutput(ContainerAnvilRepair container, IInventory inventory, int index, int x, int y) { super(inventory, index, x, y); this.container = container; } + public boolean preEvent(EntityPlayer player) { + preChecked = true; + if (!container.worldObj.isRemote) { + RecipeAnvil recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[]{ + container.anvilMatrix.getStackInRowAndColumn(0, 0), + container.anvilMatrix.getStackInRowAndColumn(1, 0) + }; + canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + if (!canPickup) { + container.updateRepairResult(); + preChecked = false; // reset for next attempt + } + } else { + canPickup = true; + } + } + return canPickup; + } + @Override public boolean isItemValid(ItemStack stack) { return false; @@ -272,20 +299,27 @@ public class ContainerAnvilRepair extends Container { @Override public boolean canTakeStack(EntityPlayer player) { - return player.experienceTotal >= container.repairCost; + if (!preChecked) { + preEvent(player); + } + return canPickup && player.experienceTotal >= container.repairCost; } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { + if (!preChecked) { + if (!preEvent(player)) + return; + } + if (!canPickup) { + return; + } RecipeAnvil recipe = container.currentRecipe; ItemStack[] items = new ItemStack[]{ container.anvilMatrix.getStackInRowAndColumn(0, 0), container.anvilMatrix.getStackInRowAndColumn(1, 0) }; - if (recipe != null) { - if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { - return; - } + if (!container.worldObj.isRemote && recipe != null) { container.updateRepairResult(); stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); } @@ -319,6 +353,8 @@ public class ContainerAnvilRepair extends Container { } container.repairCost = 0; container.updateRepairResult(); + preChecked = false; + canPickup = true; super.onPickupFromSlot(player, stack); } } diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 4522bab1c..8183b467b 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -112,6 +112,10 @@ public class ContainerCarpentryBench extends Container { var2 = var4.copy(); if (par1 == 0) { + SlotCarpentryResult resultSlot = (SlotCarpentryResult) var3; + if (!resultSlot.preEvent(par1EntityPlayer)) { + return null; + } if (!this.mergeItemStack(var4, 17, 53, true)) { return null; } @@ -143,8 +147,8 @@ public class ContainerCarpentryBench extends Container { } // Update client-side inventory - if (!this.worldObj.isRemote && player instanceof EntityPlayerMP) { - ((EntityPlayerMP) player).sendContainerToPlayer(this); + if (!this.worldObj.isRemote && par1EntityPlayer instanceof EntityPlayerMP) { + ((EntityPlayerMP) par1EntityPlayer).sendContainerToPlayer(this); } return var2; @@ -159,6 +163,8 @@ public class ContainerCarpentryBench extends Container { private class SlotCarpentryResult extends SlotCrafting { private final ContainerCarpentryBench container; private final InventoryCrafting matrix; + private boolean preChecked = false; + private boolean canPickup = true; public SlotCarpentryResult(ContainerCarpentryBench container, EntityPlayer player, InventoryCrafting matrix, IInventory result, int index, int x, int y) { super(player, matrix, result, index, x, y); @@ -166,20 +172,55 @@ public class ContainerCarpentryBench extends Container { this.matrix = matrix; } + public boolean preEvent(EntityPlayer player) { + preChecked = true; + if (!container.worldObj.isRemote) { + RecipeCarpentry recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); + } + canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + if (!canPickup) { + container.onCraftMatrixChanged(matrix); + preChecked = false; // reset for next attempt + } + } else { + canPickup = true; + } + } + return canPickup; + } + + @Override + public boolean canTakeStack(EntityPlayer player) { + if (!preChecked) { + preEvent(player); + } + return canPickup && super.canTakeStack(player); + } + @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - RecipeCarpentry recipe = container.currentRecipe; - ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; - for (int i = 0; i < items.length; i++) { - items[i] = matrix.getStackInSlot(i); - } - if (recipe != null) { - if (EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items)) { - container.onCraftMatrixChanged(matrix); + if (!preChecked) { + if (!preEvent(player)) return; - } - stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); } + if (!canPickup) + return; + if (!container.worldObj.isRemote) { + RecipeCarpentry recipe = container.currentRecipe; + if (recipe != null) { + ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = matrix.getStackInSlot(i); + } + stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); + } + } + preChecked = false; + canPickup = true; super.onPickupFromSlot(player, stack); } } From 01e91227002fa51432355f94c696ae1da9b30236 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 18:17:32 -0400 Subject: [PATCH 125/154] Add message banner support for recipe pre-events --- src/main/java/noppes/npcs/EventHooks.java | 11 ++- .../npcs/containers/ContainerAnvilRepair.java | 61 ++++++----------- .../containers/ContainerCarpentryBench.java | 67 +++++++------------ .../scripted/event/RecipeScriptEvent.java | 11 +++ 4 files changed, 65 insertions(+), 85 deletions(-) diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 622781ce9..b12a60e48 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -35,6 +35,7 @@ import noppes.npcs.scripted.event.*; import noppes.npcs.scripted.event.player.*; import noppes.npcs.scripted.event.player.PlayerEvent.*; import noppes.npcs.scripted.item.ScriptItemStack; +import kamkeel.npcs.network.packets.data.AchievementPacket; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -167,7 +168,7 @@ public class EventHooks { } - public static boolean onRecipeScriptPre(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items) { + public static RecipeScriptEvent.Pre onRecipeScriptPre(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items) { IItemStack[] iitems = new IItemStack[items.length]; for (int i = 0; i < items.length; i++) { iitems[i] = items[i] == null ? null : NpcAPI.Instance().getIItemStack(items[i]); @@ -176,7 +177,13 @@ public class EventHooks { if (script != null) { script.callScript(RecipeScript.ScriptType.PRE.function, event); } - return NpcAPI.EVENT_BUS.post(event); + NpcAPI.EVENT_BUS.post(event); + if (!player.worldObj.isRemote) { + String msg = event.getMessage(); + if (msg == null) msg = ""; + AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "", msg); + } + return event; } public static ItemStack onRecipeScriptPost(EntityPlayer player, RecipeScript script, Object recipe, ItemStack[] items, ItemStack result) { diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index eb7278323..7aa00aedb 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -10,6 +10,7 @@ import noppes.npcs.EventHooks; import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.scripted.event.RecipeScriptEvent; public class ContainerAnvilRepair extends Container { // A 2-slot crafting matrix: slot 0 = damaged item, slot 1 = repair material. @@ -27,6 +28,7 @@ public class ContainerAnvilRepair extends Container { public int repairMaterialConsumed = 0; private RecipeAnvil currentRecipe; + private SlotAnvilOutput resultSlot; public ContainerAnvilRepair(InventoryPlayer playerInv, World world, int x, int y, int z) { this.worldObj = world; @@ -36,7 +38,8 @@ public class ContainerAnvilRepair extends Container { this.player = playerInv.player; // Output slot (index 0) using our custom SlotAnvilOutput. - this.addSlotToContainer(new SlotAnvilOutput(this, anvilResult, 0, 133, 47)); + this.resultSlot = new SlotAnvilOutput(this, anvilResult, 0, 133, 47); + this.addSlotToContainer(this.resultSlot); // Input slot 0: damaged item. We restrict its stack size to 1. this.addSlotToContainer(new Slot(anvilMatrix, 0, 26, 47) { @@ -115,6 +118,7 @@ public class ContainerAnvilRepair extends Container { currentRecipe = matchingRecipe; ItemStack output = null; + boolean canPickup = true; if (matchingRecipe != null) { if (!matchingRecipe.availability.isAvailable(player)) { return; @@ -160,8 +164,17 @@ public class ContainerAnvilRepair extends Container { } else { repairCost = 0; } + if (matchingRecipe != null) { + ItemStack[] items = new ItemStack[]{input0, input1}; + RecipeScriptEvent.Pre pre = EventHooks.onRecipeScriptPre(player, matchingRecipe.getScriptHandler(), matchingRecipe, items); + canPickup = !pre.isCanceled(); + output = EventHooks.onRecipeScriptPost(player, matchingRecipe.getScriptHandler(), matchingRecipe, items, output); + } anvilResult.setInventorySlotContents(0, output); + if (this.resultSlot != null) { + this.resultSlot.setCanPickup(canPickup); + } } } @@ -218,7 +231,7 @@ public class ContainerAnvilRepair extends Container { copy = stack.copy(); if (index == 0) { // output slot SlotAnvilOutput resultSlot = (SlotAnvilOutput) slot; - if (!resultSlot.preEvent(player)) { + if (!resultSlot.canPickup()) { return null; } if (player.experienceTotal < this.repairCost) { @@ -263,7 +276,6 @@ public class ContainerAnvilRepair extends Container { // subtracts one from the damaged item stack. public class SlotAnvilOutput extends Slot { private final ContainerAnvilRepair container; - private boolean preChecked = false; private boolean canPickup = true; public SlotAnvilOutput(ContainerAnvilRepair container, IInventory inventory, int index, int x, int y) { @@ -271,25 +283,12 @@ public class ContainerAnvilRepair extends Container { this.container = container; } - public boolean preEvent(EntityPlayer player) { - preChecked = true; - if (!container.worldObj.isRemote) { - RecipeAnvil recipe = container.currentRecipe; - if (recipe != null) { - ItemStack[] items = new ItemStack[]{ - container.anvilMatrix.getStackInRowAndColumn(0, 0), - container.anvilMatrix.getStackInRowAndColumn(1, 0) - }; - canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); - if (!canPickup) { - container.updateRepairResult(); - preChecked = false; // reset for next attempt - } - } else { - canPickup = true; - } - } - return canPickup; + public void setCanPickup(boolean value) { + this.canPickup = value; + } + + public boolean canPickup() { + return this.canPickup; } @Override @@ -299,31 +298,14 @@ public class ContainerAnvilRepair extends Container { @Override public boolean canTakeStack(EntityPlayer player) { - if (!preChecked) { - preEvent(player); - } return canPickup && player.experienceTotal >= container.repairCost; } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - if (!preChecked) { - if (!preEvent(player)) - return; - } if (!canPickup) { return; } - RecipeAnvil recipe = container.currentRecipe; - ItemStack[] items = new ItemStack[]{ - container.anvilMatrix.getStackInRowAndColumn(0, 0), - container.anvilMatrix.getStackInRowAndColumn(1, 0) - }; - if (!container.worldObj.isRemote && recipe != null) { - container.updateRepairResult(); - stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); - } - if (player.experienceTotal < container.repairCost) { container.updateRepairResult(); return; @@ -353,7 +335,6 @@ public class ContainerAnvilRepair extends Container { } container.repairCost = 0; container.updateRepairResult(); - preChecked = false; canPickup = true; super.onPickupFromSlot(player, stack); } diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 8183b467b..50b20fea7 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -9,6 +9,7 @@ import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.EventHooks; +import noppes.npcs.scripted.event.RecipeScriptEvent; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; @@ -22,6 +23,7 @@ public class ContainerCarpentryBench extends Container { private int posZ; private RecipeCarpentry currentRecipe; + private SlotCarpentryResult resultSlot; public ContainerCarpentryBench(InventoryPlayer par1InventoryPlayer, World par2World, int par3, int par4, int par5) { this.worldObj = par2World; @@ -29,7 +31,8 @@ public class ContainerCarpentryBench extends Container { this.posY = par4; this.posZ = par5; this.player = par1InventoryPlayer.player; - this.addSlotToContainer(new SlotCarpentryResult(this, par1InventoryPlayer.player, this.craftMatrix, this.craftResult, 0, 133, 41)); + this.resultSlot = new SlotCarpentryResult(this, par1InventoryPlayer.player, this.craftMatrix, this.craftResult, 0, 133, 41); + this.addSlotToContainer(this.resultSlot); int var6; int var7; @@ -66,11 +69,24 @@ public class ContainerCarpentryBench extends Container { this.currentRecipe = recipe; ItemStack item = null; + boolean canPickup = true; if (recipe != null && recipe.availability.isAvailable(player)) { item = recipe.getCraftingResult(this.craftMatrix); + + ItemStack[] items = new ItemStack[this.craftMatrix.getSizeInventory()]; + for (int i = 0; i < items.length; i++) { + items[i] = this.craftMatrix.getStackInSlot(i); + } + + RecipeScriptEvent.Pre pre = EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); + canPickup = !pre.isCanceled(); + item = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, item); } this.craftResult.setInventorySlotContents(0, item); + if (this.resultSlot != null) { + this.resultSlot.setCanPickup(canPickup); + } EntityPlayerMP plmp = (EntityPlayerMP) player; plmp.playerNetServerHandler.sendPacket(new S2FPacketSetSlot(this.windowId, 0, item)); } @@ -113,7 +129,7 @@ public class ContainerCarpentryBench extends Container { if (par1 == 0) { SlotCarpentryResult resultSlot = (SlotCarpentryResult) var3; - if (!resultSlot.preEvent(par1EntityPlayer)) { + if (!resultSlot.canPickup()) { return null; } if (!this.mergeItemStack(var4, 17, 53, true)) { @@ -162,65 +178,30 @@ public class ContainerCarpentryBench extends Container { // Custom result slot to handle recipe scripts private class SlotCarpentryResult extends SlotCrafting { private final ContainerCarpentryBench container; - private final InventoryCrafting matrix; - private boolean preChecked = false; private boolean canPickup = true; public SlotCarpentryResult(ContainerCarpentryBench container, EntityPlayer player, InventoryCrafting matrix, IInventory result, int index, int x, int y) { super(player, matrix, result, index, x, y); this.container = container; - this.matrix = matrix; } - public boolean preEvent(EntityPlayer player) { - preChecked = true; - if (!container.worldObj.isRemote) { - RecipeCarpentry recipe = container.currentRecipe; - if (recipe != null) { - ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; - for (int i = 0; i < items.length; i++) { - items[i] = matrix.getStackInSlot(i); - } - canPickup = !EventHooks.onRecipeScriptPre(player, recipe.getScriptHandler(), recipe, items); - if (!canPickup) { - container.onCraftMatrixChanged(matrix); - preChecked = false; // reset for next attempt - } - } else { - canPickup = true; - } - } - return canPickup; + public void setCanPickup(boolean value) { + this.canPickup = value; + } + + public boolean canPickup() { + return this.canPickup; } @Override public boolean canTakeStack(EntityPlayer player) { - if (!preChecked) { - preEvent(player); - } return canPickup && super.canTakeStack(player); } @Override public void onPickupFromSlot(EntityPlayer player, ItemStack stack) { - if (!preChecked) { - if (!preEvent(player)) - return; - } if (!canPickup) return; - if (!container.worldObj.isRemote) { - RecipeCarpentry recipe = container.currentRecipe; - if (recipe != null) { - ItemStack[] items = new ItemStack[matrix.getSizeInventory()]; - for (int i = 0; i < items.length; i++) { - items[i] = matrix.getStackInSlot(i); - } - stack = EventHooks.onRecipeScriptPost(player, recipe.getScriptHandler(), recipe, items, stack); - } - } - preChecked = false; - canPickup = true; super.onPickupFromSlot(player, stack); } } diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java index 745da129f..9241cb58c 100644 --- a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -35,9 +35,20 @@ public class RecipeScriptEvent extends PlayerEvent { @Cancelable public static class Pre extends RecipeScriptEvent { + private String message = ""; + public Pre(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items) { super(player, recipe, isAnvil, items); } + + public void setMessage(String message) { + this.message = message == null ? "" : message; + } + + public String getMessage() { + return message; + } + public String getHookName() { return RecipeScript.ScriptType.PRE.function; } From 1585aa8e550b3e3fa75ad2bffd3ad5031cba3c94 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 18:34:38 -0400 Subject: [PATCH 126/154] Sync recipe result pickup flag --- .../npcs/containers/ContainerAnvilRepair.java | 6 +++++ .../containers/ContainerCarpentryBench.java | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 7aa00aedb..042f8d573 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -29,6 +29,7 @@ public class ContainerAnvilRepair extends Container { private RecipeAnvil currentRecipe; private SlotAnvilOutput resultSlot; + private boolean resultCanPickup = true; public ContainerAnvilRepair(InventoryPlayer playerInv, World world, int x, int y, int z) { this.worldObj = world; @@ -172,6 +173,7 @@ public class ContainerAnvilRepair extends Container { } anvilResult.setInventorySlotContents(0, output); + this.resultCanPickup = canPickup; if (this.resultSlot != null) { this.resultSlot.setCanPickup(canPickup); } @@ -184,6 +186,7 @@ public class ContainerAnvilRepair extends Container { public void addCraftingToCrafters(ICrafting listener) { super.addCraftingToCrafters(listener); listener.sendProgressBarUpdate(this, 0, this.repairCost); + listener.sendProgressBarUpdate(this, 1, this.resultCanPickup ? 1 : 0); } @Override @@ -191,6 +194,7 @@ public class ContainerAnvilRepair extends Container { super.detectAndSendChanges(); for (Object crafterObj : this.crafters) { ((ICrafting) crafterObj).sendProgressBarUpdate(this, 0, this.repairCost); + ((ICrafting) crafterObj).sendProgressBarUpdate(this, 1, this.resultCanPickup ? 1 : 0); } } @@ -198,6 +202,8 @@ public class ContainerAnvilRepair extends Container { public void updateProgressBar(int id, int data) { if (id == 0) { this.repairCost = data; + } else if (id == 1 && this.resultSlot != null) { + this.resultSlot.setCanPickup(data != 0); } } // --- End Sync Methods --- diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 50b20fea7..43511ae77 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -24,6 +24,7 @@ public class ContainerCarpentryBench extends Container { private RecipeCarpentry currentRecipe; private SlotCarpentryResult resultSlot; + private boolean resultCanPickup = true; public ContainerCarpentryBench(InventoryPlayer par1InventoryPlayer, World par2World, int par3, int par4, int par5) { this.worldObj = par2World; @@ -84,6 +85,7 @@ public class ContainerCarpentryBench extends Container { } this.craftResult.setInventorySlotContents(0, item); + this.resultCanPickup = canPickup; if (this.resultSlot != null) { this.resultSlot.setCanPickup(canPickup); } @@ -175,6 +177,29 @@ public class ContainerCarpentryBench extends Container { return slotIn.inventory != this.craftResult && super.func_94530_a(stack, slotIn); } + // --- Sync Methods --- + @Override + public void addCraftingToCrafters(ICrafting listener) { + super.addCraftingToCrafters(listener); + listener.sendProgressBarUpdate(this, 0, this.resultCanPickup ? 1 : 0); + } + + @Override + public void detectAndSendChanges() { + super.detectAndSendChanges(); + for (Object crafterObj : this.crafters) { + ((ICrafting) crafterObj).sendProgressBarUpdate(this, 0, this.resultCanPickup ? 1 : 0); + } + } + + @Override + public void updateProgressBar(int id, int data) { + if (id == 0 && this.resultSlot != null) { + this.resultSlot.setCanPickup(data != 0); + } + } + // --- End Sync Methods --- + // Custom result slot to handle recipe scripts private class SlotCarpentryResult extends SlotCrafting { private final ContainerCarpentryBench container; From 62e11d8caa5e06ea6e8f71433517c543226f5edc Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 21:35:27 -0400 Subject: [PATCH 127/154] Show recipe banner with overlay --- src/main/java/noppes/npcs/EventHooks.java | 18 ++++++++++++++++-- .../npcs/client/gui/player/GuiNpcAnvil.java | 11 +++++++++++ .../gui/player/GuiNpcCarpentryBench.java | 11 +++++++++++ .../npcs/containers/ContainerAnvilRepair.java | 7 +++++++ .../containers/ContainerCarpentryBench.java | 7 +++++++ 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index b12a60e48..8191ddc7f 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -35,12 +35,19 @@ import noppes.npcs.scripted.event.*; import noppes.npcs.scripted.event.player.*; import noppes.npcs.scripted.event.player.PlayerEvent.*; import noppes.npcs.scripted.item.ScriptItemStack; -import kamkeel.npcs.network.packets.data.AchievementPacket; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.scripted.overlay.ScriptOverlay; +import noppes.npcs.scripted.overlay.ScriptOverlayLabel; +import noppes.npcs.NoppesUtilServer; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; public class EventHooks { + // Overlay id used for recipe pre-event banner messages + public static final int RECIPE_OVERLAY_ID = 901; public EventHooks() { } @@ -181,7 +188,14 @@ public class EventHooks { if (!player.worldObj.isRemote) { String msg = event.getMessage(); if (msg == null) msg = ""; - AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "", msg); + if (!msg.isEmpty()) { + ScriptOverlay overlay = new ScriptOverlay(RECIPE_OVERLAY_ID); + ScriptOverlayLabel lbl = (ScriptOverlayLabel) overlay.addLabel(0, msg, 0, 5, 200, 20); + lbl.setAlignment(1); + CustomGuiController.openOverlay(NoppesUtilServer.getIPlayer(player), overlay); + } else { + PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(RECIPE_OVERLAY_ID), (EntityPlayerMP) player); + } } return event; } diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java index 7ef23a9a1..e98b8d280 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcAnvil.java @@ -46,6 +46,9 @@ public class GuiNpcAnvil extends GuiContainerNPCInterface { int i1 = (height - ySize) / 2; drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(partialTicks, mouseX, mouseY); + if (!container.canPickupResult()) { + drawRedSlotOutline(guiLeft + 133, guiTop + 47); + } // Draw title and player's inventory label. fontRendererObj.drawString(StatCollector.translateToLocal("tile.anvil.name"), guiLeft + 4, guiTop + 4, CustomNpcResourceListener.DefaultTextColor); @@ -74,6 +77,14 @@ public class GuiNpcAnvil extends GuiContainerNPCInterface { fontRendererObj.drawString(status, guiLeft + 5, guiTop + 75, textColor); } + private void drawRedSlotOutline(int x, int y) { + int c = 0xFFFF0000; + drawRect(x - 1, y - 1, x + 17, y, c); + drawRect(x - 1, y + 16, x + 17, y + 17, c); + drawRect(x - 1, y, x, y + 16, c); + drawRect(x + 16, y, x + 17, y + 16, c); + } + @Override public void save() { // Nothing to save. diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java index 6c59de3ca..9087b6b6f 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java @@ -46,10 +46,21 @@ public class GuiNpcCarpentryBench extends GuiContainerNPCInterface { title = StatCollector.translateToLocal("tile.anvil.name"); drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(f, i, j); + if (!container.canPickupResult()) { + drawRedSlotOutline(guiLeft + 133, guiTop + 41); + } fontRendererObj.drawString(title, guiLeft + 4, guiTop + 4, CustomNpcResourceListener.DefaultTextColor); fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), guiLeft + 4, guiTop + 87, CustomNpcResourceListener.DefaultTextColor); } + private void drawRedSlotOutline(int x, int y) { + int c = 0xFFFF0000; + drawRect(x - 1, y - 1, x + 17, y, c); + drawRect(x - 1, y + 16, x + 17, y + 17, c); + drawRect(x - 1, y, x, y + 16, c); + drawRect(x + 16, y, x + 17, y + 16, c); + } + @Override public void save() { return; diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 042f8d573..8685d8cda 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -11,6 +11,8 @@ import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.scripted.event.RecipeScriptEvent; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; public class ContainerAnvilRepair extends Container { // A 2-slot crafting matrix: slot 0 = damaged item, slot 1 = repair material. @@ -212,6 +214,7 @@ public class ContainerAnvilRepair extends Container { public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); if (!this.worldObj.isRemote) { + PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(EventHooks.RECIPE_OVERLAY_ID), (EntityPlayerMP) player); for (int i = 0; i < this.anvilMatrix.getSizeInventory(); i++) { ItemStack stack = this.anvilMatrix.getStackInSlotOnClosing(i); if (stack != null) { @@ -228,6 +231,10 @@ public class ContainerAnvilRepair extends Container { (double) this.posZ + 0.5D) <= 64.0D; } + public boolean canPickupResult() { + return this.resultCanPickup; + } + @Override public ItemStack transferStackInSlot(EntityPlayer player, int index) { ItemStack copy = null; diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 43511ae77..fd6a3ff50 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -9,6 +9,8 @@ import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.EventHooks; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; import noppes.npcs.scripted.event.RecipeScriptEvent; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; @@ -102,6 +104,7 @@ public class ContainerCarpentryBench extends Container { super.onContainerClosed(par1EntityPlayer); if (!this.worldObj.isRemote) { + PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(EventHooks.RECIPE_OVERLAY_ID), (EntityPlayerMP) par1EntityPlayer); for (int var2 = 0; var2 < 16; ++var2) { ItemStack var3 = this.craftMatrix.getStackInSlotOnClosing(var2); @@ -117,6 +120,10 @@ public class ContainerCarpentryBench extends Container { return this.worldObj.getBlock(this.posX, this.posY, this.posZ) != CustomItems.carpentyBench ? false : par1EntityPlayer.getDistanceSq((double) this.posX + 0.5D, (double) this.posY + 0.5D, (double) this.posZ + 0.5D) <= 64.0D; } + public boolean canPickupResult() { + return this.resultCanPickup; + } + /** * Called to transfer a stack from one inventory to the other eg. when shift clicking. */ From d05e28918da513bf8ed63d683ae4d9dc91fd8f90 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 21:35:34 -0400 Subject: [PATCH 128/154] Revert recipe overlay to achievement banner --- src/main/java/noppes/npcs/EventHooks.java | 18 +++--------------- .../npcs/containers/ContainerAnvilRepair.java | 3 --- .../containers/ContainerCarpentryBench.java | 3 --- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index 8191ddc7f..eb54cff84 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -35,19 +35,13 @@ import noppes.npcs.scripted.event.*; import noppes.npcs.scripted.event.player.*; import noppes.npcs.scripted.event.player.PlayerEvent.*; import noppes.npcs.scripted.item.ScriptItemStack; -import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; -import noppes.npcs.NoppesUtilServer; -import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.scripted.overlay.ScriptOverlayLabel; +import kamkeel.npcs.network.packets.data.AchievementPacket; import noppes.npcs.NoppesUtilServer; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; public class EventHooks { - // Overlay id used for recipe pre-event banner messages - public static final int RECIPE_OVERLAY_ID = 901; public EventHooks() { } @@ -187,14 +181,8 @@ public class EventHooks { NpcAPI.EVENT_BUS.post(event); if (!player.worldObj.isRemote) { String msg = event.getMessage(); - if (msg == null) msg = ""; - if (!msg.isEmpty()) { - ScriptOverlay overlay = new ScriptOverlay(RECIPE_OVERLAY_ID); - ScriptOverlayLabel lbl = (ScriptOverlayLabel) overlay.addLabel(0, msg, 0, 5, 200, 20); - lbl.setAlignment(1); - CustomGuiController.openOverlay(NoppesUtilServer.getIPlayer(player), overlay); - } else { - PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(RECIPE_OVERLAY_ID), (EntityPlayerMP) player); + if (msg != null && !msg.isEmpty()) { + AchievementPacket.sendAchievement((EntityPlayerMP) player, false, "", msg); } } return event; diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 8685d8cda..77a8a197f 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -11,8 +11,6 @@ import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.scripted.event.RecipeScriptEvent; -import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; public class ContainerAnvilRepair extends Container { // A 2-slot crafting matrix: slot 0 = damaged item, slot 1 = repair material. @@ -214,7 +212,6 @@ public class ContainerAnvilRepair extends Container { public void onContainerClosed(EntityPlayer player) { super.onContainerClosed(player); if (!this.worldObj.isRemote) { - PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(EventHooks.RECIPE_OVERLAY_ID), (EntityPlayerMP) player); for (int i = 0; i < this.anvilMatrix.getSizeInventory(); i++) { ItemStack stack = this.anvilMatrix.getStackInSlotOnClosing(i); if (stack != null) { diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index fd6a3ff50..6e872cda4 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -9,8 +9,6 @@ import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.EventHooks; -import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; import noppes.npcs.scripted.event.RecipeScriptEvent; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; @@ -104,7 +102,6 @@ public class ContainerCarpentryBench extends Container { super.onContainerClosed(par1EntityPlayer); if (!this.worldObj.isRemote) { - PacketHandler.Instance.sendToPlayer(new ScriptOverlayClosePacket(EventHooks.RECIPE_OVERLAY_ID), (EntityPlayerMP) par1EntityPlayer); for (int var2 = 0; var2 < 16; ++var2) { ItemStack var3 = this.craftMatrix.getStackInSlotOnClosing(var2); From 2cd06193c21377c13b6f8b09020a646db4a680ff Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 22:26:25 -0400 Subject: [PATCH 129/154] Fix Outline --- .../npcs/client/gui/player/GuiNpcCarpentryBench.java | 12 +++++++----- .../npcs/containers/ContainerCarpentryBench.java | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java index 9087b6b6f..f3476528e 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNpcCarpentryBench.java @@ -47,7 +47,7 @@ public class GuiNpcCarpentryBench extends GuiContainerNPCInterface { drawTexturedModalRect(l, i1, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(f, i, j); if (!container.canPickupResult()) { - drawRedSlotOutline(guiLeft + 133, guiTop + 41); + drawRedSlotOutline(guiLeft + 129, guiTop + 37); } fontRendererObj.drawString(title, guiLeft + 4, guiTop + 4, CustomNpcResourceListener.DefaultTextColor); fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), guiLeft + 4, guiTop + 87, CustomNpcResourceListener.DefaultTextColor); @@ -55,10 +55,12 @@ public class GuiNpcCarpentryBench extends GuiContainerNPCInterface { private void drawRedSlotOutline(int x, int y) { int c = 0xFFFF0000; - drawRect(x - 1, y - 1, x + 17, y, c); - drawRect(x - 1, y + 16, x + 17, y + 17, c); - drawRect(x - 1, y, x, y + 16, c); - drawRect(x + 16, y, x + 17, y + 16, c); + int size = 24; + + drawRect(x - 1, y - 1, x + 1 + size, y, c); + drawRect(x - 1, y + size, x + 1 + size, y + 1 + size, c); + drawRect(x - 1, y, x, y + size, c); + drawRect(x + size, y, x + 1 + size, y + size, c); } @Override diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 6e872cda4..59e6a720d 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -200,6 +200,7 @@ public class ContainerCarpentryBench extends Container { public void updateProgressBar(int id, int data) { if (id == 0 && this.resultSlot != null) { this.resultSlot.setCanPickup(data != 0); + resultCanPickup = data != 0; } } // --- End Sync Methods --- From e73e785fbf55c70d7bf1fd5792b544ab566ca5ba Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 9 Jul 2025 22:43:06 -0400 Subject: [PATCH 130/154] feat: allow scripts to modify anvil cost --- .../npcs/containers/ContainerAnvilRepair.java | 21 +++++++++++++------ .../scripted/event/RecipeScriptEvent.java | 20 ++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 77a8a197f..49f284b12 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -120,6 +120,7 @@ public class ContainerAnvilRepair extends Container { ItemStack output = null; boolean canPickup = true; + RecipeScriptEvent.Pre pre = null; if (matchingRecipe != null) { if (!matchingRecipe.availability.isAvailable(player)) { return; @@ -157,20 +158,28 @@ public class ContainerAnvilRepair extends Container { int xpCost = baseXpCost * materialsUsed; calcItem.setItemDamage(currentDamage); + + ItemStack[] items = new ItemStack[]{input0, input1}; + pre = EventHooks.onRecipeScriptPre(player, matchingRecipe.getScriptHandler(), matchingRecipe, items); + int scriptXp = pre.getXpCost(); + int scriptMat = pre.getMaterialUsage(); + xpCost += scriptXp; + materialsUsed += scriptMat; + pre.setXpCost(xpCost); + pre.setMaterialUsage(materialsUsed); + canPickup = !pre.isCanceled(); + if (player.experienceTotal >= xpCost) { output = calcItem; } + repairMaterialConsumed = materialsUsed; repairCost = xpCost; + output = EventHooks.onRecipeScriptPost(player, matchingRecipe.getScriptHandler(), matchingRecipe, items, output); } else { repairCost = 0; } - if (matchingRecipe != null) { - ItemStack[] items = new ItemStack[]{input0, input1}; - RecipeScriptEvent.Pre pre = EventHooks.onRecipeScriptPre(player, matchingRecipe.getScriptHandler(), matchingRecipe, items); - canPickup = !pre.isCanceled(); - output = EventHooks.onRecipeScriptPost(player, matchingRecipe.getScriptHandler(), matchingRecipe, items, output); - } + anvilResult.setInventorySlotContents(0, output); this.resultCanPickup = canPickup; diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java index 9241cb58c..950af113f 100644 --- a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -36,6 +36,8 @@ public class RecipeScriptEvent extends PlayerEvent { @Cancelable public static class Pre extends RecipeScriptEvent { private String message = ""; + private int xpCost = 0; + private int materialUsage = 0; public Pre(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items) { super(player, recipe, isAnvil, items); @@ -49,6 +51,24 @@ public class RecipeScriptEvent extends PlayerEvent { return message; } + public int getXpCost() { + return xpCost; + } + + public void setXpCost(int xpCost) { + if (this.isAnvil) + this.xpCost = xpCost; + } + + public int getMaterialUsage() { + return materialUsage; + } + + public void setMaterialUsage(int materialUsage) { + if (this.isAnvil) + this.materialUsage = materialUsage; + } + public String getHookName() { return RecipeScript.ScriptType.PRE.function; } From b60d6f8eb5df908ca730bb1d9c581d42f07c59ef Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 05:13:11 -0400 Subject: [PATCH 131/154] Fix Logging --- src/main/java/noppes/npcs/config/ConfigDebug.java | 5 +++++ .../noppes/npcs/controllers/data/action/ActionLogger.java | 5 ++++- .../noppes/npcs/controllers/data/action/ActionManager.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/config/ConfigDebug.java b/src/main/java/noppes/npcs/config/ConfigDebug.java index addc10a6d..1934f7969 100644 --- a/src/main/java/noppes/npcs/config/ConfigDebug.java +++ b/src/main/java/noppes/npcs/config/ConfigDebug.java @@ -33,6 +33,8 @@ public class ConfigDebug { public static Property ScriptLogIgnoreTypeProperty; public static String ScriptLogIgnoreType = "TICK"; + public static boolean LogActionManager = false; + public static void init(File configFile) { config = new Configuration(configFile); @@ -59,6 +61,9 @@ public class ConfigDebug { "INIT,TICK,INTERACT,DIALOG,DAMAGED,KILLED,ATTACK,TARGET,COLLIDE,KILLS,DIALOG_CLOSE,TIMER"); ScriptLogIgnoreType = ScriptLogIgnoreTypeProperty.getString(); + LogActionManager = config.get(LOGGING, "Log Action Manager", LogActionManager, "Log the Performance of the Action Manager").getBoolean(LogActionManager); + + // Convert to Legacy if (CustomNpcs.legacyExist) { PlayerLogging = LegacyConfig.PlayerLogging; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java index fc24c79e8..11a9b3344 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -3,6 +3,8 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.LogWriter; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.config.ConfigScript; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -136,7 +138,8 @@ public class ActionLogger { private static final String ANSI_RESET = "\u001B[0m"; public void println(String str) { - System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); + if(ConfigDebug.LogActionManager) + System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); } // public ActionLogger beginTick1(ActionManager manager) { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index f4b7fc430..0b62ddce0 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -35,7 +35,7 @@ public class ActionManager implements IActionManager { protected final ActionQueue conditionalQueue = new ActionQueue(this, "mainConditional", true); protected final Map otherQueues = new HashMap<>(); - protected boolean debug; + protected boolean debug = false; protected ScriptContainer reportTo; public ActionManager() {} From 74e8289cad283e708627a87d15e568eb49916e2b Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 05:41:59 -0400 Subject: [PATCH 132/154] Update README with additional features --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index c4634d53e..001657d95 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,15 @@ This mod is an ***update*** to CustomNPC and not an add-on. Do not install Custo - Markov Name Generator - Dark Mode GUI (Link Below) - 1.12 Scripting Features (Details below) +- Profile System (Multiple Character Slots) +- Quest Party System +- Item and Armor Attributes +- Magic System with Elemental Cycles +- Custom Effect Engine +- Scripted Blocks & Particles +- Compass Marks for Waypoints +- Custom Model Support +- Gecko & Dragon Block C Addons #### Scripting: - CustomNPC+ Api: [API](https://github.com/KAMKEEL/CustomNPC-Plus-API) From 540508a2be3c570f5c6c5883e5ae2fadb2055f8e Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 05:43:50 -0400 Subject: [PATCH 133/154] Fix memory leaks by closing streams --- .../client/CustomNpcResourceListener.java | 30 ++++++++++--------- .../noppes/npcs/client/ImageDownloadAlt.java | 8 +++-- .../client/controllers/PresetController.java | 8 +++-- .../gui/custom/components/CustomGuiLabel.java | 7 ++--- .../components/CustomOverlayLabel.java | 7 ++--- .../noppes/npcs/client/model/ModelPony.java | 11 +++---- .../npcs/client/renderer/ImageData.java | 5 ++-- .../npcs/client/renderer/RenderNPCPony.java | 11 +++---- .../java/noppes/npcs/config/GlyphCache.java | 22 +++++++------- .../npcs/controllers/BankController.java | 4 ++- .../npcs/controllers/DialogController.java | 5 +++- .../controllers/GlobalDataController.java | 5 +++- .../controllers/PlayerDataController.java | 9 ++++-- .../npcs/controllers/QuestController.java | 5 +++- .../npcs/controllers/RecipeController.java | 5 +++- .../controllers/ServerCloneController.java | 5 +++- .../npcs/controllers/TransportController.java | 5 +++- .../java/noppes/npcs/util/NBTJsonUtil.java | 4 +-- 18 files changed, 96 insertions(+), 60 deletions(-) diff --git a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java index 8aeeff628..28cbd81de 100644 --- a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java +++ b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java @@ -59,21 +59,23 @@ public class CustomNpcResourceListener implements try { IResourceManager manager = Minecraft.getMinecraft().getResourceManager(); ResourceLocation location = new ResourceLocation("textures/blocks/" + texture + ".png"); - BufferedImage bufferedimage = ImageIO.read(manager.getResource(location).getInputStream()); - int i = bufferedimage.getWidth(); - int j = bufferedimage.getHeight(); + try (InputStream stream = manager.getResource(location).getInputStream()) { + BufferedImage bufferedimage = ImageIO.read(stream); + int i = bufferedimage.getWidth(); + int j = bufferedimage.getHeight(); - BufferedImage image = new BufferedImage(i * 4, j * 2, BufferedImage.TYPE_INT_RGB); - Graphics g = image.getGraphics(); - g.drawImage(bufferedimage, 0, 0, null); - g.drawImage(bufferedimage, i, 0, null); - g.drawImage(bufferedimage, i * 2, 0, null); - g.drawImage(bufferedimage, i * 3, 0, null); - g.drawImage(bufferedimage, 0, i, null); - g.drawImage(bufferedimage, i, j, null); - g.drawImage(bufferedimage, i * 2, j, null); - g.drawImage(bufferedimage, i * 3, j, null); - ImageIO.write(image, "png", new File(dir, texture + ".png")); + BufferedImage image = new BufferedImage(i * 4, j * 2, BufferedImage.TYPE_INT_RGB); + Graphics g = image.getGraphics(); + g.drawImage(bufferedimage, 0, 0, null); + g.drawImage(bufferedimage, i, 0, null); + g.drawImage(bufferedimage, i * 2, 0, null); + g.drawImage(bufferedimage, i * 3, 0, null); + g.drawImage(bufferedimage, 0, i, null); + g.drawImage(bufferedimage, i, j, null); + g.drawImage(bufferedimage, i * 2, j, null); + g.drawImage(bufferedimage, i * 3, j, null); + ImageIO.write(image, "png", new File(dir, texture + ".png")); + } } catch (Exception e) { LogWriter.error("Failed caching texture: " + texture, e); } diff --git a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java index 003e05159..611a43fe2 100644 --- a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java @@ -122,10 +122,14 @@ public class ImageDownloadAlt extends SimpleTexture { BufferedImage bufferedimage; if (ImageDownloadAlt.this.cacheFile != null) { - FileUtils.copyInputStreamToFile(connection.getInputStream(), ImageDownloadAlt.this.cacheFile); + try (InputStream in = connection.getInputStream()) { + FileUtils.copyInputStreamToFile(in, ImageDownloadAlt.this.cacheFile); + } bufferedimage = ImageIO.read(ImageDownloadAlt.this.cacheFile); } else { - bufferedimage = ImageIO.read(connection.getInputStream()); + try (InputStream in = connection.getInputStream()) { + bufferedimage = ImageIO.read(in); + } } if (ImageDownloadAlt.this.imageBuffer != null) { diff --git a/src/main/java/noppes/npcs/client/controllers/PresetController.java b/src/main/java/noppes/npcs/client/controllers/PresetController.java index 2e9d8605e..0f4074bb5 100644 --- a/src/main/java/noppes/npcs/client/controllers/PresetController.java +++ b/src/main/java/noppes/npcs/client/controllers/PresetController.java @@ -52,7 +52,9 @@ public class PresetController { if (!file.exists()) { return null; } - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); + } } catch (Exception e) { LogWriter.except(e); } @@ -61,7 +63,9 @@ public class PresetController { if (!file.exists()) { return null; } - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); + } } catch (Exception e) { LogWriter.except(e); diff --git a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java index daa1a98e0..106dcc124 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java +++ b/src/main/java/noppes/npcs/client/gui/custom/components/CustomGuiLabel.java @@ -461,8 +461,8 @@ public class CustomGuiLabel extends Gui implements IGuiComponent { private void readFontTexture() { BufferedImage bufferedimage; - try { - bufferedimage = ImageIO.read(getResourceInputStream(this.locationFontTexture)); + try (InputStream stream = getResourceInputStream(this.locationFontTexture)) { + bufferedimage = ImageIO.read(stream); } catch (IOException ioexception) { throw new RuntimeException(ioexception); } @@ -515,8 +515,7 @@ public class CustomGuiLabel extends Gui implements IGuiComponent { } private void readGlyphSizes() { - try { - InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); + try (InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"))) { inputstream.read(this.glyphWidth); } catch (IOException ioexception) { throw new RuntimeException(ioexception); diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java index f5b97457b..507716abd 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/components/CustomOverlayLabel.java @@ -400,8 +400,8 @@ public class CustomOverlayLabel extends Gui implements IOverlayComponent { private void readFontTexture() { BufferedImage bufferedimage; - try { - bufferedimage = ImageIO.read(getResourceInputStream(this.locationFontTexture)); + try (InputStream stream = getResourceInputStream(this.locationFontTexture)) { + bufferedimage = ImageIO.read(stream); } catch (IOException ioexception) { throw new RuntimeException(ioexception); } @@ -454,8 +454,7 @@ public class CustomOverlayLabel extends Gui implements IOverlayComponent { } private void readGlyphSizes() { - try { - InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin")); + try (InputStream inputstream = getResourceInputStream(new ResourceLocation("font/glyph_sizes.bin"))) { inputstream.read(this.glyphWidth); } catch (IOException ioexception) { throw new RuntimeException(ioexception); diff --git a/src/main/java/noppes/npcs/client/model/ModelPony.java b/src/main/java/noppes/npcs/client/model/ModelPony.java index 57e47f8bc..0babe5f74 100644 --- a/src/main/java/noppes/npcs/client/model/ModelPony.java +++ b/src/main/java/noppes/npcs/client/model/ModelPony.java @@ -756,11 +756,12 @@ public class ModelPony extends ModelBase { if (pony.textureLocation != pony.checked && pony.textureLocation != null) { try { IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(pony.textureLocation); - BufferedImage bufferedimage = ImageIO.read(resource.getInputStream()); + try (InputStream stream = resource.getInputStream()) { + BufferedImage bufferedimage = ImageIO.read(stream); - pony.isPegasus = false; - pony.isUnicorn = false; - Color color = new Color(bufferedimage.getRGB(0, 0), true); + pony.isPegasus = false; + pony.isUnicorn = false; + Color color = new Color(bufferedimage.getRGB(0, 0), true); Color color1 = new Color(249, 177, 49, 255); Color color2 = new Color(136, 202, 240, 255); Color color3 = new Color(209, 159, 228, 255); @@ -778,7 +779,7 @@ public class ModelPony extends ModelBase { pony.isUnicorn = true; } pony.checked = pony.textureLocation; - + } } catch (IOException e) { } diff --git a/src/main/java/noppes/npcs/client/renderer/ImageData.java b/src/main/java/noppes/npcs/client/renderer/ImageData.java index a9afad5c8..15c383e40 100644 --- a/src/main/java/noppes/npcs/client/renderer/ImageData.java +++ b/src/main/java/noppes/npcs/client/renderer/ImageData.java @@ -93,8 +93,9 @@ public class ImageData { if (!this.isUrl) { try { IResource iresource = Minecraft.getMinecraft().getResourceManager().getResource(location); - InputStream inputstream = iresource.getInputStream(); - this.bufferedImage = ImageIO.read(inputstream); + try (InputStream inputstream = iresource.getInputStream()) { + this.bufferedImage = ImageIO.read(inputstream); + } } catch (IOException ignored) { } } else { diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index c7761e380..fffd786ac 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -93,10 +93,11 @@ public class RenderNPCPony extends RenderNPCInterface { if (check) { try { IResource resource = Minecraft.getMinecraft().getResourceManager().getResource(loc); - BufferedImage bufferedimage = ImageIO.read(resource.getInputStream()); + try (InputStream stream = resource.getInputStream()) { + BufferedImage bufferedimage = ImageIO.read(stream); - pony.isPegasus = false; - pony.isUnicorn = false; + pony.isPegasus = false; + pony.isUnicorn = false; Color color = new Color(bufferedimage.getRGB(0, 0), true); Color color1 = new Color(249, 177, 49, 255); Color color2 = new Color(136, 202, 240, 255); @@ -114,8 +115,8 @@ public class RenderNPCPony extends RenderNPCInterface { pony.isPegasus = true; pony.isUnicorn = true; } - pony.checked = loc; - + pony.checked = loc; + } } catch (IOException e) { } diff --git a/src/main/java/noppes/npcs/config/GlyphCache.java b/src/main/java/noppes/npcs/config/GlyphCache.java index fc4922be9..a62e4154d 100644 --- a/src/main/java/noppes/npcs/config/GlyphCache.java +++ b/src/main/java/noppes/npcs/config/GlyphCache.java @@ -253,19 +253,19 @@ public class GlyphCache { } void setCustomFont(ResourceLocation location, int size, boolean antiAlias) throws Exception { - InputStream stream = Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream(); + try (InputStream stream = Minecraft.getMinecraft().getResourceManager().getResource(location).getInputStream()) { + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + Font font = Font.createFont(Font.TRUETYPE_FONT, stream); + ge.registerFont(font); + font = font.deriveFont(Font.PLAIN, 72); - GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); - Font font = Font.createFont(Font.TRUETYPE_FONT, stream); - ge.registerFont(font); - font = font.deriveFont(Font.PLAIN, 72); + usedFonts.clear(); + usedFonts.add(font); - usedFonts.clear(); - usedFonts.add(font); - - fontSize = size; - antiAliasEnabled = antiAlias; - setRenderingHints(); + fontSize = size; + antiAliasEnabled = antiAlias; + setRenderingHints(); + } } int fontHeight(String s) { diff --git a/src/main/java/noppes/npcs/controllers/BankController.java b/src/main/java/noppes/npcs/controllers/BankController.java index ddc258859..8c1aa67ce 100644 --- a/src/main/java/noppes/npcs/controllers/BankController.java +++ b/src/main/java/noppes/npcs/controllers/BankController.java @@ -79,7 +79,9 @@ public class BankController { } private void loadBanks(File file) throws IOException { - loadBanks(CompressedStreamTools.readCompressed(new FileInputStream(file))); + try (FileInputStream fis = new FileInputStream(file)) { + loadBanks(CompressedStreamTools.readCompressed(fis)); + } } public void loadBanks(NBTTagCompound nbttagcompound1) throws IOException { diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 3faf29b62..456f74335 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -120,7 +120,10 @@ public class DialogController implements IDialogHandler { if (!dir.exists()) { dir.mkdir(); } - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } NBTTagList list = nbttagcompound1.getTagList("Data", 10); if (list == null) return; diff --git a/src/main/java/noppes/npcs/controllers/GlobalDataController.java b/src/main/java/noppes/npcs/controllers/GlobalDataController.java index 49a5c2e9b..b518bfaa0 100644 --- a/src/main/java/noppes/npcs/controllers/GlobalDataController.java +++ b/src/main/java/noppes/npcs/controllers/GlobalDataController.java @@ -40,7 +40,10 @@ public class GlobalDataController { } private void loadData(File file) throws Exception { - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } itemGiverId = nbttagcompound1.getInteger("itemGiverId"); } diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index e5649a379..c779b8a95 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -184,7 +184,10 @@ public class PlayerDataController { try { File file = new File(saveDir, filename); if (file.exists()) { - NBTTagCompound comp = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound comp; + try (FileInputStream fis = new FileInputStream(file)) { + comp = CompressedStreamTools.readCompressed(fis); + } file.delete(); file = new File(saveDir, filename + "_old"); if (file.exists()) @@ -197,7 +200,9 @@ public class PlayerDataController { try { File file = new File(saveDir, filename + "_old"); if (file.exists()) { - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); + } } } catch (Exception e) { diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 5987b3a44..8fd507ac7 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -112,7 +112,10 @@ public class QuestController implements IQuestHandler { if (!dir.exists()) { dir.mkdir(); } - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } lastUsedCatID = nbttagcompound1.getInteger("lastID"); lastUsedQuestID = nbttagcompound1.getInteger("lastQuestID"); NBTTagList list = nbttagcompound1.getTagList("Data", 10); diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index 33a3a31d8..28b67ddeb 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -94,7 +94,10 @@ public class RecipeController implements IRecipeHandler { } private void loadCategories(File file) throws Exception { - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } nextId = nbttagcompound1.getInteger("LastId"); nextAnvilId = nbttagcompound1.getInteger("LastAnvilId"); NBTTagList list = nbttagcompound1.getTagList("Data", 10); diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index 95c932943..da58101cc 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -63,7 +63,10 @@ public class ServerCloneController implements ICloneHandler { private Map> loadOldClones(File file) throws Exception { Map> clones = new HashMap>(); - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } NBTTagList list = nbttagcompound1.getTagList("Data", 10); if (list == null) { return clones; diff --git a/src/main/java/noppes/npcs/controllers/TransportController.java b/src/main/java/noppes/npcs/controllers/TransportController.java index bebcb09cb..d7fa6fa57 100644 --- a/src/main/java/noppes/npcs/controllers/TransportController.java +++ b/src/main/java/noppes/npcs/controllers/TransportController.java @@ -66,7 +66,10 @@ public class TransportController implements ITransportHandler { public void loadCategories(File file) throws IOException { HashMap locations = new HashMap(); HashMap categories = new HashMap(); - NBTTagCompound nbttagcompound1 = CompressedStreamTools.readCompressed(new FileInputStream(file)); + NBTTagCompound nbttagcompound1; + try (FileInputStream fis = new FileInputStream(file)) { + nbttagcompound1 = CompressedStreamTools.readCompressed(fis); + } lastUsedID = nbttagcompound1.getInteger("lastID"); NBTTagList list = nbttagcompound1.getTagList("NPCTransportCategories", 10); if (list == null) { diff --git a/src/main/java/noppes/npcs/util/NBTJsonUtil.java b/src/main/java/noppes/npcs/util/NBTJsonUtil.java index f1696bb56..94f8756e2 100644 --- a/src/main/java/noppes/npcs/util/NBTJsonUtil.java +++ b/src/main/java/noppes/npcs/util/NBTJsonUtil.java @@ -213,8 +213,8 @@ public class NBTJsonUtil { } public static NBTTagCompound loadNBTData(File file) { - try { - return CompressedStreamTools.readCompressed(new FileInputStream(file)); + try (FileInputStream fis = new FileInputStream(file)) { + return CompressedStreamTools.readCompressed(fis); } catch (Exception e) { LogWriter.error("Error loading: " + file.getName(), e); } From 297b19b2e5f2408a79ca176dfc91f7b90f893520 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 05:46:24 -0400 Subject: [PATCH 134/154] fix: prevent bard song duplication --- .../npcs/client/controllers/MusicController.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/noppes/npcs/client/controllers/MusicController.java b/src/main/java/noppes/npcs/client/controllers/MusicController.java index e3a2213b8..fc2d9369b 100644 --- a/src/main/java/noppes/npcs/client/controllers/MusicController.java +++ b/src/main/java/noppes/npcs/client/controllers/MusicController.java @@ -56,16 +56,22 @@ public class MusicController { public void stopMusic() { SoundHandler soundHandler = Minecraft.getMinecraft().getSoundHandler(); - if (soundHandler != null) { + if (this.playingSound != null) { + if (soundHandler != null) { + try { + soundHandler.stopSound(this.playingSound); + } catch (Exception ignored) { + } + } + this.playingSound.stopSound(); + this.sounds.remove(this.playingSound.sound); + this.playingSound = null; + } else if (soundHandler != null) { try { soundHandler.stopSounds(); } catch (Exception ignored) { } } - if (this.playingSound != null) { - this.playingSound.stopSound(); - this.playingSound = null; - } } public void playMusicJukebox(String music, Entity entity, int offRange) { From 7d0b44d6384fa5c916c462f30a0c30fd8f1338fc Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 13:52:48 -0400 Subject: [PATCH 135/154] fix StringIndexOutOfBounds in GuiScriptTextArea --- .../java/noppes/npcs/client/gui/util/GuiScriptTextArea.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 205351715..5b8fe32c7 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -91,7 +91,8 @@ public class GuiScriptTextArea extends GuiNpcTextField { scrolledLine = Math.min(Math.max((int) (1f * diff * (yMouse - y) / height), 0), diff); } int startBracket = 0, endBracket = 0; - if (endSelection - startSelection == 1 || startSelection == endSelection && startSelection < text.length()) { + if (startSelection >= 0 && startSelection < text.length() && + (endSelection - startSelection == 1 || startSelection == endSelection)) { char c = text.charAt(startSelection); int found = 0; if (c == '{') { From cae3d4ca2b26347445dc6ca21ee99c8ac32b0ac8 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 14:04:03 -0400 Subject: [PATCH 136/154] Fix Player Data Remove --- .../playerdata/PlayerDataRemovePacket.java | 17 +---------------- src/main/java/noppes/npcs/NoppesUtilServer.java | 4 ++++ .../gui/global/GuiNpcManagePlayerData.java | 10 ++++++---- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java index fbe8c7991..59c07f110 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java @@ -24,22 +24,12 @@ public final class PlayerDataRemovePacket extends AbstractPacket { private EnumPlayerData playerData; private String name; - private int type; - private String selected; - public PlayerDataRemovePacket() { } - public PlayerDataRemovePacket(EnumPlayerData playerData, String name, String selected) { + public PlayerDataRemovePacket(EnumPlayerData playerData, String name) { this.playerData = playerData; this.name = name; - this.selected = selected; - } - - public PlayerDataRemovePacket(EnumPlayerData playerData, String name, int selectedType) { - this.playerData = playerData; - this.name = name; - this.type = selectedType; } @Override @@ -62,11 +52,6 @@ public final class PlayerDataRemovePacket extends AbstractPacket { public void sendData(ByteBuf out) throws IOException { out.writeInt(playerData.ordinal()); ByteBufUtils.writeString(out, this.name); - if (playerData == EnumPlayerData.Players) { - ByteBufUtils.writeString(out, this.selected); - } else { - out.writeInt(this.type); - } } @Override diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index 98c01d373..f538d4afd 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -544,7 +544,11 @@ public class NoppesUtilServer { PlayerDataController.Instance.nameUUIDs.remove(name); PlayerDataController.Instance.savePlayerDataMap(); + int currentSlot = playerdata.profileSlot; + playerdata.setNBT(new NBTTagCompound()); + playerdata.profileSlot = currentSlot; + sendPlayerData(type, player, name); playerdata.save(); return; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java index e66019bbd..a30838249 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java @@ -115,10 +115,12 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo public void confirmClicked(boolean confirm, int id) { if (confirm) { if (id == 0) { - PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer, null)); - playerData.remove(selectedPlayer); - selectedPlayer = null; - playerScroll.setList(getSearchList()); + if(selectedPlayer != null && !selectedPlayer.isEmpty()){ + PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer)); + playerData.remove(selectedPlayer); + selectedPlayer = null; + playerScroll.setList(getSearchList()); + } } if (id == 1) { PacketClient.sendClient(new PlayerDataMapRegenPacket()); From 4300db8f78e281697dce3c37172c7576b824888d Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 14:08:14 -0400 Subject: [PATCH 137/154] Fix flyGravity zero not preventing falling --- src/main/java/noppes/npcs/entity/EntityNPCFlying.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java index fde3a2561..d8d78b81e 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java @@ -35,6 +35,14 @@ public abstract class EntityNPCFlying extends EntityNPCInterface { return false; } + @Override + public void onLivingUpdate() { + super.onLivingUpdate(); + if (this.canFly() && this.getNavigator().noPath()) { + this.motionY = -Math.abs(this.ais.flyGravity); + } + } + public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_) { if (!this.canFly() || this.hurtTime != 0 || !this.canBreathe()) { super.moveEntityWithHeading(p_70612_1_, p_70612_2_); From 61dc0567356fc4cdebb549fac5117355ac3e1e19 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 14:17:21 -0400 Subject: [PATCH 138/154] Fix some Render handling --- src/main/java/noppes/npcs/client/CustomNpcResourceListener.java | 1 + src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java index 28cbd81de..132805af1 100644 --- a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java +++ b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java @@ -14,6 +14,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; +import java.io.InputStream; public class CustomNpcResourceListener implements IResourceManagerReloadListener { diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index fffd786ac..ab847d0e5 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -24,6 +24,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; public class RenderNPCPony extends RenderNPCInterface { From 9c541999f3afdc35a6bc7d6fa8f3d06540a996a6 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 14:22:52 -0400 Subject: [PATCH 139/154] Optimize Imports --- src/main/java/foxz/command/CmdNoppes.java | 7 +- .../commandhelper/AbstractCommandHelper.java | 6 +- .../commandhelper/annotations/SubCommand.java | 6 +- .../kamkeel/npcs/command/CloneCommand.java | 4 +- .../kamkeel/npcs/command/CommandKamkeel.java | 6 +- .../kamkeel/npcs/command/EffectCommand.java | 7 +- .../kamkeel/npcs/command/SlayCommand.java | 6 +- .../command/profile/CommandProfileAdmin.java | 4 +- .../command/profile/CommandProfileRegion.java | 4 +- .../npcs/controllers/ProfileController.java | 34 ++- .../npcs/controllers/SyncController.java | 21 +- .../types/SoulbindRequirement.java | 2 +- .../kamkeel/npcs/network/PacketHandler.java | 199 ++++++++++++++++-- .../packets/player/MailActionPacket.java | 6 +- .../customgui/CustomGuiClosePacket.java | 1 - .../player/item/MagicCyclesPacket.java | 6 +- .../network/packets/request/MountPacket.java | 6 +- .../request/clone/MobSpawnerPacket.java | 6 +- .../packets/request/clone/SpawnMobPacket.java | 6 +- .../request/dialog/DialogGetPacket.java | 6 +- .../request/faction/FactionGetPacket.java | 6 +- .../packets/request/jobs/JobSavePacket.java | 6 +- .../request/linked/LinkedGetAllPacket.java | 6 +- .../request/linked/LinkedGetPacket.java | 6 +- .../packets/request/magic/MagicGetPacket.java | 6 +- .../packets/request/quest/QuestGetPacket.java | 6 +- .../request/script/EffectScriptPacket.java | 6 +- .../request/script/EventScriptPacket.java | 6 +- .../request/script/ForgeScriptPacket.java | 6 +- .../request/script/GlobalNPCScriptPacket.java | 6 +- .../request/script/NPCScriptPacket.java | 6 +- .../request/script/PlayerScriptPacket.java | 6 +- .../request/script/RecipeScriptPacket.java | 10 +- .../request/script/ScriptInfoPacket.java | 6 +- .../script/item/LinkedItemScriptPacket.java | 6 +- .../npcs/util/AttributeAttackUtil.java | 6 +- .../kamkeel/npcs/util/AttributeItemUtil.java | 7 +- src/main/java/nikedemos/markovnames/Main.java | 10 +- .../noppes/npcs/AnimationMixinFunctions.java | 6 +- src/main/java/noppes/npcs/CommonProxy.java | 23 +- src/main/java/noppes/npcs/CustomItems.java | 120 ++++++++++- src/main/java/noppes/npcs/CustomNpcs.java | 68 +++++- src/main/java/noppes/npcs/DataAI.java | 6 +- src/main/java/noppes/npcs/DataAdvanced.java | 15 +- src/main/java/noppes/npcs/DataDisplay.java | 6 +- src/main/java/noppes/npcs/EventHooks.java | 54 ++++- src/main/java/noppes/npcs/LogWriter.java | 14 +- src/main/java/noppes/npcs/NBTTags.java | 16 +- src/main/java/noppes/npcs/NPCSpawning.java | 7 +- .../java/noppes/npcs/NoppesStringUtils.java | 7 +- .../java/noppes/npcs/NoppesUtilPlayer.java | 43 +++- .../java/noppes/npcs/NoppesUtilServer.java | 47 ++++- .../noppes/npcs/ScriptItemEventHandler.java | 8 +- .../noppes/npcs/ScriptPlayerEventHandler.java | 35 ++- .../java/noppes/npcs/ServerEventsHandler.java | 10 +- .../java/noppes/npcs/ServerTickHandler.java | 2 +- .../npcs/ai/pathfinder/FlyPathFinder.java | 7 +- .../noppes/npcs/blocks/BlockWallBanner.java | 6 +- .../npcs/blocks/tiles/TileScripted.java | 12 +- .../noppes/npcs/blocks/tiles/TileVariant.java | 1 - .../npcs/blocks/tiles/TileWaypoint.java | 6 +- .../noppes/npcs/client/AssetsBrowser.java | 8 +- .../npcs/client/ClientEventHandler.java | 13 +- .../java/noppes/npcs/client/ClientProxy.java | 161 ++++++++++++-- .../noppes/npcs/client/ImageDownloadAlt.java | 1 + .../npcs/client/gui/GuiBorderBlock.java | 6 +- .../client/gui/GuiNPCFactionSelection.java | 6 +- .../npcs/client/gui/GuiNPCLinesEdit.java | 8 +- .../npcs/client/gui/GuiNpcDimension.java | 6 +- .../npcs/client/gui/GuiNpcMobSpawner.java | 24 ++- .../npcs/client/gui/GuiNpcMobSpawnerAdd.java | 9 +- .../client/gui/GuiNpcMobSpawnerMounter.java | 8 +- .../client/gui/GuiNpcMobSpawnerSelector.java | 7 +- .../npcs/client/gui/GuiNpcRemoteEditor.java | 16 +- .../client/gui/GuiNpcSelectionInterface.java | 6 +- .../noppes/npcs/client/gui/GuiScript.java | 21 +- .../npcs/client/gui/SubGuiAnimationFrame.java | 6 +- .../npcs/client/gui/SubGuiClonerNPCTags.java | 8 +- .../client/gui/SubGuiClonerQuickTags.java | 14 +- .../npcs/client/gui/SubGuiCustomHitbox.java | 7 +- .../npcs/client/gui/SubGuiEffectGeneral.java | 8 +- .../noppes/npcs/client/gui/SubGuiMagic.java | 9 +- .../npcs/client/gui/SubGuiMagicCycle.java | 9 +- .../client/gui/SubGuiMailmanSendSetup.java | 7 +- .../client/gui/SubGuiNpcAvailability.java | 8 +- .../gui/SubGuiNpcAvailabilityDialog.java | 6 +- .../gui/SubGuiNpcAvailabilityQuest.java | 6 +- .../npcs/client/gui/SubGuiNpcBiomes.java | 6 +- .../npcs/client/gui/SubGuiNpcCommand.java | 6 +- .../npcs/client/gui/SubGuiNpcDialog.java | 9 +- .../client/gui/SubGuiNpcDialogOption.java | 9 +- .../client/gui/SubGuiNpcDialogVisual.java | 11 +- .../npcs/client/gui/SubGuiNpcDimensions.java | 12 +- .../client/gui/SubGuiNpcFactionOptions.java | 8 +- .../client/gui/SubGuiNpcFactionPoints.java | 6 +- .../client/gui/SubGuiNpcMeleeProperties.java | 7 +- .../npcs/client/gui/SubGuiNpcMovement.java | 6 +- .../noppes/npcs/client/gui/SubGuiNpcName.java | 7 +- .../client/gui/SubGuiNpcPartyOptions.java | 6 +- .../npcs/client/gui/SubGuiNpcProjectiles.java | 9 +- .../npcs/client/gui/SubGuiNpcQuest.java | 9 +- .../client/gui/SubGuiNpcRangeProperties.java | 7 +- .../gui/SubGuiNpcResistanceProperties.java | 6 +- .../npcs/client/gui/SubGuiNpcRespawn.java | 6 +- .../noppes/npcs/client/gui/SubGuiNpcTint.java | 8 +- .../npcs/client/gui/SubGuiPlayerData.java | 18 +- .../npcs/client/gui/SubGuiScriptParticle.java | 6 +- .../client/gui/SubGuiSpawningOptions.java | 7 +- .../gui/advanced/GuiNPCAdvancedLinkedNpc.java | 6 +- .../gui/advanced/GuiNPCDialogNpcOptions.java | 6 +- .../gui/advanced/GuiNPCFactionSetup.java | 7 +- .../npcs/client/gui/advanced/GuiNPCMagic.java | 10 +- .../npcs/client/gui/advanced/GuiNPCMarks.java | 6 +- .../client/gui/advanced/GuiNPCSoundsMenu.java | 8 +- .../client/gui/advanced/GuiNPCTagSetup.java | 9 +- .../npcs/client/gui/custom/GuiCustom.java | 25 ++- .../gui/customoverlay/OverlayCustom.java | 6 +- .../gui/global/GuiNPCEditAnimation.java | 11 +- .../gui/global/GuiNPCManageAnimations.java | 13 +- .../client/gui/global/GuiNPCManageBanks.java | 9 +- .../gui/global/GuiNPCManageDialogs.java | 20 +- .../gui/global/GuiNPCManageEffects.java | 11 +- .../gui/global/GuiNPCManageFactions.java | 18 +- .../client/gui/global/GuiNPCManageLinked.java | 18 +- .../client/gui/global/GuiNPCManageQuest.java | 20 +- .../client/gui/global/GuiNPCManageTags.java | 12 +- .../client/gui/global/GuiNpcManageMagic.java | 19 +- .../gui/global/GuiNpcManagePlayerData.java | 12 +- .../gui/global/GuiNpcManageRecipes.java | 14 +- .../gui/global/GuiNpcNaturalSpawns.java | 20 +- .../client/gui/global/GuiNpcQuestReward.java | 6 +- .../npcs/client/gui/item/GuiNpcMagicBook.java | 7 +- .../client/gui/item/SubGuiLinkedItem.java | 11 +- .../gui/mainmenu/GuiNPCGlobalMainMenu.java | 7 +- .../npcs/client/gui/mainmenu/GuiNPCInv.java | 7 +- .../npcs/client/gui/mainmenu/GuiNpcAI.java | 7 +- .../client/gui/mainmenu/GuiNpcAdvanced.java | 19 +- .../client/gui/mainmenu/GuiNpcDisplay.java | 14 +- .../npcs/client/gui/mainmenu/GuiNpcStats.java | 14 +- .../client/gui/model/GuiCreationScreen.java | 22 +- .../client/gui/model/GuiEntitySelection.java | 7 +- .../npcs/client/gui/model/GuiModelRotate.java | 6 +- .../npcs/client/gui/model/GuiModelScale.java | 6 +- .../client/gui/player/GuiAnvilRecipes.java | 6 +- .../npcs/client/gui/player/GuiMailbox.java | 7 +- .../client/gui/player/GuiMailmanWrite.java | 15 +- .../npcs/client/gui/player/GuiRecipes.java | 6 +- .../gui/player/GuiTransportSelection.java | 7 +- .../companion/GuiNpcCompanionStats.java | 6 +- .../client/gui/player/inventory/GuiParty.java | 28 ++- .../gui/player/inventory/GuiProfiles.java | 14 +- .../gui/player/inventory/GuiQuestLog.java | 17 +- .../player/modern/GuiModernQuestDialog.java | 12 +- .../gui/questtypes/GuiNpcQuestTypeItem.java | 7 +- .../gui/questtypes/GuiNpcQuestTypeKill.java | 8 +- .../questtypes/GuiNpcQuestTypeLocation.java | 6 +- .../gui/questtypes/GuiNpcQuestTypeManual.java | 6 +- .../npcs/client/gui/roles/GuiNpcBard.java | 7 +- .../client/gui/roles/GuiNpcCompanion.java | 8 +- .../client/gui/roles/GuiNpcConversation.java | 8 +- .../client/gui/roles/GuiNpcFollowerJob.java | 6 +- .../client/gui/roles/GuiNpcFollowerSetup.java | 6 +- .../npcs/client/gui/roles/GuiNpcSpawner.java | 8 +- .../client/gui/roles/GuiNpcTraderSetup.java | 6 +- .../client/gui/roles/GuiNpcTransporter.java | 8 +- .../gui/roles/SubGuiNpcConversationLine.java | 7 +- .../client/gui/script/GuiNPCEventScripts.java | 4 +- .../client/gui/script/GuiScriptAllNPCs.java | 4 +- .../client/gui/script/GuiScriptBlock.java | 2 +- .../client/gui/script/GuiScriptEffect.java | 25 ++- .../client/gui/script/GuiScriptForge.java | 4 +- .../client/gui/script/GuiScriptInterface.java | 23 +- .../npcs/client/gui/script/GuiScriptItem.java | 2 +- .../gui/script/GuiScriptLinkedItem.java | 25 ++- .../client/gui/script/GuiScriptPlayers.java | 4 +- .../client/gui/script/GuiScriptRecipe.java | 31 ++- .../client/gui/select/GuiDialogSelection.java | 8 +- .../client/gui/select/GuiQuestSelection.java | 8 +- .../client/gui/select/GuiSoundSelection.java | 6 +- .../gui/select/GuiTextureSelection.java | 15 +- .../npcs/client/gui/util/GuiCustomScroll.java | 6 +- .../npcs/client/gui/util/GuiDiagram.java | 12 +- .../npcs/client/gui/util/GuiHoverText.java | 2 - .../client/gui/util/GuiNPCStringSlot.java | 6 +- .../client/gui/util/GuiScriptTextArea.java | 2 +- .../noppes/npcs/client/model/ModelMPM.java | 23 +- .../noppes/npcs/client/model/ModelPony.java | 35 +-- .../npcs/client/model/part/ModelTail.java | 8 +- .../client/renderer/RenderNPCHumanMale.java | 6 +- .../npcs/client/renderer/RenderNPCPony.java | 40 ++-- .../blocks/BlockCouchWoolRenderer.java | 20 +- .../java/noppes/npcs/config/ConfigScript.java | 2 +- .../java/noppes/npcs/config/GlyphCache.java | 5 +- .../npcs/config/legacy/LegacyLoader.java | 7 +- .../npcs/containers/ContainerAnvilRepair.java | 7 +- .../containers/ContainerCarpentryBench.java | 10 +- .../npcs/controllers/AnimationController.java | 7 +- .../controllers/CustomEffectController.java | 7 +- .../npcs/controllers/DialogController.java | 6 +- .../npcs/controllers/FactionController.java | 7 +- .../controllers/LinkedItemController.java | 7 +- .../npcs/controllers/MagicController.java | 7 +- .../controllers/PlayerDataController.java | 13 +- .../npcs/controllers/QuestController.java | 6 +- .../npcs/controllers/RecipeController.java | 13 +- .../npcs/controllers/ScriptContainer.java | 13 +- .../npcs/controllers/ScriptController.java | 7 +- .../controllers/ServerCloneController.java | 9 +- .../controllers/ServerTagMapController.java | 7 +- .../npcs/controllers/SpawnController.java | 13 +- .../npcs/controllers/TagController.java | 14 +- .../npcs/controllers/data/Availability.java | 6 +- .../npcs/controllers/data/DataScript.java | 8 +- .../noppes/npcs/controllers/data/Dialog.java | 7 +- .../npcs/controllers/data/EffectScript.java | 7 +- .../controllers/data/GlobalNPCDataScript.java | 11 +- .../controllers/data/LinkedItemScript.java | 7 +- .../noppes/npcs/controllers/data/Party.java | 6 +- .../npcs/controllers/data/PlayerData.java | 9 +- .../controllers/data/PlayerDataScript.java | 12 +- .../noppes/npcs/controllers/data/Quest.java | 21 +- .../npcs/controllers/data/RecipeAnvil.java | 1 + .../controllers/data/RecipeCarpentry.java | 2 +- .../npcs/controllers/data/RecipeScript.java | 7 +- .../npcs/controllers/data/SpawnData.java | 8 +- .../noppes/npcs/controllers/data/TagMap.java | 7 +- .../npcs/controllers/data/action/Action.java | 3 +- .../controllers/data/action/ActionList.java | 1 - .../data/action/ActionListener.java | 9 +- .../controllers/data/action/ActionLogger.java | 10 +- .../data/action/ActionManager.java | 39 ++-- .../controllers/data/action/ActionQueue.java | 10 +- .../controllers/data/action/ActionThread.java | 6 +- .../npcs/entity/EntityNPCInterface.java | 100 ++++++++- .../noppes/npcs/entity/EntityProjectile.java | 8 +- .../java/noppes/npcs/items/ItemNpcTool.java | 18 +- .../java/noppes/npcs/quests/QuestDialog.java | 8 +- .../java/noppes/npcs/quests/QuestItem.java | 8 +- .../java/noppes/npcs/quests/QuestKill.java | 8 +- .../java/noppes/npcs/quests/QuestManual.java | 6 +- .../java/noppes/npcs/roles/JobSpawner.java | 6 +- .../java/noppes/npcs/roles/RoleCompanion.java | 27 ++- .../java/noppes/npcs/scripted/NpcAPI.java | 98 ++++++++- .../noppes/npcs/scripted/ScriptBlock.java | 7 +- .../java/noppes/npcs/scripted/ScriptNbt.java | 9 +- .../noppes/npcs/scripted/ScriptParticle.java | 7 +- .../noppes/npcs/scripted/ScriptSound.java | 7 +- .../npcs/scripted/ScriptTileEntity.java | 6 +- .../noppes/npcs/scripted/ScriptWorld.java | 19 +- .../npcs/scripted/entity/ScriptArrow.java | 2 +- .../npcs/scripted/entity/ScriptEntity.java | 7 +- .../npcs/scripted/entity/ScriptFishHook.java | 2 +- .../npcs/scripted/entity/ScriptNpc.java | 30 ++- .../npcs/scripted/entity/ScriptPlayer.java | 30 ++- .../npcs/scripted/entity/ScriptThrowable.java | 5 +- .../scripted/event/RecipeScriptEvent.java | 3 - .../scripted/event/player/PlayerEvent.java | 3 - .../noppes/npcs/scripted/gui/ScriptGui.java | 10 +- .../npcs/scripted/item/ScriptCustomItem.java | 6 +- .../npcs/scripted/item/ScriptItemStack.java | 15 +- .../npcs/scripted/overlay/ScriptOverlay.java | 6 +- .../scripted/scoreboard/ScriptScoreboard.java | 6 +- .../java/noppes/npcs/util/NBTJsonUtil.java | 20 +- .../client/tabs/InventoryTabCustomNpc.java | 7 +- 264 files changed, 2848 insertions(+), 489 deletions(-) diff --git a/src/main/java/foxz/command/CmdNoppes.java b/src/main/java/foxz/command/CmdNoppes.java index a60d1dd8f..cd562f7e1 100644 --- a/src/main/java/foxz/command/CmdNoppes.java +++ b/src/main/java/foxz/command/CmdNoppes.java @@ -27,7 +27,12 @@ import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; @Command( name = "noppes", diff --git a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java index c2d62a229..f075c2ee2 100644 --- a/src/main/java/foxz/commandhelper/AbstractCommandHelper.java +++ b/src/main/java/foxz/commandhelper/AbstractCommandHelper.java @@ -19,7 +19,11 @@ import noppes.npcs.controllers.data.PlayerData; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/src/main/java/foxz/commandhelper/annotations/SubCommand.java b/src/main/java/foxz/commandhelper/annotations/SubCommand.java index 1daa73882..769f64b3c 100644 --- a/src/main/java/foxz/commandhelper/annotations/SubCommand.java +++ b/src/main/java/foxz/commandhelper/annotations/SubCommand.java @@ -1,6 +1,10 @@ package foxz.commandhelper.annotations; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Documented @Retention(value = RetentionPolicy.RUNTIME) diff --git a/src/main/java/kamkeel/npcs/command/CloneCommand.java b/src/main/java/kamkeel/npcs/command/CloneCommand.java index ac3d29606..027ff228e 100644 --- a/src/main/java/kamkeel/npcs/command/CloneCommand.java +++ b/src/main/java/kamkeel/npcs/command/CloneCommand.java @@ -17,7 +17,9 @@ import noppes.npcs.entity.EntityNPCInterface; import java.util.List; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CloneCommand extends CommandKamkeelBase { diff --git a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java index 306176669..76bc80b94 100644 --- a/src/main/java/kamkeel/npcs/command/CommandKamkeel.java +++ b/src/main/java/kamkeel/npcs/command/CommandKamkeel.java @@ -13,7 +13,11 @@ import noppes.npcs.config.ConfigMain; import noppes.npcs.scripted.CustomNPCsException; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.command.EffectCommand.getSortedEffectNames; diff --git a/src/main/java/kamkeel/npcs/command/EffectCommand.java b/src/main/java/kamkeel/npcs/command/EffectCommand.java index 3cca5305e..8a6a2e669 100644 --- a/src/main/java/kamkeel/npcs/command/EffectCommand.java +++ b/src/main/java/kamkeel/npcs/command/EffectCommand.java @@ -8,7 +8,12 @@ import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent.ExpirationType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.util.ColorUtil.sendError; import static kamkeel.npcs.util.ColorUtil.sendResult; diff --git a/src/main/java/kamkeel/npcs/command/SlayCommand.java b/src/main/java/kamkeel/npcs/command/SlayCommand.java index 260ef99c8..dd60e2099 100644 --- a/src/main/java/kamkeel/npcs/command/SlayCommand.java +++ b/src/main/java/kamkeel/npcs/command/SlayCommand.java @@ -18,7 +18,11 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.AxisAlignedBB; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import static kamkeel.npcs.util.ColorUtil.sendResult; diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java index 94c7d4b50..9fac5f0fd 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileAdmin.java @@ -12,7 +12,9 @@ import java.io.File; import java.util.Map; import java.util.UUID; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CommandProfileAdmin extends CommandProfileBase { diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java index 4c6e9ff1e..aa798d30b 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java @@ -7,7 +7,9 @@ import noppes.npcs.config.ConfigMain; import java.util.ArrayList; import java.util.List; -import static kamkeel.npcs.util.ColorUtil.*; +import static kamkeel.npcs.util.ColorUtil.sendError; +import static kamkeel.npcs.util.ColorUtil.sendMessage; +import static kamkeel.npcs.util.ColorUtil.sendResult; public class CommandProfileRegion extends CommandProfileBase { diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index f5ceed513..bf9615d60 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -1,10 +1,20 @@ package kamkeel.npcs.controllers; -import kamkeel.npcs.controllers.data.profile.*; +import kamkeel.npcs.controllers.data.profile.CNPCData; +import kamkeel.npcs.controllers.data.profile.EnumProfileOperation; +import kamkeel.npcs.controllers.data.profile.IProfileData; +import kamkeel.npcs.controllers.data.profile.Profile; +import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; +import kamkeel.npcs.controllers.data.profile.ProfileOperation; +import kamkeel.npcs.controllers.data.profile.Slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.*; +import noppes.npcs.CustomNpcs; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.EventHooks; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerData; import noppes.npcs.api.handler.IProfileHandler; @@ -20,13 +30,27 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.util.CustomNPCsThreader; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; -import static noppes.npcs.CustomNpcsPermissions.*; +import static noppes.npcs.CustomNpcsPermissions.PROFILE_MAX; +import static noppes.npcs.CustomNpcsPermissions.PROFILE_REGION_BYPASS; +import static noppes.npcs.CustomNpcsPermissions.hasCustomPermission; public class ProfileController implements IProfileHandler { diff --git a/src/main/java/kamkeel/npcs/controllers/SyncController.java b/src/main/java/kamkeel/npcs/controllers/SyncController.java index 8a18ebca4..02830966c 100644 --- a/src/main/java/kamkeel/npcs/controllers/SyncController.java +++ b/src/main/java/kamkeel/npcs/controllers/SyncController.java @@ -15,8 +15,25 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.ClientCacheHandler; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.CustomEffect; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.EffectKey; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.Magic; +import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerEffect; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java index e38c1561b..c23be055e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/requirement/types/SoulbindRequirement.java @@ -3,8 +3,8 @@ package kamkeel.npcs.controllers.data.attribute.requirement.types; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import kamkeel.npcs.controllers.ProfileController; +import kamkeel.npcs.controllers.data.attribute.requirement.IRequirementChecker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index bcb94e80f..dfb8a39a9 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -8,14 +8,59 @@ import cpw.mods.fml.common.network.internal.FMLProxyPacket; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.enums.EnumChannelType; -import kamkeel.npcs.network.packets.data.*; -import kamkeel.npcs.network.packets.data.gui.*; -import kamkeel.npcs.network.packets.data.large.*; -import kamkeel.npcs.network.packets.data.npc.*; +import kamkeel.npcs.network.packets.data.AchievementPacket; +import kamkeel.npcs.network.packets.data.ChatAlertPacket; +import kamkeel.npcs.network.packets.data.ChatBubblePacket; +import kamkeel.npcs.network.packets.data.ClonerPacket; +import kamkeel.npcs.network.packets.data.ConfigCommandPacket; +import kamkeel.npcs.network.packets.data.DisableMouseInputPacket; +import kamkeel.npcs.network.packets.data.LoginPacket; +import kamkeel.npcs.network.packets.data.MarkDataPacket; +import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket; +import kamkeel.npcs.network.packets.data.ParticlePacket; +import kamkeel.npcs.network.packets.data.PlayerDataInfoPacket; +import kamkeel.npcs.network.packets.data.PlayerUpdateSkinOverlaysPacket; +import kamkeel.npcs.network.packets.data.QuestCompletionPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import kamkeel.npcs.network.packets.data.SoundManagementPacket; +import kamkeel.npcs.network.packets.data.SwingPlayerArmPacket; +import kamkeel.npcs.network.packets.data.UpdateAnimationsPacket; +import kamkeel.npcs.network.packets.data.VillagerListPacket; +import kamkeel.npcs.network.packets.data.gui.GuiClosePacket; +import kamkeel.npcs.network.packets.data.gui.GuiErrorPacket; +import kamkeel.npcs.network.packets.data.gui.GuiOpenBookPacket; +import kamkeel.npcs.network.packets.data.gui.GuiOpenPacket; +import kamkeel.npcs.network.packets.data.gui.GuiRedstonePacket; +import kamkeel.npcs.network.packets.data.gui.GuiTeleporterPacket; +import kamkeel.npcs.network.packets.data.gui.GuiWaypointPacket; +import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.network.packets.data.large.PartyDataPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import kamkeel.npcs.network.packets.data.large.ScrollListPacket; +import kamkeel.npcs.network.packets.data.large.SyncEffectPacket; +import kamkeel.npcs.network.packets.data.large.SyncPacket; +import kamkeel.npcs.network.packets.data.npc.DeleteNpcPacket; +import kamkeel.npcs.network.packets.data.npc.DialogPacket; +import kamkeel.npcs.network.packets.data.npc.EditNpcPacket; +import kamkeel.npcs.network.packets.data.npc.RolePacket; +import kamkeel.npcs.network.packets.data.npc.UpdateNpcPacket; +import kamkeel.npcs.network.packets.data.npc.WeaponNpcPacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayDataPacket; import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket; -import kamkeel.npcs.network.packets.player.*; +import kamkeel.npcs.network.packets.player.BankActionPacket; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; +import kamkeel.npcs.network.packets.player.CompanionActionPacket; +import kamkeel.npcs.network.packets.player.DialogSelectPacket; +import kamkeel.npcs.network.packets.player.FollowerPacket; +import kamkeel.npcs.network.packets.player.GetNPCRole; +import kamkeel.npcs.network.packets.player.InputDevicePacket; +import kamkeel.npcs.network.packets.player.MailActionPacket; +import kamkeel.npcs.network.packets.player.SaveBookPacket; +import kamkeel.npcs.network.packets.player.SaveSignPacket; +import kamkeel.npcs.network.packets.player.ScreenSizePacket; +import kamkeel.npcs.network.packets.player.TransportPacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiButtonPacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiClosePacket; import kamkeel.npcs.network.packets.player.customgui.CustomGuiUnfocusedPacket; @@ -23,8 +68,21 @@ import kamkeel.npcs.network.packets.player.customgui.CustomScrollClickPacket; import kamkeel.npcs.network.packets.player.item.GuiMagicBookPacket; import kamkeel.npcs.network.packets.player.item.GuiPaintbrushPacket; import kamkeel.npcs.network.packets.player.item.MagicCyclesPacket; -import kamkeel.npcs.network.packets.player.profile.*; -import kamkeel.npcs.network.packets.request.*; +import kamkeel.npcs.network.packets.player.profile.ProfileChangePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileCreatePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetInfoPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRemovePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRenamePacket; +import kamkeel.npcs.network.packets.request.DimensionsGetPacket; +import kamkeel.npcs.network.packets.request.GuiRequestPacket; +import kamkeel.npcs.network.packets.request.IsGuiOpenInform; +import kamkeel.npcs.network.packets.request.MailOpenSetupPacket; +import kamkeel.npcs.network.packets.request.MerchantUpdatePacket; +import kamkeel.npcs.network.packets.request.MountPacket; +import kamkeel.npcs.network.packets.request.TileEntityGetPacket; +import kamkeel.npcs.network.packets.request.TileEntitySavePacket; +import kamkeel.npcs.network.packets.request.TraderMarketSavePacket; import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket; import kamkeel.npcs.network.packets.request.animation.AnimationRemovePacket; import kamkeel.npcs.network.packets.request.animation.AnimationSavePacket; @@ -33,13 +91,35 @@ import kamkeel.npcs.network.packets.request.bank.BankGetPacket; import kamkeel.npcs.network.packets.request.bank.BankRemovePacket; import kamkeel.npcs.network.packets.request.bank.BankSavePacket; import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; -import kamkeel.npcs.network.packets.request.clone.*; -import kamkeel.npcs.network.packets.request.dialog.*; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsPacket; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsShortPacket; +import kamkeel.npcs.network.packets.request.clone.CloneListPacket; +import kamkeel.npcs.network.packets.request.clone.ClonePreSavePacket; +import kamkeel.npcs.network.packets.request.clone.CloneRemovePacket; +import kamkeel.npcs.network.packets.request.clone.CloneSavePacket; +import kamkeel.npcs.network.packets.request.clone.CloneTagListPacket; +import kamkeel.npcs.network.packets.request.clone.MobSpawnerPacket; +import kamkeel.npcs.network.packets.request.clone.SpawnMobPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategorySavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogNpcSetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogsGetPacket; import kamkeel.npcs.network.packets.request.effects.EffectGetPacket; import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket; import kamkeel.npcs.network.packets.request.effects.EffectSavePacket; import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket; -import kamkeel.npcs.network.packets.request.faction.*; +import kamkeel.npcs.network.packets.request.faction.FactionGetPacket; +import kamkeel.npcs.network.packets.request.faction.FactionRemovePacket; +import kamkeel.npcs.network.packets.request.faction.FactionSavePacket; +import kamkeel.npcs.network.packets.request.faction.FactionSetPacket; +import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import kamkeel.npcs.network.packets.request.feather.DimensionTeleportPacket; import kamkeel.npcs.network.packets.request.item.ColorBrushPacket; import kamkeel.npcs.network.packets.request.item.ColorSetPacket; @@ -48,19 +128,79 @@ import kamkeel.npcs.network.packets.request.jobs.JobGetPacket; import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import kamkeel.npcs.network.packets.request.jobs.JobSpawnerAddPacket; import kamkeel.npcs.network.packets.request.jobs.JobSpawnerRemovePacket; -import kamkeel.npcs.network.packets.request.linked.*; -import kamkeel.npcs.network.packets.request.magic.*; -import kamkeel.npcs.network.packets.request.mainmenu.*; +import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedGetPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemBuildPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicNpcGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicNpcSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAIGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAISavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplayGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuDisplaySavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuInvSavePacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsGetPacket; +import kamkeel.npcs.network.packets.request.mainmenu.MainmenuStatsSavePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetAllPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnRemovePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnSavePacket; -import kamkeel.npcs.network.packets.request.npc.*; -import kamkeel.npcs.network.packets.request.party.*; +import kamkeel.npcs.network.packets.request.npc.ModelDataSavePacket; +import kamkeel.npcs.network.packets.request.npc.NpcClosePacket; +import kamkeel.npcs.network.packets.request.npc.NpcDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezeGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteGlobalMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteMainMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteNpcsGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteResetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteTpToNpcPacket; +import kamkeel.npcs.network.packets.request.party.PartyAcceptInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyDisbandPacket; +import kamkeel.npcs.network.packets.request.party.PartyIgnoreInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; +import kamkeel.npcs.network.packets.request.party.PartyInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyKickPacket; +import kamkeel.npcs.network.packets.request.party.PartyLeavePacket; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySavePacket; +import kamkeel.npcs.network.packets.request.party.PartySetLeaderPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket; -import kamkeel.npcs.network.packets.request.playerdata.*; -import kamkeel.npcs.network.packets.request.quest.*; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataDeleteInfoPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetInfoPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetNamesPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket; +import kamkeel.npcs.network.packets.request.playerdata.PlayerDataSaveInfoPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategorySavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestDialogGetTitlePacket; +import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestLogToServerPacket; +import kamkeel.npcs.network.packets.request.quest.QuestOpenGuiPacket; +import kamkeel.npcs.network.packets.request.quest.QuestRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestSavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestUntrackPacket; +import kamkeel.npcs.network.packets.request.quest.QuestsGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket; import kamkeel.npcs.network.packets.request.recipe.RecipeSavePacket; @@ -68,15 +208,34 @@ import kamkeel.npcs.network.packets.request.recipe.RecipesGetPacket; import kamkeel.npcs.network.packets.request.role.RoleCompanionUpdatePacket; import kamkeel.npcs.network.packets.request.role.RoleGetPacket; import kamkeel.npcs.network.packets.request.role.RoleSavePacket; -import kamkeel.npcs.network.packets.request.script.*; +import kamkeel.npcs.network.packets.request.script.BlockScriptPacket; +import kamkeel.npcs.network.packets.request.script.EffectScriptPacket; +import kamkeel.npcs.network.packets.request.script.EventScriptPacket; +import kamkeel.npcs.network.packets.request.script.ForgeScriptPacket; +import kamkeel.npcs.network.packets.request.script.GlobalNPCScriptPacket; +import kamkeel.npcs.network.packets.request.script.NPCScriptPacket; +import kamkeel.npcs.network.packets.request.script.PlayerScriptPacket; +import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; +import kamkeel.npcs.network.packets.request.script.ScriptInfoPacket; import kamkeel.npcs.network.packets.request.script.item.ItemScriptErrorPacket; import kamkeel.npcs.network.packets.request.script.item.ItemScriptPacket; import kamkeel.npcs.network.packets.request.script.item.LinkedItemScriptPacket; -import kamkeel.npcs.network.packets.request.tags.*; +import kamkeel.npcs.network.packets.request.tags.TagGetPacket; +import kamkeel.npcs.network.packets.request.tags.TagRemovePacket; +import kamkeel.npcs.network.packets.request.tags.TagSavePacket; +import kamkeel.npcs.network.packets.request.tags.TagSetPacket; +import kamkeel.npcs.network.packets.request.tags.TagsGetPacket; +import kamkeel.npcs.network.packets.request.tags.TagsNpcGetPacket; import kamkeel.npcs.network.packets.request.transform.TransformGetPacket; import kamkeel.npcs.network.packets.request.transform.TransformLoadPacket; import kamkeel.npcs.network.packets.request.transform.TransformSavePacket; -import kamkeel.npcs.network.packets.request.transport.*; +import kamkeel.npcs.network.packets.request.transport.TransportCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.transport.TransportCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.transport.TransportCategorySavePacket; +import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket; +import kamkeel.npcs.network.packets.request.transport.TransportRemovePacket; +import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; +import kamkeel.npcs.network.packets.request.transport.TransportsGetPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java index 06440e1f2..769709c23 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/MailActionPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.LargeAbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java index a94b6c4a3..27862b15c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/customgui/CustomGuiClosePacket.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.EventHooks; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.gui.ScriptGui; diff --git a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java index 2e9ec537e..bbb6a9f62 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/item/MagicCyclesPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.player.item; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java index 0fa6fea87..991184cb7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java index d5440f82e..cc4dfb3ed 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/MobSpawnerPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.clone; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java index 7af87fd07..b83fb9286 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/clone/SpawnMobPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java index 44a59246f..f3609a7ac 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.dialog; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java index d7bf394a7..c432ca47d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.faction; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java index 88595b60b..fa3175c0f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.jobs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java index 3825f8c82..e05715577 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.linked; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java index 40cad7db5..c562ac8d4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.linked; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java index b2181c6ba..3498f32aa 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.magic; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java index 979f21f47..4f309c011 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestGetPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.quest; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; 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 66da65d8f..8171f085d 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 @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java index 72d3c66bc..69f660a2c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/EventScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java index 11d625988..86584a766 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ForgeScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java index bb07fac73..ae9e44a3d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/GlobalNPCScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java index c2dc13165..7d5e0d3ed 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/NPCScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java index 93b7cc387..242e7d092 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/PlayerScriptPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java index 32b90e93e..3627631eb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/RecipeScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; @@ -14,7 +18,6 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.config.ConfigDebug; import noppes.npcs.config.ConfigScript; import noppes.npcs.controllers.RecipeController; -import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.controllers.data.RecipeAnvil; import noppes.npcs.controllers.data.RecipeCarpentry; import noppes.npcs.controllers.data.RecipeScript; @@ -31,7 +34,8 @@ public final class RecipeScriptPacket extends AbstractPacket { private int maxSize; private NBTTagCompound compound; - public RecipeScriptPacket() {} + public RecipeScriptPacket() { + } public RecipeScriptPacket(Action type, boolean anvil, int id, int tab, int maxSize, NBTTagCompound compound) { this.type = type; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java index 337522882..d0f7089c9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/ScriptInfoPacket.java @@ -3,7 +3,11 @@ package kamkeel.npcs.network.packets.request.script; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java index 8b5ec164f..c62a36553 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/script/item/LinkedItemScriptPacket.java @@ -4,7 +4,11 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; -import kamkeel.npcs.network.*; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java index ffce538ef..f2fd8bf44 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java @@ -10,7 +10,11 @@ import noppes.npcs.controllers.data.MagicEntry; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; import static kamkeel.npcs.controllers.AttributeController.getTracker; diff --git a/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java b/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java index f896c39c7..9cc361b5d 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeItemUtil.java @@ -19,7 +19,12 @@ import noppes.npcs.controllers.MagicController; import noppes.npcs.controllers.data.Magic; import org.lwjgl.input.Keyboard; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.regex.Pattern; /** diff --git a/src/main/java/nikedemos/markovnames/Main.java b/src/main/java/nikedemos/markovnames/Main.java index 8fa76ec7b..25ab664e4 100644 --- a/src/main/java/nikedemos/markovnames/Main.java +++ b/src/main/java/nikedemos/markovnames/Main.java @@ -1,6 +1,14 @@ package nikedemos.markovnames; -import nikedemos.markovnames.generators.*; +import nikedemos.markovnames.generators.MarkovAncientGreek; +import nikedemos.markovnames.generators.MarkovAztec; +import nikedemos.markovnames.generators.MarkovGenerator; +import nikedemos.markovnames.generators.MarkovJapanese; +import nikedemos.markovnames.generators.MarkovOldNorse; +import nikedemos.markovnames.generators.MarkovRoman; +import nikedemos.markovnames.generators.MarkovSaami; +import nikedemos.markovnames.generators.MarkovSlavic; +import nikedemos.markovnames.generators.MarkovWelsh; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/noppes/npcs/AnimationMixinFunctions.java b/src/main/java/noppes/npcs/AnimationMixinFunctions.java index f5f01b2dc..4a6eb1db5 100644 --- a/src/main/java/noppes/npcs/AnimationMixinFunctions.java +++ b/src/main/java/noppes/npcs/AnimationMixinFunctions.java @@ -8,7 +8,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.entity.Entity; diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index e8e879dd3..58f931ab8 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -14,7 +14,28 @@ import net.minecraftforge.common.util.FakePlayer; import noppes.npcs.api.IWorld; import noppes.npcs.blocks.tiles.TileNpcContainer; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; +import noppes.npcs.containers.ContainerAnvilRepair; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerMerchantAdd; +import noppes.npcs.containers.ContainerNPCBankLarge; +import noppes.npcs.containers.ContainerNPCBankSmall; +import noppes.npcs.containers.ContainerNPCBankUnlock; +import noppes.npcs.containers.ContainerNPCBankUpgrade; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/CustomItems.java b/src/main/java/noppes/npcs/CustomItems.java index 1b1bfed67..e9e481fa9 100644 --- a/src/main/java/noppes/npcs/CustomItems.java +++ b/src/main/java/noppes/npcs/CustomItems.java @@ -7,17 +7,129 @@ import net.minecraft.dispenser.BehaviorDefaultDispenseItem; import net.minecraft.dispenser.IBlockSource; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemFlintAndSteel; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.oredict.OreDictionary; -import noppes.npcs.blocks.*; -import noppes.npcs.blocks.tiles.*; +import noppes.npcs.blocks.BlockBanner; +import noppes.npcs.blocks.BlockBarrel; +import noppes.npcs.blocks.BlockBeam; +import noppes.npcs.blocks.BlockBigSign; +import noppes.npcs.blocks.BlockBlood; +import noppes.npcs.blocks.BlockBook; +import noppes.npcs.blocks.BlockBorder; +import noppes.npcs.blocks.BlockCampfire; +import noppes.npcs.blocks.BlockCandle; +import noppes.npcs.blocks.BlockCarpentryBench; +import noppes.npcs.blocks.BlockChair; +import noppes.npcs.blocks.BlockCouchWood; +import noppes.npcs.blocks.BlockCouchWool; +import noppes.npcs.blocks.BlockCrate; +import noppes.npcs.blocks.BlockCrystal; +import noppes.npcs.blocks.BlockLantern; +import noppes.npcs.blocks.BlockMailbox; +import noppes.npcs.blocks.BlockNpcRedstone; +import noppes.npcs.blocks.BlockPedestal; +import noppes.npcs.blocks.BlockPlaceholder; +import noppes.npcs.blocks.BlockScripted; +import noppes.npcs.blocks.BlockShelf; +import noppes.npcs.blocks.BlockShortLamp; +import noppes.npcs.blocks.BlockSign; +import noppes.npcs.blocks.BlockStool; +import noppes.npcs.blocks.BlockTable; +import noppes.npcs.blocks.BlockTallLamp; +import noppes.npcs.blocks.BlockTombstone; +import noppes.npcs.blocks.BlockWallBanner; +import noppes.npcs.blocks.BlockWaypoint; +import noppes.npcs.blocks.BlockWeaponRack; +import noppes.npcs.blocks.tiles.TileBanner; +import noppes.npcs.blocks.tiles.TileBarrel; +import noppes.npcs.blocks.tiles.TileBeam; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileBlockAnvil; +import noppes.npcs.blocks.tiles.TileBook; +import noppes.npcs.blocks.tiles.TileBorder; +import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.blocks.tiles.TileCandle; +import noppes.npcs.blocks.tiles.TileChair; +import noppes.npcs.blocks.tiles.TileCouchWood; +import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.blocks.tiles.TileCrate; +import noppes.npcs.blocks.tiles.TileLamp; +import noppes.npcs.blocks.tiles.TileMailbox; +import noppes.npcs.blocks.tiles.TilePedestal; +import noppes.npcs.blocks.tiles.TileRedstoneBlock; +import noppes.npcs.blocks.tiles.TileScripted; +import noppes.npcs.blocks.tiles.TileShelf; +import noppes.npcs.blocks.tiles.TileShortLamp; +import noppes.npcs.blocks.tiles.TileSign; +import noppes.npcs.blocks.tiles.TileStool; +import noppes.npcs.blocks.tiles.TileTable; +import noppes.npcs.blocks.tiles.TileTallLamp; +import noppes.npcs.blocks.tiles.TileTombstone; +import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.blocks.tiles.TileWaypoint; +import noppes.npcs.blocks.tiles.TileWeaponRack; import noppes.npcs.config.ConfigItem; import noppes.npcs.constants.EnumNpcToolMaterial; -import noppes.npcs.items.*; +import noppes.npcs.items.ItemBattleAxe; +import noppes.npcs.items.ItemBroadSword; +import noppes.npcs.items.ItemBullet; +import noppes.npcs.items.ItemClaw; +import noppes.npcs.items.ItemCrossbow; +import noppes.npcs.items.ItemDagger; +import noppes.npcs.items.ItemDaggerReversed; +import noppes.npcs.items.ItemElementalStaff; +import noppes.npcs.items.ItemExcalibur; +import noppes.npcs.items.ItemGlaive; +import noppes.npcs.items.ItemGun; +import noppes.npcs.items.ItemGunChainsaw; +import noppes.npcs.items.ItemKunai; +import noppes.npcs.items.ItemKunaiReversed; +import noppes.npcs.items.ItemLeafBlade; +import noppes.npcs.items.ItemLinked; +import noppes.npcs.items.ItemMachineGun; +import noppes.npcs.items.ItemMounter; +import noppes.npcs.items.ItemMusic; +import noppes.npcs.items.ItemMusicBanjo; +import noppes.npcs.items.ItemMusicClarinet; +import noppes.npcs.items.ItemMusicOracina; +import noppes.npcs.items.ItemMusicViolin; +import noppes.npcs.items.ItemMusket; +import noppes.npcs.items.ItemNpcArmor; +import noppes.npcs.items.ItemNpcArmorColorable; +import noppes.npcs.items.ItemNpcBlock; +import noppes.npcs.items.ItemNpcCloner; +import noppes.npcs.items.ItemNpcColored; +import noppes.npcs.items.ItemNpcInterface; +import noppes.npcs.items.ItemNpcMovingPath; +import noppes.npcs.items.ItemNpcScripter; +import noppes.npcs.items.ItemNpcTool; +import noppes.npcs.items.ItemNpcWand; +import noppes.npcs.items.ItemNpcWeaponInterface; +import noppes.npcs.items.ItemOrb; +import noppes.npcs.items.ItemPlaceholder; +import noppes.npcs.items.ItemRotatedShield; +import noppes.npcs.items.ItemScripted; +import noppes.npcs.items.ItemScythe; +import noppes.npcs.items.ItemShield; +import noppes.npcs.items.ItemSkirt; +import noppes.npcs.items.ItemSlingshot; +import noppes.npcs.items.ItemSoulstoneEmpty; +import noppes.npcs.items.ItemSoulstoneFilled; +import noppes.npcs.items.ItemSpear; +import noppes.npcs.items.ItemStaff; +import noppes.npcs.items.ItemTeleporter; +import noppes.npcs.items.ItemThrowingShuriken; +import noppes.npcs.items.ItemThrowingWeapon; +import noppes.npcs.items.ItemWand; +import noppes.npcs.items.ItemWarhammer; public class CustomItems { diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index ec85394fb..5c13d0c5f 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -4,7 +4,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartedEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; @@ -27,15 +32,68 @@ import net.minecraft.entity.EntityList; import net.minecraft.server.MinecraftServer; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; -import nikedemos.markovnames.generators.*; +import nikedemos.markovnames.generators.MarkovAncientGreek; +import nikedemos.markovnames.generators.MarkovAztec; +import nikedemos.markovnames.generators.MarkovCustomNPCsClassic; +import nikedemos.markovnames.generators.MarkovGenerator; +import nikedemos.markovnames.generators.MarkovJapanese; +import nikedemos.markovnames.generators.MarkovOldNorse; +import nikedemos.markovnames.generators.MarkovRoman; +import nikedemos.markovnames.generators.MarkovSaami; +import nikedemos.markovnames.generators.MarkovSlavic; +import nikedemos.markovnames.generators.MarkovSpanish; +import nikedemos.markovnames.generators.MarkovWelsh; import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.LoadConfiguration; import noppes.npcs.config.legacy.LegacyConfig; -import noppes.npcs.controllers.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.ChunkController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.GlobalDataController; +import noppes.npcs.controllers.LinkedItemController; +import noppes.npcs.controllers.LinkedNpcController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.ServerTagMapController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.TransportController; import noppes.npcs.enchants.EnchantInterface; -import noppes.npcs.entity.*; -import noppes.npcs.entity.old.*; +import noppes.npcs.entity.EntityChairMount; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityMagicProjectile; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; +import noppes.npcs.entity.old.EntityNPCDwarfFemale; +import noppes.npcs.entity.old.EntityNPCDwarfMale; +import noppes.npcs.entity.old.EntityNPCElfFemale; +import noppes.npcs.entity.old.EntityNPCElfMale; +import noppes.npcs.entity.old.EntityNPCEnderman; +import noppes.npcs.entity.old.EntityNPCFurryFemale; +import noppes.npcs.entity.old.EntityNPCFurryMale; +import noppes.npcs.entity.old.EntityNPCHumanFemale; +import noppes.npcs.entity.old.EntityNPCHumanMale; +import noppes.npcs.entity.old.EntityNPCOrcFemale; +import noppes.npcs.entity.old.EntityNPCOrcMale; +import noppes.npcs.entity.old.EntityNPCVillager; +import noppes.npcs.entity.old.EntityNpcEnderchibi; +import noppes.npcs.entity.old.EntityNpcMonsterFemale; +import noppes.npcs.entity.old.EntityNpcMonsterMale; +import noppes.npcs.entity.old.EntityNpcNagaFemale; +import noppes.npcs.entity.old.EntityNpcNagaMale; +import noppes.npcs.entity.old.EntityNpcSkeleton; import noppes.npcs.scripted.NpcAPI; import java.io.File; diff --git a/src/main/java/noppes/npcs/DataAI.java b/src/main/java/noppes/npcs/DataAI.java index 386807a50..8d280e557 100644 --- a/src/main/java/noppes/npcs/DataAI.java +++ b/src/main/java/noppes/npcs/DataAI.java @@ -3,7 +3,11 @@ package noppes.npcs; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.MathHelper; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/DataAdvanced.java b/src/main/java/noppes/npcs/DataAdvanced.java index cc0e67f2f..cc9e08614 100644 --- a/src/main/java/noppes/npcs/DataAdvanced.java +++ b/src/main/java/noppes/npcs/DataAdvanced.java @@ -10,7 +10,20 @@ import noppes.npcs.controllers.data.FactionOptions; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.*; +import noppes.npcs.roles.JobBard; +import noppes.npcs.roles.JobChunkLoader; +import noppes.npcs.roles.JobConversation; +import noppes.npcs.roles.JobFollower; +import noppes.npcs.roles.JobGuard; +import noppes.npcs.roles.JobHealer; +import noppes.npcs.roles.JobItemGiver; +import noppes.npcs.roles.JobSpawner; +import noppes.npcs.roles.RoleBank; +import noppes.npcs.roles.RoleCompanion; +import noppes.npcs.roles.RoleFollower; +import noppes.npcs.roles.RolePostman; +import noppes.npcs.roles.RoleTrader; +import noppes.npcs.roles.RoleTransporter; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/noppes/npcs/DataDisplay.java b/src/main/java/noppes/npcs/DataDisplay.java index 09b45913d..c17649754 100644 --- a/src/main/java/noppes/npcs/DataDisplay.java +++ b/src/main/java/noppes/npcs/DataDisplay.java @@ -25,7 +25,11 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.data.DataSkinOverlays; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Objects; +import java.util.Random; +import java.util.UUID; public class DataDisplay { public EntityNPCInterface npc; diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index eb54cff84..7a18879ab 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -1,6 +1,7 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.Event; +import kamkeel.npcs.network.packets.data.AchievementPacket; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -15,11 +16,19 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.world.WorldEvent; import noppes.npcs.api.IWorld; -import noppes.npcs.api.entity.*; +import noppes.npcs.api.entity.IAnimatable; +import noppes.npcs.api.entity.ICustomNpc; +import noppes.npcs.api.entity.IEntity; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.entity.IProjectile; import noppes.npcs.api.event.IAnimationEvent; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.gui.IItemSlot; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimation; +import noppes.npcs.api.handler.data.IAnvilRecipe; +import noppes.npcs.api.handler.data.IFrame; +import noppes.npcs.api.handler.data.IPlayerEffect; +import noppes.npcs.api.handler.data.IProfile; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.api.item.IItemLinked; import noppes.npcs.api.item.IItemStack; @@ -27,16 +36,45 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.controllers.data.*; +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; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.RecipeScript; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.*; -import noppes.npcs.scripted.event.player.*; -import noppes.npcs.scripted.event.player.PlayerEvent.*; +import noppes.npcs.scripted.event.AnimationEvent; +import noppes.npcs.scripted.event.BlockEvent; +import noppes.npcs.scripted.event.CustomNPCsEvent; +import noppes.npcs.scripted.event.ForgeEvent; +import noppes.npcs.scripted.event.ItemEvent; +import noppes.npcs.scripted.event.LinkedItemEvent; +import noppes.npcs.scripted.event.NpcEvent; +import noppes.npcs.scripted.event.PartyEvent; +import noppes.npcs.scripted.event.ProjectileEvent; +import noppes.npcs.scripted.event.RecipeScriptEvent; +import noppes.npcs.scripted.event.player.CustomGuiEvent; +import noppes.npcs.scripted.event.player.DialogEvent; +import noppes.npcs.scripted.event.player.FactionEvent; +import noppes.npcs.scripted.event.player.PlayerEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.ChatEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.ContainerOpen; +import noppes.npcs.scripted.event.player.PlayerEvent.DamagedEntityEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.DropEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.EffectEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.KeyPressedEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.LoginEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.LogoutEvent; +import noppes.npcs.scripted.event.player.PlayerEvent.PickUpEvent; +import noppes.npcs.scripted.event.player.QuestEvent; import noppes.npcs.scripted.item.ScriptItemStack; -import kamkeel.npcs.network.packets.data.AchievementPacket; -import noppes.npcs.NoppesUtilServer; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/LogWriter.java b/src/main/java/noppes/npcs/LogWriter.java index 2c14af3a6..4aa393b4a 100644 --- a/src/main/java/noppes/npcs/LogWriter.java +++ b/src/main/java/noppes/npcs/LogWriter.java @@ -3,13 +3,23 @@ package noppes.npcs; import noppes.npcs.config.ConfigDebug; import noppes.npcs.constants.EnumScriptType; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.UUID; import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; -import java.util.logging.*; +import java.util.logging.ConsoleHandler; +import java.util.logging.Formatter; +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.LogRecord; +import java.util.logging.Logger; +import java.util.logging.StreamHandler; public class LogWriter { private final static String name = "CustomNPCs"; diff --git a/src/main/java/noppes/npcs/NBTTags.java b/src/main/java/noppes/npcs/NBTTags.java index d8771caf5..ebf30ab94 100644 --- a/src/main/java/noppes/npcs/NBTTags.java +++ b/src/main/java/noppes/npcs/NBTTags.java @@ -1,11 +1,23 @@ package noppes.npcs; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagList; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.IScriptHandler; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; +import java.util.Vector; public class NBTTags { diff --git a/src/main/java/noppes/npcs/NPCSpawning.java b/src/main/java/noppes/npcs/NPCSpawning.java index 28b8c320c..ef143024c 100644 --- a/src/main/java/noppes/npcs/NPCSpawning.java +++ b/src/main/java/noppes/npcs/NPCSpawning.java @@ -26,7 +26,12 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Random; +import java.util.Set; public class NPCSpawning { private static Set eligibleChunksForSpawning = Sets.newHashSet(); diff --git a/src/main/java/noppes/npcs/NoppesStringUtils.java b/src/main/java/noppes/npcs/NoppesStringUtils.java index f0e2a76f9..cd7031ef0 100644 --- a/src/main/java/noppes/npcs/NoppesStringUtils.java +++ b/src/main/java/noppes/npcs/NoppesStringUtils.java @@ -5,7 +5,12 @@ import net.minecraft.util.StatCollector; import noppes.npcs.entity.EntityNPCInterface; import java.awt.*; -import java.awt.datatransfer.*; +import java.awt.datatransfer.Clipboard; +import java.awt.datatransfer.ClipboardOwner; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.StringSelection; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; import java.io.IOException; import java.util.Arrays; diff --git a/src/main/java/noppes/npcs/NoppesUtilPlayer.java b/src/main/java/noppes/npcs/NoppesUtilPlayer.java index bbfda9523..2c9c3b647 100644 --- a/src/main/java/noppes/npcs/NoppesUtilPlayer.java +++ b/src/main/java/noppes/npcs/NoppesUtilPlayer.java @@ -3,7 +3,11 @@ package noppes.npcs; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumSoundOperation; -import kamkeel.npcs.network.packets.data.*; +import kamkeel.npcs.network.packets.data.DisableMouseInputPacket; +import kamkeel.npcs.network.packets.data.OverlayQuestTrackingPacket; +import kamkeel.npcs.network.packets.data.QuestCompletionPacket; +import kamkeel.npcs.network.packets.data.SoundManagementPacket; +import kamkeel.npcs.network.packets.data.SwingPlayerArmPacket; import kamkeel.npcs.network.packets.data.gui.GuiClosePacket; import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; @@ -24,12 +28,37 @@ import net.minecraftforge.oredict.OreDictionary; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IQuestObjective; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumOptionType; +import noppes.npcs.constants.EnumPartyExchange; +import noppes.npcs.constants.EnumPartyObjectives; +import noppes.npcs.constants.EnumQuestCompletion; +import noppes.npcs.constants.EnumQuestType; +import noppes.npcs.constants.EnumRoleType; import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.containers.ContainerNPCFollower; import noppes.npcs.containers.ContainerNPCFollowerHire; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.BankData; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PartyOptions; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.PlayerTransportData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; import noppes.npcs.scripted.NpcAPI; @@ -39,7 +68,11 @@ import noppes.npcs.scripted.event.player.DialogEvent; import noppes.npcs.scripted.event.player.QuestEvent; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class NoppesUtilPlayer { diff --git a/src/main/java/noppes/npcs/NoppesUtilServer.java b/src/main/java/noppes/npcs/NoppesUtilServer.java index f538d4afd..7d06d4e52 100644 --- a/src/main/java/noppes/npcs/NoppesUtilServer.java +++ b/src/main/java/noppes/npcs/NoppesUtilServer.java @@ -48,8 +48,45 @@ import noppes.npcs.constants.EnumRoleType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.containers.ContainerManageRecipes; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.LinkedItemController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.CustomEffect; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogCategory; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.LinkedItem; +import noppes.npcs.controllers.data.Magic; +import noppes.npcs.controllers.data.MagicCycle; +import noppes.npcs.controllers.data.MagicData; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerFactionData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.PlayerTransportData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestCategory; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.Tag; +import noppes.npcs.controllers.data.TransportCategory; +import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTransporter; @@ -60,7 +97,11 @@ import noppes.npcs.scripted.event.player.DialogEvent; import java.io.File; import java.io.IOException; import java.text.DecimalFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; import static kamkeel.npcs.network.packets.data.large.ScrollDataPacket.sendScrollData; diff --git a/src/main/java/noppes/npcs/ScriptItemEventHandler.java b/src/main/java/noppes/npcs/ScriptItemEventHandler.java index 7aa6b8a45..ea02d2556 100644 --- a/src/main/java/noppes/npcs/ScriptItemEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptItemEventHandler.java @@ -2,8 +2,6 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.item.ColorBrushPacket; import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -15,7 +13,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingEvent; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.player.AnvilRepairEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; diff --git a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java index ccd8c1cfa..cb445bb7f 100644 --- a/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java +++ b/src/main/java/noppes/npcs/ScriptPlayerEventHandler.java @@ -20,20 +20,41 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.EntityStruckByLightningEvent; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; -import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingFallEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.event.entity.player.AchievementEvent; +import net.minecraftforge.event.entity.player.ArrowLooseEvent; +import net.minecraftforge.event.entity.player.ArrowNockEvent; +import net.minecraftforge.event.entity.player.BonemealEvent; +import net.minecraftforge.event.entity.player.EntityInteractEvent; +import net.minecraftforge.event.entity.player.FillBucketEvent; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.entity.player.PlayerOpenContainerEvent; +import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; +import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent; +import net.minecraftforge.event.entity.player.PlayerUseItemEvent; +import net.minecraftforge.event.entity.player.PlayerWakeUpEvent; +import net.minecraftforge.event.entity.player.UseHoeEvent; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.config.ConfigMain; +import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.CustomEffectController; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.ScriptController; -import noppes.npcs.config.ConfigScript; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemNpcTool; import noppes.npcs.quests.QuestItem; @@ -142,7 +163,7 @@ public class ScriptPlayerEventHandler { if (event.entityPlayer == null || event.entityPlayer.worldObj == null || event.entityPlayer.worldObj.isRemote || !(event.entityPlayer instanceof EntityPlayerMP)) return; - if(event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) + if (event.action == PlayerInteractEvent.Action.LEFT_CLICK_BLOCK) return; IPlayer ip = NoppesUtilServer.getIPlayer(event.entityPlayer); @@ -152,14 +173,14 @@ public class ScriptPlayerEventHandler { return; } - if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR){ + if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { if (pd.hadInteract) { pd.hadInteract = false; return; } noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent rightClickEvent = new noppes.npcs.scripted.event.player.PlayerEvent.RightClickEvent(ip, 0, null); event.setCanceled(EventHooks.onPlayerRightClick(handler, rightClickEvent)); - } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK){ + } else if (event.action == PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK) { pd.hadInteract = true; IWorld iw = (IWorld) NpcAPI.Instance().getIWorld(event.world); Object blockCtx = NpcAPI.Instance().getIBlock(iw, event.x, event.y, event.z); diff --git a/src/main/java/noppes/npcs/ServerEventsHandler.java b/src/main/java/noppes/npcs/ServerEventsHandler.java index c5b92db0a..acc72a56c 100644 --- a/src/main/java/noppes/npcs/ServerEventsHandler.java +++ b/src/main/java/noppes/npcs/ServerEventsHandler.java @@ -48,7 +48,15 @@ import noppes.npcs.constants.EnumQuestType; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.PartyController; import noppes.npcs.controllers.ServerCloneController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.MarkData; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.items.ItemExcalibur; import noppes.npcs.items.ItemShield; diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index 2cb6d4e6d..98d3ebda0 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -21,7 +21,7 @@ public class ServerTickHandler { @SubscribeEvent public void onServerTick(TickEvent.ServerTickEvent event) { if (event.phase == Phase.END) { - ActionManager.GLOBAL.tick(); + ActionManager.GLOBAL.tick(); } } diff --git a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java index 090986165..ebe00c28e 100644 --- a/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java +++ b/src/main/java/noppes/npcs/ai/pathfinder/FlyPathFinder.java @@ -2,7 +2,12 @@ package noppes.npcs.ai.pathfinder; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDoor; +import net.minecraft.block.BlockFence; +import net.minecraft.block.BlockFenceGate; +import net.minecraft.block.BlockRailBase; +import net.minecraft.block.BlockWall; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java index 3e4aeec6e..82d4b44fc 100644 --- a/src/main/java/noppes/npcs/blocks/BlockWallBanner.java +++ b/src/main/java/noppes/npcs/blocks/BlockWallBanner.java @@ -14,7 +14,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import noppes.npcs.NoppesUtilServer; import noppes.npcs.blocks.tiles.TileColorable; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java index ce535cc2d..8babf8936 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileScripted.java @@ -16,7 +16,11 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import noppes.npcs.*; +import noppes.npcs.CustomItems; +import noppes.npcs.EventHooks; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.TextBlock; import noppes.npcs.api.IBlock; import noppes.npcs.api.block.ITextPlane; import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; @@ -28,8 +32,12 @@ import noppes.npcs.entity.data.DataTimers; import noppes.npcs.scripted.BlockScriptedWrapper; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.TreeMap; public class TileScripted extends TileEntity implements IScriptBlockHandler { public List scripts = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java index f893a4d05..1a9e26e4f 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileVariant.java @@ -7,7 +7,6 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.Facing; import static noppes.npcs.items.ItemNpcTool.BRUSH_COLOR_TAG; diff --git a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java index 20f2326ff..b4f635d02 100644 --- a/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java +++ b/src/main/java/noppes/npcs/blocks/tiles/TileWaypoint.java @@ -8,7 +8,11 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.PartyController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.quests.QuestLocation; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/client/AssetsBrowser.java b/src/main/java/noppes/npcs/client/AssetsBrowser.java index 1fc83c868..92ce5b5de 100644 --- a/src/main/java/noppes/npcs/client/AssetsBrowser.java +++ b/src/main/java/noppes/npcs/client/AssetsBrowser.java @@ -4,7 +4,13 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.*; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.NPCResourceHelper; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.SimpleReloadableResourceManager; import org.apache.commons.lang3.StringUtils; import java.io.File; diff --git a/src/main/java/noppes/npcs/client/ClientEventHandler.java b/src/main/java/noppes/npcs/client/ClientEventHandler.java index 1d24d2692..deb374ab2 100644 --- a/src/main/java/noppes/npcs/client/ClientEventHandler.java +++ b/src/main/java/noppes/npcs/client/ClientEventHandler.java @@ -14,7 +14,11 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.MouseEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.event.RenderHandEvent; +import net.minecraftforge.client.event.RenderLivingEvent; +import net.minecraftforge.client.event.RenderPlayerEvent; import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.gui.hud.ClientHudManager; import noppes.npcs.client.gui.hud.CompassHudComponent; @@ -30,7 +34,12 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityNPCInterface; import java.lang.reflect.Field; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public class ClientEventHandler { public static final RenderCNPCPlayer renderCNPCSelf = new RenderCNPCPlayer(); diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index f93153c48..9f8694663 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -34,41 +34,176 @@ import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.IWorld; -import noppes.npcs.blocks.tiles.*; -import noppes.npcs.client.controllers.*; +import noppes.npcs.blocks.tiles.TileBanner; +import noppes.npcs.blocks.tiles.TileBarrel; +import noppes.npcs.blocks.tiles.TileBeam; +import noppes.npcs.blocks.tiles.TileBigSign; +import noppes.npcs.blocks.tiles.TileBlockAnvil; +import noppes.npcs.blocks.tiles.TileBook; +import noppes.npcs.blocks.tiles.TileCampfire; +import noppes.npcs.blocks.tiles.TileCandle; +import noppes.npcs.blocks.tiles.TileChair; +import noppes.npcs.blocks.tiles.TileCouchWood; +import noppes.npcs.blocks.tiles.TileCouchWool; +import noppes.npcs.blocks.tiles.TileCrate; +import noppes.npcs.blocks.tiles.TileLamp; +import noppes.npcs.blocks.tiles.TileMailbox; +import noppes.npcs.blocks.tiles.TilePedestal; +import noppes.npcs.blocks.tiles.TileScripted; +import noppes.npcs.blocks.tiles.TileShelf; +import noppes.npcs.blocks.tiles.TileShortLamp; +import noppes.npcs.blocks.tiles.TileSign; +import noppes.npcs.blocks.tiles.TileStool; +import noppes.npcs.blocks.tiles.TileTable; +import noppes.npcs.blocks.tiles.TileTallLamp; +import noppes.npcs.blocks.tiles.TileTombstone; +import noppes.npcs.blocks.tiles.TileWallBanner; +import noppes.npcs.blocks.tiles.TileWeaponRack; +import noppes.npcs.client.controllers.ClientCloneController; +import noppes.npcs.client.controllers.ClientTagMapController; +import noppes.npcs.client.controllers.MusicController; +import noppes.npcs.client.controllers.PresetController; +import noppes.npcs.client.controllers.ScriptSoundController; import noppes.npcs.client.fx.EntityBigSmokeFX; import noppes.npcs.client.fx.EntityElementalStaffFX; import noppes.npcs.client.fx.EntityEnderFX; import noppes.npcs.client.fx.EntityRainbowFX; -import noppes.npcs.client.gui.*; +import noppes.npcs.client.gui.GuiBorderBlock; +import noppes.npcs.client.gui.GuiMerchantAdd; +import noppes.npcs.client.gui.GuiNpcDimension; +import noppes.npcs.client.gui.GuiNpcMobSpawner; +import noppes.npcs.client.gui.GuiNpcMobSpawnerMounter; +import noppes.npcs.client.gui.GuiNpcPather; +import noppes.npcs.client.gui.GuiNpcRedstoneBlock; +import noppes.npcs.client.gui.GuiNpcRemoteEditor; +import noppes.npcs.client.gui.GuiNpcWaypoint; +import noppes.npcs.client.gui.GuiScript; import noppes.npcs.client.gui.custom.GuiCustom; -import noppes.npcs.client.gui.global.*; +import noppes.npcs.client.gui.global.GuiNPCManageAnimations; +import noppes.npcs.client.gui.global.GuiNPCManageBanks; +import noppes.npcs.client.gui.global.GuiNPCManageDialogs; +import noppes.npcs.client.gui.global.GuiNPCManageEffects; +import noppes.npcs.client.gui.global.GuiNPCManageFactions; +import noppes.npcs.client.gui.global.GuiNPCManageLinked; +import noppes.npcs.client.gui.global.GuiNPCManageQuest; +import noppes.npcs.client.gui.global.GuiNPCManageTags; +import noppes.npcs.client.gui.global.GuiNPCManageTransporters; +import noppes.npcs.client.gui.global.GuiNpcManageMagic; +import noppes.npcs.client.gui.global.GuiNpcManageRecipes; +import noppes.npcs.client.gui.global.GuiNpcQuestReward; import noppes.npcs.client.gui.item.GuiNpcMagicBook; import noppes.npcs.client.gui.item.GuiNpcPaintbrush; -import noppes.npcs.client.gui.mainmenu.*; -import noppes.npcs.client.gui.player.*; +import noppes.npcs.client.gui.mainmenu.GuiNPCGlobalMainMenu; +import noppes.npcs.client.gui.mainmenu.GuiNPCInv; +import noppes.npcs.client.gui.mainmenu.GuiNpcAI; +import noppes.npcs.client.gui.mainmenu.GuiNpcAdvanced; +import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; +import noppes.npcs.client.gui.mainmenu.GuiNpcStats; +import noppes.npcs.client.gui.player.GuiBigSign; +import noppes.npcs.client.gui.player.GuiCrate; +import noppes.npcs.client.gui.player.GuiMailbox; +import noppes.npcs.client.gui.player.GuiMailmanWrite; +import noppes.npcs.client.gui.player.GuiNPCBankChest; +import noppes.npcs.client.gui.player.GuiNPCTrader; +import noppes.npcs.client.gui.player.GuiNpcAnvil; +import noppes.npcs.client.gui.player.GuiNpcCarpentryBench; +import noppes.npcs.client.gui.player.GuiNpcFollower; +import noppes.npcs.client.gui.player.GuiNpcFollowerHire; +import noppes.npcs.client.gui.player.GuiTransportSelection; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionInv; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionStats; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents; import noppes.npcs.client.gui.player.modern.BlurEventHandler; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeItem; -import noppes.npcs.client.gui.roles.*; +import noppes.npcs.client.gui.roles.GuiNpcBankSetup; +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.model.*; -import noppes.npcs.client.renderer.*; -import noppes.npcs.client.renderer.blocks.*; -import noppes.npcs.client.renderer.items.*; +import noppes.npcs.client.model.ModelNPCGolem; +import noppes.npcs.client.model.ModelNpcCrystal; +import noppes.npcs.client.model.ModelNpcDragon; +import noppes.npcs.client.model.ModelNpcSlime; +import noppes.npcs.client.model.ModelSkirtArmor; +import noppes.npcs.client.renderer.NpcItemRenderer; +import noppes.npcs.client.renderer.RenderCustomNpc; +import noppes.npcs.client.renderer.RenderNPCHumanMale; +import noppes.npcs.client.renderer.RenderNPCPony; +import noppes.npcs.client.renderer.RenderNpcCrystal; +import noppes.npcs.client.renderer.RenderNpcDragon; +import noppes.npcs.client.renderer.RenderNpcSlime; +import noppes.npcs.client.renderer.RenderProjectile; +import noppes.npcs.client.renderer.blocks.BlockBannerRenderer; +import noppes.npcs.client.renderer.blocks.BlockBarrelRenderer; +import noppes.npcs.client.renderer.blocks.BlockBeamRenderer; +import noppes.npcs.client.renderer.blocks.BlockBigSignRenderer; +import noppes.npcs.client.renderer.blocks.BlockBloodRenderer; +import noppes.npcs.client.renderer.blocks.BlockBookRenderer; +import noppes.npcs.client.renderer.blocks.BlockBorderRenderer; +import noppes.npcs.client.renderer.blocks.BlockCampfireRenderer; +import noppes.npcs.client.renderer.blocks.BlockCandleRenderer; +import noppes.npcs.client.renderer.blocks.BlockCarpentryBenchRenderer; +import noppes.npcs.client.renderer.blocks.BlockChairRenderer; +import noppes.npcs.client.renderer.blocks.BlockCouchWoodRenderer; +import noppes.npcs.client.renderer.blocks.BlockCouchWoolRenderer; +import noppes.npcs.client.renderer.blocks.BlockCrateRenderer; +import noppes.npcs.client.renderer.blocks.BlockLanternRenderer; +import noppes.npcs.client.renderer.blocks.BlockMailboxRenderer; +import noppes.npcs.client.renderer.blocks.BlockPedestalRenderer; +import noppes.npcs.client.renderer.blocks.BlockScriptedRenderer; +import noppes.npcs.client.renderer.blocks.BlockShelfRenderer; +import noppes.npcs.client.renderer.blocks.BlockShortLampRenderer; +import noppes.npcs.client.renderer.blocks.BlockSignRenderer; +import noppes.npcs.client.renderer.blocks.BlockStoolRenderer; +import noppes.npcs.client.renderer.blocks.BlockTableRenderer; +import noppes.npcs.client.renderer.blocks.BlockTallLampRenderer; +import noppes.npcs.client.renderer.blocks.BlockTombstoneRenderer; +import noppes.npcs.client.renderer.blocks.BlockWallBannerRenderer; +import noppes.npcs.client.renderer.blocks.BlockWeaponRackRenderer; +import noppes.npcs.client.renderer.items.ItemBannerRenderer; +import noppes.npcs.client.renderer.items.ItemBannerWallRenderer; +import noppes.npcs.client.renderer.items.ItemCouchWoolRenderer; +import noppes.npcs.client.renderer.items.ItemCustomRenderer; +import noppes.npcs.client.renderer.items.ItemShortLampRenderer; +import noppes.npcs.client.renderer.items.ItemTallLampRenderer; +import noppes.npcs.client.renderer.items.ItemToolRenderer; +import noppes.npcs.client.renderer.items.ScriptedBlockItemRenderer; import noppes.npcs.config.ConfigClient; import noppes.npcs.config.ConfigItem; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.StringCache; import noppes.npcs.constants.EnumGuiType; -import noppes.npcs.containers.*; +import noppes.npcs.containers.ContainerAnvilRepair; +import noppes.npcs.containers.ContainerCarpentryBench; +import noppes.npcs.containers.ContainerCrate; +import noppes.npcs.containers.ContainerCustomGui; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.containers.ContainerManageBanks; +import noppes.npcs.containers.ContainerManageRecipes; +import noppes.npcs.containers.ContainerNPCBankInterface; +import noppes.npcs.containers.ContainerNPCCompanion; +import noppes.npcs.containers.ContainerNPCFollower; +import noppes.npcs.containers.ContainerNPCFollowerHire; +import noppes.npcs.containers.ContainerNPCFollowerSetup; +import noppes.npcs.containers.ContainerNPCInv; +import noppes.npcs.containers.ContainerNPCTrader; +import noppes.npcs.containers.ContainerNPCTraderSetup; +import noppes.npcs.containers.ContainerNpcItemGiver; +import noppes.npcs.containers.ContainerNpcQuestReward; +import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.AnimationData; import noppes.npcs.controllers.data.PlayerData; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; +import noppes.npcs.entity.EntityProjectile; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelPartData; import noppes.npcs.items.ItemLinked; diff --git a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java index 611a43fe2..7d986948f 100644 --- a/src/main/java/noppes/npcs/client/ImageDownloadAlt.java +++ b/src/main/java/noppes/npcs/client/ImageDownloadAlt.java @@ -16,6 +16,7 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java index cf5549c70..cc2cc57a0 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java +++ b/src/main/java/noppes/npcs/client/gui/GuiBorderBlock.java @@ -6,7 +6,11 @@ import kamkeel.npcs.network.packets.request.TileEntitySavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.blocks.tiles.TileBorder; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; public class GuiBorderBlock extends GuiNPCInterface implements IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java index 45b402e72..8b36ab4eb 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCFactionSelection.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNPCStringSlot; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java index e140434a0..95a1db653 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNPCLinesEdit.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Line; import noppes.npcs.controllers.data.Lines; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java index 309eca9b5..514f7df7a 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcDimension.java @@ -7,7 +7,11 @@ import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java index 8c07cb55a..b3670d9e8 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawner.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.clone.*; +import kamkeel.npcs.network.packets.request.clone.CloneAllTagsPacket; +import kamkeel.npcs.network.packets.request.clone.CloneListPacket; +import kamkeel.npcs.network.packets.request.clone.CloneRemovePacket; +import kamkeel.npcs.network.packets.request.clone.CloneTagListPacket; +import kamkeel.npcs.network.packets.request.clone.MobSpawnerPacket; +import kamkeel.npcs.network.packets.request.clone.SpawnMobPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.Entity; @@ -13,12 +18,25 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import noppes.npcs.client.controllers.ClientCloneController; import noppes.npcs.client.controllers.ClientTagMapController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiCustomScrollCloner; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.controllers.data.TagMap; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class GuiNpcMobSpawner extends GuiNPCInterface implements IGuiData { public static HashMap tags = new HashMap<>(); diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java index 3dc90d15f..d2895fc44 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerAdd.java @@ -14,7 +14,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java index 6b7ef382a..0afa7d867 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerMounter.java @@ -13,7 +13,13 @@ import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java index c0b988e23..9c13af815 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcMobSpawnerSelector.java @@ -7,7 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagDouble; import net.minecraft.nbt.NBTTagList; import noppes.npcs.client.controllers.ClientCloneController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java index 2e92d8cce..757633c15 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcRemoteEditor.java @@ -1,14 +1,26 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.npc.*; +import kamkeel.npcs.network.packets.request.npc.RemoteDeletePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezeGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteFreezePacket; +import kamkeel.npcs.network.packets.request.npc.RemoteGlobalMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteMainMenuPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteNpcsGetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteResetPacket; +import kamkeel.npcs.network.packets.request.npc.RemoteTpToNpcPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.entity.Entity; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java index aeb2346be..e47c18135 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java +++ b/src/main/java/noppes/npcs/client/gui/GuiNpcSelectionInterface.java @@ -5,7 +5,11 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.util.StatCollector; import noppes.npcs.client.AssetsBrowser; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNPCStringSlot; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.entity.EntityNPCInterface; import java.util.Collections; diff --git a/src/main/java/noppes/npcs/client/gui/GuiScript.java b/src/main/java/noppes/npcs/client/gui/GuiScript.java index 1786708e2..3cdde7e62 100644 --- a/src/main/java/noppes/npcs/client/gui/GuiScript.java +++ b/src/main/java/noppes/npcs/client/gui/GuiScript.java @@ -12,13 +12,28 @@ 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.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IJTextAreaListener; +import noppes.npcs.client.gui.util.ITextChangeListener; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.DataScript; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCallback, ICustomScrollListener, IJTextAreaListener, ITextChangeListener { public boolean showScript = false; @@ -264,7 +279,7 @@ public class GuiScript extends GuiNPCInterface implements IGuiData, GuiYesNoCall @Override public void save() { - if(loaded){ + if (loaded) { setScript(); NPCScriptPacket.Save(script.writeToNBT(new NBTTagCompound())); } diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java index f6b3e2b49..e5594bf52 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiAnimationFrame.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Frame; public class SubGuiAnimationFrame extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java index 14f4e6e91..6621c109d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerNPCTags.java @@ -9,7 +9,13 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java index 996259b25..4344fb9ec 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiClonerQuickTags.java @@ -2,10 +2,20 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.TreeSet; +import java.util.Vector; public class SubGuiClonerQuickTags extends SubGuiInterface implements IScrollData { public GuiNpcMobSpawnerAdd parent; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java b/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java index 09fc84fe1..e94817d91 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiCustomHitbox.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.HitboxData; public class SubGuiCustomHitbox extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java index dc57ed311..19903229b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiEffectGeneral.java @@ -8,7 +8,13 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.gui.global.GuiNPCManageEffects; import noppes.npcs.client.gui.script.GuiScriptEffect; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScrollWindow; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.controllers.data.CustomEffect; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java index 5609d013d..96ea89d58 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagic.java @@ -5,7 +5,14 @@ import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.global.GuiNpcManageMagic; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumTextureType; import noppes.npcs.controllers.data.Magic; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java index ab975d3ae..b9c6ea4ca 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMagicCycle.java @@ -5,7 +5,14 @@ import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.global.GuiNpcManageMagic; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumDiagramLayout; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java index 849f0edad..deefee93d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiMailmanSendSetup.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.player.GuiMailmanWrite; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java index 2d3cf7edf..ec1366bd2 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailability.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.packets.request.faction.FactionGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityFactionType; import noppes.npcs.constants.EnumDayTime; import noppes.npcs.controllers.data.Availability; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java index cee94a3f5..802ede067 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityDialog.java @@ -4,7 +4,11 @@ import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityDialog; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Dialog; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java index f4098c445..12d61550e 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcAvailabilityQuest.java @@ -4,7 +4,11 @@ import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAvailabilityQuest; import noppes.npcs.controllers.data.Availability; import noppes.npcs.controllers.data.Quest; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java index 95c11fd27..c0189b4eb 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcBiomes.java @@ -9,7 +9,11 @@ import noppes.npcs.client.gui.util.GuiNpcLabel; import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class SubGuiNpcBiomes extends SubGuiInterface { private SpawnData data; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java index 9b3c42572..1bba05cc9 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcCommand.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcCommand extends SubGuiInterface implements ITextfieldListener { public String command; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java index cff9e03f0..3e194f85f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialog.java @@ -10,7 +10,14 @@ import noppes.npcs.client.gui.global.GuiNPCManageDialogs; import noppes.npcs.client.gui.player.GuiDialogInteract; import noppes.npcs.client.gui.select.GuiQuestSelection; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.entity.EntityDialogNpc; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java index 6a7accc98..3c0caa1bc 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogOption.java @@ -4,7 +4,14 @@ import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogOption; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java index e58b90810..72481f133 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDialogVisual.java @@ -5,7 +5,16 @@ import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogColorData; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java index 03f8301ab..106ae0557 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcDimensions.java @@ -3,11 +3,19 @@ package noppes.npcs.client.gui; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.DimensionsGetPacket; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.Vector; public class SubGuiNpcDimensions extends SubGuiInterface implements IScrollData { private final SpawnData data; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java index b2ece2a5d..d5d4ac392 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionOptions.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.request.faction.FactionsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.FactionOptions; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java index 074464d74..a4ce80c25 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcFactionPoints.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Faction; public class SubGuiNpcFactionPoints extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java index c9d451c1b..a128d3760 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMeleeProperties.java @@ -2,7 +2,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPotionType; public class SubGuiNpcMeleeProperties extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java index 39c712771..e29b6f95f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcMovement.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataAI; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumMovingType; import noppes.npcs.constants.EnumStandingType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java index a31a4dea4..e98938c8f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcName.java @@ -3,7 +3,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataDisplay; import noppes.npcs.client.gui.mainmenu.GuiNpcDisplay; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcName extends SubGuiInterface implements ITextfieldListener { private DataDisplay display; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java index 3c9fbd653..10420a65d 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcPartyOptions.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPartyExchange; import noppes.npcs.constants.EnumPartyObjectives; import noppes.npcs.constants.EnumPartyRequirements; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java index 669438ec0..8acb8fc8c 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcProjectiles.java @@ -2,7 +2,14 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumParticleType; import noppes.npcs.constants.EnumPotionType; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java index 5c56ce292..6406733be 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcQuest.java @@ -11,7 +11,14 @@ import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeKill; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeLocation; import noppes.npcs.client.gui.questtypes.GuiNpcQuestTypeManual; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; +import noppes.npcs.client.gui.util.SubGuiNpcCooldownPicker; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java index 12d283e06..428e83016 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRangeProperties.java @@ -3,7 +3,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcRangeProperties extends SubGuiInterface implements ITextfieldListener, ISubGuiListener { private DataStats stats; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java index ddcf0239b..41b725c12 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcResistanceProperties.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.Resistances; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcResistanceProperties extends SubGuiInterface implements ISliderListener { private Resistances resistances; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java index ea70f7cf2..0a0694779 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcRespawn.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcRespawn extends SubGuiInterface implements ITextfieldListener { private DataStats stats; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java b/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java index d40c3a0cb..1a3804c2b 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiNpcTint.java @@ -1,7 +1,13 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.TintData; public class SubGuiNpcTint extends SubGuiInterface implements ISubGuiListener, ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java index a91946b2a..0d39c0cd8 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiPlayerData.java @@ -8,13 +8,27 @@ import kamkeel.npcs.network.packets.request.playerdata.PlayerDataSaveInfoPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiToggleButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IPlayerDataInfo; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; import org.lwjgl.opengl.GL11; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Vector; import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons; diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java index 2cd7587e6..69c211358 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiScriptParticle.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.scripted.ScriptParticle; public class SubGuiScriptParticle extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java b/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java index 2fa94b219..c15f9162f 100644 --- a/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java +++ b/src/main/java/noppes/npcs/client/gui/SubGuiSpawningOptions.java @@ -1,7 +1,12 @@ package noppes.npcs.client.gui; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.SpawnData; public class SubGuiSpawningOptions extends SubGuiInterface implements ITextfieldListener { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java index f954e0129..ef837871b 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCAdvancedLinkedNpc.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; import kamkeel.npcs.network.packets.request.linked.LinkedSetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java index 084c11e1a..0e2c31845 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCDialogNpcOptions.java @@ -8,7 +8,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiDialogSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java index 8caecf0c7..e56f088be 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCFactionSetup.java @@ -7,7 +7,12 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiNpcFactionOptions; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java index 86eb1fbb2..c235d75f5 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMagic.java @@ -6,7 +6,15 @@ import kamkeel.npcs.network.packets.request.magic.MagicNpcGetPacket; import kamkeel.npcs.network.packets.request.magic.MagicNpcSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java index bc22bcde2..46cc27c47 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCMarks.java @@ -5,7 +5,11 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedMarkDataPac import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcAvailability; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.MarkType; import noppes.npcs.controllers.data.MarkData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java index 44942ea4c..007c42ee7 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCSoundsMenu.java @@ -5,7 +5,13 @@ import kamkeel.npcs.network.packets.request.mainmenu.MainmenuAdvancedSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; public class GuiNPCSoundsMenu extends GuiNPCInterface2 implements ITextfieldListener, ISubGuiListener { diff --git a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java index f32aeab39..dcd361e48 100644 --- a/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java +++ b/src/main/java/noppes/npcs/client/gui/advanced/GuiNPCTagSetup.java @@ -9,7 +9,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index de8304c75..599afebe8 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -25,7 +25,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.api.gui.ICustomGuiComponent; -import noppes.npcs.client.gui.custom.components.*; +import noppes.npcs.client.gui.custom.components.CustomGuiButton; +import noppes.npcs.client.gui.custom.components.CustomGuiLabel; +import noppes.npcs.client.gui.custom.components.CustomGuiLine; +import noppes.npcs.client.gui.custom.components.CustomGuiScrollComponent; +import noppes.npcs.client.gui.custom.components.CustomGuiTextField; +import noppes.npcs.client.gui.custom.components.CustomGuiTexturedRect; import noppes.npcs.client.gui.custom.interfaces.IClickListener; import noppes.npcs.client.gui.custom.interfaces.IDataHolder; import noppes.npcs.client.gui.custom.interfaces.IGuiComponent; @@ -33,13 +38,27 @@ import noppes.npcs.client.gui.util.GuiCustomScroll; import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.scripted.gui.*; +import noppes.npcs.scripted.gui.ScriptGui; +import noppes.npcs.scripted.gui.ScriptGuiButton; +import noppes.npcs.scripted.gui.ScriptGuiComponent; +import noppes.npcs.scripted.gui.ScriptGuiLabel; +import noppes.npcs.scripted.gui.ScriptGuiLine; +import noppes.npcs.scripted.gui.ScriptGuiScroll; +import noppes.npcs.scripted.gui.ScriptGuiTextField; +import noppes.npcs.scripted.gui.ScriptGuiTexturedRect; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiData { ScriptGui gui; diff --git a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java index aa36108c7..5940d134a 100644 --- a/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java +++ b/src/main/java/noppes/npcs/client/gui/customoverlay/OverlayCustom.java @@ -10,7 +10,11 @@ import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLabel; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayLine; import noppes.npcs.client.gui.customoverlay.components.CustomOverlayTexturedRect; import noppes.npcs.client.gui.customoverlay.interfaces.IOverlayComponent; -import noppes.npcs.scripted.overlay.*; +import noppes.npcs.scripted.overlay.ScriptOverlay; +import noppes.npcs.scripted.overlay.ScriptOverlayComponent; +import noppes.npcs.scripted.overlay.ScriptOverlayLabel; +import noppes.npcs.scripted.overlay.ScriptOverlayLine; +import noppes.npcs.scripted.overlay.ScriptOverlayTexturedRect; import org.lwjgl.opengl.GL11; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java index 4b5997b7f..eb7b84001 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCEditAnimation.java @@ -7,7 +7,16 @@ import net.minecraft.client.gui.GuiScreen; import noppes.npcs.client.gui.SubGuiAnimationFrame; import noppes.npcs.client.gui.SubGuiAnimationOptions; import noppes.npcs.client.gui.SubGuiColorSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiTexturedButton; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumAnimationPart; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java index 6ab69d319..7d1fa84be 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageAnimations.java @@ -11,7 +11,18 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiModelInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiTexturedButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Animation; import noppes.npcs.controllers.data.AnimationData; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java index ee3cf3f35..693ecbf0c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageBanks.java @@ -8,7 +8,14 @@ import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageBanks; import noppes.npcs.controllers.data.Bank; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java index ba25d44aa..eb0ede5bf 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java @@ -1,7 +1,14 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.dialog.*; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogCategorySavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogGetPacket; +import kamkeel.npcs.network.packets.request.dialog.DialogRemovePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogSavePacket; +import kamkeel.npcs.network.packets.request.dialog.DialogsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -10,7 +17,16 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcDialog; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java index 68635ae45..a5f32da52 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageEffects.java @@ -16,7 +16,16 @@ import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEffectGeneral; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.CustomEffectController; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java index 0a7789f1f..246e528f3 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageFactions.java @@ -13,12 +13,26 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.SubGuiNpcFactionPoints; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Faction; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Vector; public class GuiNPCManageFactions extends GuiNPCInterface2 implements IScrollData, ICustomScrollListener, ITextfieldListener, IGuiData, ISubGuiListener, GuiYesNoCallback { private GuiCustomScroll scrollFactions; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java index 5d7434794..e07d2583c 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageLinked.java @@ -1,7 +1,13 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.linked.*; +import kamkeel.npcs.network.packets.request.linked.LinkedGetAllPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedGetPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemBuildPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket; +import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket; import kamkeel.npcs.util.ColorUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; @@ -20,7 +26,15 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.item.SubGuiLinkedItem; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.LinkedItem; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java index 5a18fab75..f3d1679f2 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java @@ -1,7 +1,14 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.quest.*; +import kamkeel.npcs.network.packets.request.quest.QuestCategoriesGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategoryRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestCategorySavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestGetPacket; +import kamkeel.npcs.network.packets.request.quest.QuestRemovePacket; +import kamkeel.npcs.network.packets.request.quest.QuestSavePacket; +import kamkeel.npcs.network.packets.request.quest.QuestsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiYesNo; @@ -11,7 +18,16 @@ import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; import noppes.npcs.client.gui.SubGuiNpcQuest; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java index ec84783d2..0872c3cb5 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageTags.java @@ -8,7 +8,17 @@ import kamkeel.npcs.network.packets.request.tags.TagsGetPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiColorSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Tag; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java index fbdc8be21..76036717e 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageMagic.java @@ -1,13 +1,28 @@ package noppes.npcs.client.gui.global; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.magic.*; +import kamkeel.npcs.network.packets.request.magic.MagicCycleRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicCycleSavePacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetAllPacket; +import kamkeel.npcs.network.packets.request.magic.MagicGetPacket; +import kamkeel.npcs.network.packets.request.magic.MagicRemovePacket; +import kamkeel.npcs.network.packets.request.magic.MagicSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.SubGuiMagic; import noppes.npcs.client.gui.SubGuiMagicCycle; import noppes.npcs.client.gui.SubGuiMagicCycleViewer; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiToggleButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java index a30838249..58b50de0a 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManagePlayerData.java @@ -9,7 +9,15 @@ import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.SubGuiPlayerData; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumPlayerData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; @@ -115,7 +123,7 @@ public class GuiNpcManagePlayerData extends GuiNPCInterface2 implements GuiYesNo public void confirmClicked(boolean confirm, int id) { if (confirm) { if (id == 0) { - if(selectedPlayer != null && !selectedPlayer.isEmpty()){ + if (selectedPlayer != null && !selectedPlayer.isEmpty()) { PacketClient.sendClient(new PlayerDataRemovePacket(EnumPlayerData.Players, selectedPlayer)); playerData.remove(selectedPlayer); selectedPlayer = null; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java index 57b3255c5..dacdccc33 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -13,7 +13,19 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.script.GuiScriptRecipe; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.containers.ContainerManageRecipes; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java index aba615c0e..a5ebd6e1f 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcNaturalSpawns.java @@ -12,12 +12,28 @@ import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; import noppes.npcs.client.gui.SubGuiNpcBiomes; import noppes.npcs.client.gui.SubGuiNpcDimensions; import noppes.npcs.client.gui.SubGuiSpawningOptions; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiHoverText; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.SpawnData; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.Vector; public class GuiNpcNaturalSpawns extends GuiNPCInterface2 implements IGuiData, IScrollData, ITextfieldListener, ICustomScrollListener, ISliderListener { private GuiCustomScroll scrollNaturalSpawns; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java index 6692f5b98..28a06c515 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcQuestReward.java @@ -3,7 +3,11 @@ package noppes.npcs.client.gui.global; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestReward; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java index 7a4f0467a..3348f059f 100644 --- a/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java +++ b/src/main/java/noppes/npcs/client/gui/item/GuiNpcMagicBook.java @@ -5,7 +5,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.GuiMagicCycleMap; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.MagicCycle; diff --git a/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java b/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java index dd0dc1c64..9bf537a69 100644 --- a/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/item/SubGuiLinkedItem.java @@ -13,7 +13,16 @@ import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.SubGuiColorSelector; import noppes.npcs.client.gui.global.GuiNPCManageLinked; import noppes.npcs.client.gui.script.GuiScriptLinkedItem; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonBiDirectional; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScrollWindow; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.controllers.data.LinkedItem; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java index 0364abe21..8295618dd 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java @@ -11,7 +11,12 @@ import noppes.npcs.client.gui.util.GuiNpcSquareButton; import noppes.npcs.constants.EnumGuiType; import noppes.npcs.entity.EntityNPCInterface; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static noppes.npcs.client.gui.player.inventory.GuiCNPCInventory.specialIcons; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java index 6c3669814..275eea6ff 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCInv.java @@ -10,7 +10,12 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.inventory.Slot; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNPCInv; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java index 895866a55..538d58b59 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAI.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataAI; import noppes.npcs.client.gui.SubGuiNpcMovement; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumCombatPolicy; import noppes.npcs.constants.EnumNavType; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java index 2d8466d1c..d7b5ac919 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcAdvanced.java @@ -9,8 +9,23 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.advanced.*; -import noppes.npcs.client.gui.roles.*; +import noppes.npcs.client.gui.advanced.GuiNPCAdvancedLinkedNpc; +import noppes.npcs.client.gui.advanced.GuiNPCDialogNpcOptions; +import noppes.npcs.client.gui.advanced.GuiNPCFactionSetup; +import noppes.npcs.client.gui.advanced.GuiNPCLinesMenu; +import noppes.npcs.client.gui.advanced.GuiNPCMagic; +import noppes.npcs.client.gui.advanced.GuiNPCMarks; +import noppes.npcs.client.gui.advanced.GuiNPCNightSetup; +import noppes.npcs.client.gui.advanced.GuiNPCSoundsMenu; +import noppes.npcs.client.gui.advanced.GuiNPCTagSetup; +import noppes.npcs.client.gui.roles.GuiNpcBard; +import noppes.npcs.client.gui.roles.GuiNpcCompanion; +import noppes.npcs.client.gui.roles.GuiNpcConversation; +import noppes.npcs.client.gui.roles.GuiNpcFollowerJob; +import noppes.npcs.client.gui.roles.GuiNpcGuard; +import noppes.npcs.client.gui.roles.GuiNpcHealer; +import noppes.npcs.client.gui.roles.GuiNpcSpawner; +import noppes.npcs.client.gui.roles.GuiNpcTransporter; import noppes.npcs.client.gui.util.GuiNPCInterface2; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.IGuiData; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java index a7086a36f..f81242f89 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcDisplay.java @@ -10,10 +10,20 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.DataDisplay; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.*; +import noppes.npcs.client.gui.GuiNpcTextureCloaks; +import noppes.npcs.client.gui.GuiNpcTextureOverlays; +import noppes.npcs.client.gui.SubGuiCustomHitbox; +import noppes.npcs.client.gui.SubGuiNpcName; +import noppes.npcs.client.gui.SubGuiNpcTint; import noppes.npcs.client.gui.model.GuiCreationScreen; import noppes.npcs.client.gui.select.GuiTextureSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.config.ConfigMain; import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java index f3833477c..80aa0e6b6 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNpcStats.java @@ -8,8 +8,18 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.DataStats; -import noppes.npcs.client.gui.*; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.SubGuiNpcMeleeProperties; +import noppes.npcs.client.gui.SubGuiNpcProjectiles; +import noppes.npcs.client.gui.SubGuiNpcRangeProperties; +import noppes.npcs.client.gui.SubGuiNpcResistanceProperties; +import noppes.npcs.client.gui.SubGuiNpcRespawn; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.entity.EntityNPCInterface; public class GuiNpcStats extends GuiNPCInterface2 implements ITextfieldListener, IGuiData { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java index 722d9ff86..15d33b209 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiCreationScreen.java @@ -16,13 +16,29 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.compat.PixelmonHelper; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityFakeLiving; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNPCInterface; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class GuiCreationScreen extends GuiModelInterface implements ICustomScrollListener { diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java index 1689893d3..f5a05d996 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiEntitySelection.java @@ -12,7 +12,12 @@ import noppes.npcs.client.EntityUtil; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.GuiNPCStringSlot; import noppes.npcs.client.gui.util.GuiNpcButton; -import noppes.npcs.entity.*; +import noppes.npcs.entity.EntityCustomNpc; +import noppes.npcs.entity.EntityNPCGolem; +import noppes.npcs.entity.EntityNpcCrystal; +import noppes.npcs.entity.EntityNpcDragon; +import noppes.npcs.entity.EntityNpcPony; +import noppes.npcs.entity.EntityNpcSlime; import noppes.npcs.entity.data.ModelData; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java index 743de0945..f8cafab52 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelRotate.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.model; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelRotatePart; diff --git a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java index e00af5683..4a1f2358f 100644 --- a/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java +++ b/src/main/java/noppes/npcs/client/gui/model/GuiModelScale.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.model; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiModelInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.ISliderListener; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelData; import noppes.npcs.entity.data.ModelScalePart; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java index 9b9341f48..956e30058 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiAnvilRecipes.java @@ -10,7 +10,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeAnvil; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java index babf6b3a0..e8ccec1f9 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailbox.java @@ -7,7 +7,12 @@ import net.minecraft.client.gui.GuiYesNoCallback; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.controllers.data.PlayerMailData; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java index d80138a5b..d19694ba6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiMailmanWrite.java @@ -12,9 +12,20 @@ import net.minecraft.client.resources.I18n; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.*; +import net.minecraft.util.ChatAllowedCharacters; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiClose; +import noppes.npcs.client.gui.util.IGuiError; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.data.PlayerMail; import org.lwjgl.input.Keyboard; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java index 3c6f2ef70..78507813a 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiRecipes.java @@ -11,7 +11,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java index 3c726c33d..f266059a6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiTransportSelection.java @@ -5,7 +5,12 @@ import kamkeel.npcs.network.packets.player.TransportPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IScrollData; +import noppes.npcs.client.gui.util.ITopButtonListener; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java index 591fe8f82..a7d4c953d 100644 --- a/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java +++ b/src/main/java/noppes/npcs/client/gui/player/companion/GuiNpcCompanionStats.java @@ -11,7 +11,11 @@ import net.minecraft.util.MathHelper; import noppes.npcs.CustomItems; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiMenuTopIconButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.IGuiData; import noppes.npcs.constants.EnumCompanionJobs; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.constants.EnumGuiType; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java index 76ae5173c..3ff696952 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java @@ -2,7 +2,17 @@ package noppes.npcs.client.gui.player.inventory; import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.player.CheckPlayerValue; -import kamkeel.npcs.network.packets.request.party.*; +import kamkeel.npcs.network.packets.request.party.PartyAcceptInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyDisbandPacket; +import kamkeel.npcs.network.packets.request.party.PartyIgnoreInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyInfoPacket; +import kamkeel.npcs.network.packets.request.party.PartyInvitePacket; +import kamkeel.npcs.network.packets.request.party.PartyKickPacket; +import kamkeel.npcs.network.packets.request.party.PartyLeavePacket; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySavePacket; +import kamkeel.npcs.network.packets.request.party.PartySetLeaderPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -14,13 +24,25 @@ import net.minecraft.util.StatCollector; import noppes.npcs.QuestLogData; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IPartyData; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.Quest; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Objects; +import java.util.UUID; +import java.util.Vector; public class GuiParty extends GuiCNPCInventory implements ITextfieldListener, ICustomScrollListener, IPartyData, GuiYesNoCallback { private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/standardbg.png"); diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java index 47ec2c1ef..7ffb7aff2 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java @@ -4,7 +4,12 @@ import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; import kamkeel.npcs.controllers.data.profile.Slot; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.player.profile.*; +import kamkeel.npcs.network.packets.player.profile.ProfileChangePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileCreatePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetInfoPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileGetPacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRemovePacket; +import kamkeel.npcs.network.packets.player.profile.ProfileRenamePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -16,7 +21,12 @@ import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.SubGuiEditText; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java index 0b65ec305..e382b7c51 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java @@ -17,14 +17,27 @@ import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.TextBlockClient; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiButtonNextPage; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuSideButton; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IPartyData; import noppes.npcs.controllers.data.Party; import noppes.npcs.util.ValueUtil; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.AbstractTab; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListener, IGuiData, IPartyData, GuiYesNoCallback { diff --git a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java index 0d4659ebb..f0a20373f 100644 --- a/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java +++ b/src/main/java/noppes/npcs/client/gui/player/modern/GuiModernQuestDialog.java @@ -29,12 +29,20 @@ import noppes.npcs.client.gui.util.GuiTexturedButton; import noppes.npcs.client.gui.util.IGuiClose; import noppes.npcs.config.ConfigExperimental; import noppes.npcs.controllers.FactionController; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogImage; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiModernQuestDialog extends GuiNPCInterface implements IGuiClose { private int selected = 0; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java index d57f6f12d..0d9ac099f 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeItem.java @@ -4,7 +4,12 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.NoppesUtil; import noppes.npcs.client.gui.global.GuiNPCManageQuest; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNpcQuestTypeItem; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java index bf4829130..c4e7babd9 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeKill.java @@ -5,7 +5,13 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestKill; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java index 4afbc1040..9c730b7af 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeLocation.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestLocation; diff --git a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java index 4c4730888..4022d2447 100644 --- a/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java +++ b/src/main/java/noppes/npcs/client/gui/questtypes/GuiNpcQuestTypeManual.java @@ -2,7 +2,11 @@ package noppes.npcs.client.gui.questtypes; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.data.Quest; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.quests.QuestManual; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java index 1a44021cc..e77496766 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcBard.java @@ -4,7 +4,12 @@ import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.controllers.MusicController; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobBard; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java index f35532ec3..731ec85f9 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcCompanion.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.role.RoleSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.client.gui.player.companion.GuiNpcCompanionTalents.GuiTalent; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcSlider; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISliderListener; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.constants.EnumCompanionStage; import noppes.npcs.constants.EnumCompanionTalent; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java index 546125193..4a28787d0 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcConversation.java @@ -4,7 +4,13 @@ import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.SubGuiNpcAvailability; import noppes.npcs.client.gui.select.GuiQuestSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobConversation; import noppes.npcs.roles.JobConversation.ConversationLine; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java index c41b728c4..4f656f63f 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerJob.java @@ -1,7 +1,11 @@ package noppes.npcs.client.gui.roles; import kamkeel.npcs.network.packets.request.jobs.JobSavePacket; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobFollower; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java index 2f18bdbff..1a3d36546 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcFollowerSetup.java @@ -6,7 +6,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; import noppes.npcs.containers.ContainerNPCFollowerSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleFollower; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java index 0901b38b2..d57dd417c 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcSpawner.java @@ -8,7 +8,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; import noppes.npcs.client.gui.GuiNpcMobSpawnerSelector; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.JobSpawner; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java index 4d9729982..43c259da7 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTraderSetup.java @@ -7,7 +7,11 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.CustomNpcResourceListener; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiContainerNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButtonYesNo; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ITextfieldListener; import noppes.npcs.containers.ContainerNPCTraderSetup; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.roles.RoleTrader; diff --git a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java index 6be4a1f75..39cf78d46 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java +++ b/src/main/java/noppes/npcs/client/gui/roles/GuiNpcTransporter.java @@ -6,7 +6,13 @@ import kamkeel.npcs.network.packets.request.transport.TransportGetLocationPacket import kamkeel.npcs.network.packets.request.transport.TransportSavePacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNPCInterface2; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.IGuiData; +import noppes.npcs.client.gui.util.IScrollData; import noppes.npcs.constants.EnumScrollData; import noppes.npcs.controllers.data.TransportLocation; import noppes.npcs.entity.EntityNPCInterface; diff --git a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java index d98457bbd..6f08ac730 100644 --- a/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java +++ b/src/main/java/noppes/npcs/client/gui/roles/SubGuiNpcConversationLine.java @@ -2,7 +2,12 @@ package noppes.npcs.client.gui.roles; import net.minecraft.client.gui.GuiButton; import noppes.npcs.client.gui.select.GuiSoundSelection; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ISubGuiListener; +import noppes.npcs.client.gui.util.ITextfieldListener; +import noppes.npcs.client.gui.util.SubGuiInterface; public class SubGuiNpcConversationLine extends SubGuiInterface implements ITextfieldListener, ISubGuiListener { public String line; diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java index 0fe589c8f..5b4693a10 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiNPCEventScripts.java @@ -39,7 +39,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -63,7 +63,7 @@ public class GuiNPCEventScripts extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java index 5ab933754..6f0927cbc 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptAllNPCs.java @@ -35,7 +35,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -59,7 +59,7 @@ public class GuiScriptAllNPCs extends GuiScriptInterface { } public void save() { - if(loaded){ + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java index 0f0fbc192..d5a5f3f86 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptBlock.java @@ -34,7 +34,7 @@ public class GuiScriptBlock extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); BlockScriptPacket.Save(tileScripted.xCoord, tileScripted.yCoord, tileScripted.zCoord, this.tileScripted.getNBT(new NBTTagCompound())); } 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 5348a6958..33582ad88 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptEffect.java @@ -11,12 +11,29 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.global.GuiNPCManageEffects; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +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.controllers.ScriptContainer; import noppes.npcs.controllers.data.CustomEffect; import noppes.npcs.controllers.data.EffectScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -315,7 +332,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -354,7 +371,7 @@ public class GuiScriptEffect extends GuiNPCInterface implements GuiYesNoCallback } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java index e8460a6ce..aea39d1a5 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptForge.java @@ -65,7 +65,7 @@ public class GuiScriptForge extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -89,7 +89,7 @@ public class GuiScriptForge extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java index 5de8a7ba2..f68d5bfa0 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptInterface.java @@ -9,14 +9,31 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.NoppesUtil; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +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.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.ForgeDataScript; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.item.ScriptCustomItem; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -339,7 +356,7 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb } public void save() { - if(loaded) + if (loaded) this.setScript(); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java index 9b12d2bb6..23a29b90c 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptItem.java @@ -49,7 +49,7 @@ public class GuiScriptItem extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); ItemScriptPacket.Save(this.item.getMCNbt()); } diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java index 4d2727de6..664c08d1f 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptLinkedItem.java @@ -11,13 +11,30 @@ import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; import noppes.npcs.client.gui.global.GuiNPCManageLinked; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +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.controllers.ScriptContainer; import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { @@ -327,7 +344,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -367,7 +384,7 @@ public class GuiScriptLinkedItem extends GuiNPCInterface implements GuiYesNoCall } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java index 6948ce89f..501e348d1 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptPlayers.java @@ -91,7 +91,7 @@ public class GuiScriptPlayers extends GuiScriptInterface { } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -115,7 +115,7 @@ public class GuiScriptPlayers extends GuiScriptInterface { } public void save() { - if(loaded) { + if (loaded) { super.save(); List containers = this.script.getScripts(); for (int i = 0; i < containers.size(); i++) { diff --git a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java index 428bb0ee8..bb93052d7 100644 --- a/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java +++ b/src/main/java/noppes/npcs/client/gui/script/GuiScriptRecipe.java @@ -1,6 +1,5 @@ package noppes.npcs.client.gui.script; -import kamkeel.npcs.network.packets.request.script.EffectScriptPacket; import kamkeel.npcs.network.packets.request.script.RecipeScriptPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiConfirmOpenLink; @@ -11,13 +10,31 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import noppes.npcs.NBTTags; import noppes.npcs.NoppesStringUtils; -import noppes.npcs.client.gui.global.GuiNPCManageEffects; import noppes.npcs.client.gui.global.GuiNpcManageRecipes; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiMenuTopButton; +import noppes.npcs.client.gui.util.GuiNPCInterface; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextArea; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiScriptTextArea; +import noppes.npcs.client.gui.util.ICustomScrollListener; +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.controllers.ScriptContainer; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback, IGuiData, ITextChangeListener, ICustomScrollListener, IJTextAreaListener, ITextfieldListener { private int activeTab = 0; @@ -335,7 +352,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback } public void setGuiData(NBTTagCompound compound) { - if(compound.hasKey("LoadComplete")){ + if (compound.hasKey("LoadComplete")) { loaded = true; return; } @@ -374,7 +391,7 @@ public class GuiScriptRecipe extends GuiNPCInterface implements GuiYesNoCallback } public void save() { - if(loaded) { + if (loaded) { this.setScript(); List containers = this.scriptHandler.getScripts(); diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java index a98a80f4d..bfe59e467 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiDialogSelection.java @@ -2,7 +2,13 @@ package noppes.npcs.client.gui.select; import com.google.common.collect.Lists; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.DialogController; import noppes.npcs.controllers.data.Dialog; import noppes.npcs.controllers.data.DialogCategory; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java index 58548069c..72a1da482 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiQuestSelection.java @@ -2,7 +2,13 @@ package noppes.npcs.client.gui.select; import com.google.common.collect.Lists; import net.minecraft.client.gui.GuiButton; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcLabel; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.GuiSelectionListener; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import noppes.npcs.controllers.QuestController; import noppes.npcs.controllers.data.Quest; import noppes.npcs.controllers.data.QuestCategory; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java index e50630526..341b3cc48 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiSoundSelection.java @@ -8,7 +8,11 @@ import net.minecraft.client.audio.SoundRegistry; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.controllers.MusicController; -import noppes.npcs.client.gui.util.*; +import noppes.npcs.client.gui.util.GuiCustomScroll; +import noppes.npcs.client.gui.util.GuiNpcButton; +import noppes.npcs.client.gui.util.GuiNpcTextField; +import noppes.npcs.client.gui.util.ICustomScrollListener; +import noppes.npcs.client.gui.util.SubGuiInterface; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java b/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java index c258c8b24..eb8af18d0 100644 --- a/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java +++ b/src/main/java/noppes/npcs/client/gui/select/GuiTextureSelection.java @@ -6,7 +6,13 @@ import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.resources.*; +import net.minecraft.client.resources.AbstractResourcePack; +import net.minecraft.client.resources.DefaultResourcePack; +import net.minecraft.client.resources.FallbackResourceManager; +import net.minecraft.client.resources.IResourcePack; +import net.minecraft.client.resources.NPCResourceHelper; +import net.minecraft.client.resources.ResourcePackRepository; +import net.minecraft.client.resources.SimpleReloadableResourceManager; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -23,7 +29,12 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java index e8f5d804f..0bf481ffb 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiCustomScroll.java @@ -7,7 +7,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import static noppes.npcs.client.gui.util.GuiNPCInterface.resizingActive; diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java index 83a8a7c01..07822888c 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiDiagram.java @@ -10,9 +10,19 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import java.awt.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Queue; -import java.util.*; +import java.util.Random; +import java.util.Set; +import java.util.TreeMap; /** * Abstract GUI class for drawing diagrams with icons (nodes) and connections (arrows). diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java index 2471ef0a6..14f083b01 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiHoverText.java @@ -6,8 +6,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; public class GuiHoverText extends GuiScreen { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java index b0434d542..629fa6b92 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNPCStringSlot.java @@ -4,7 +4,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiSlot; import net.minecraft.client.renderer.Tessellator; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; public class GuiNPCStringSlot extends GuiSlot { diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index 5b8fe32c7..95708326b 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -92,7 +92,7 @@ public class GuiScriptTextArea extends GuiNpcTextField { } int startBracket = 0, endBracket = 0; if (startSelection >= 0 && startSelection < text.length() && - (endSelection - startSelection == 1 || startSelection == endSelection)) { + (endSelection - startSelection == 1 || startSelection == endSelection)) { char c = text.charAt(startSelection); int found = 0; if (c == '{') { diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index f4d92a8dd..6c6cc623d 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -13,13 +13,32 @@ import noppes.npcs.api.ISkinOverlay; import noppes.npcs.client.ClientCacheHandler; import noppes.npcs.client.model.animation.AniCrawling; import noppes.npcs.client.model.animation.AniHug; -import noppes.npcs.client.model.part.*; +import noppes.npcs.client.model.part.ModelBeard; +import noppes.npcs.client.model.part.ModelBodywear; +import noppes.npcs.client.model.part.ModelBreasts; +import noppes.npcs.client.model.part.ModelClaws; +import noppes.npcs.client.model.part.ModelEars; +import noppes.npcs.client.model.part.ModelFin; +import noppes.npcs.client.model.part.ModelHair; +import noppes.npcs.client.model.part.ModelHeadwear; +import noppes.npcs.client.model.part.ModelHorns; +import noppes.npcs.client.model.part.ModelLegs; +import noppes.npcs.client.model.part.ModelLimbWear; +import noppes.npcs.client.model.part.ModelMohawk; +import noppes.npcs.client.model.part.ModelSkirt; +import noppes.npcs.client.model.part.ModelSnout; +import noppes.npcs.client.model.part.ModelTail; +import noppes.npcs.client.model.part.ModelWings; import noppes.npcs.client.model.util.ModelPartInterface; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.client.renderer.ImageData; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.constants.EnumAnimationPart; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.AnimationData; +import noppes.npcs.controllers.data.Frame; +import noppes.npcs.controllers.data.FramePart; +import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.data.ModelPartData; import noppes.npcs.entity.data.ModelScalePart; diff --git a/src/main/java/noppes/npcs/client/model/ModelPony.java b/src/main/java/noppes/npcs/client/model/ModelPony.java index 0babe5f74..b0d23b40a 100644 --- a/src/main/java/noppes/npcs/client/model/ModelPony.java +++ b/src/main/java/noppes/npcs/client/model/ModelPony.java @@ -20,6 +20,7 @@ import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; import java.io.IOException; +import java.io.InputStream; public class ModelPony extends ModelBase { @@ -762,23 +763,23 @@ public class ModelPony extends ModelBase { pony.isPegasus = false; pony.isUnicorn = false; Color color = new Color(bufferedimage.getRGB(0, 0), true); - Color color1 = new Color(249, 177, 49, 255); - Color color2 = new Color(136, 202, 240, 255); - Color color3 = new Color(209, 159, 228, 255); - Color color4 = new Color(254, 249, 252, 255); - if (color.equals(color1)) { - } - if (color.equals(color2)) { - pony.isPegasus = true; - } - if (color.equals(color3)) { - pony.isUnicorn = true; - } - if (color.equals(color4)) { - pony.isPegasus = true; - pony.isUnicorn = true; - } - pony.checked = pony.textureLocation; + Color color1 = new Color(249, 177, 49, 255); + Color color2 = new Color(136, 202, 240, 255); + Color color3 = new Color(209, 159, 228, 255); + Color color4 = new Color(254, 249, 252, 255); + if (color.equals(color1)) { + } + if (color.equals(color2)) { + pony.isPegasus = true; + } + if (color.equals(color3)) { + pony.isUnicorn = true; + } + if (color.equals(color4)) { + pony.isPegasus = true; + pony.isUnicorn = true; + } + pony.checked = pony.textureLocation; } } catch (IOException e) { diff --git a/src/main/java/noppes/npcs/client/model/part/ModelTail.java b/src/main/java/noppes/npcs/client/model/part/ModelTail.java index d49eb565f..8b555e190 100644 --- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java +++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java @@ -7,7 +7,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.ClientProxy; import noppes.npcs.client.model.ModelMPM; -import noppes.npcs.client.model.part.tails.*; +import noppes.npcs.client.model.part.tails.ModelCanineTail; +import noppes.npcs.client.model.part.tails.ModelDragonTail; +import noppes.npcs.client.model.part.tails.ModelFeatherTail; +import noppes.npcs.client.model.part.tails.ModelMonkeyTail; +import noppes.npcs.client.model.part.tails.ModelRodentTail; +import noppes.npcs.client.model.part.tails.ModelSquirrelTail; +import noppes.npcs.client.model.part.tails.ModelTailFin; import noppes.npcs.client.model.util.ModelScaleRenderer; import noppes.npcs.constants.EnumAnimation; import noppes.npcs.controllers.data.TintData; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java index dcd19ce2d..452627bad 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCHumanMale.java @@ -8,7 +8,11 @@ import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemStack; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java index ab847d0e5..a82ba93a8 100644 --- a/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java +++ b/src/main/java/noppes/npcs/client/renderer/RenderNPCPony.java @@ -11,8 +11,12 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import noppes.npcs.client.model.ModelPony; import noppes.npcs.client.model.ModelPonyArmor; @@ -99,23 +103,23 @@ public class RenderNPCPony extends RenderNPCInterface { pony.isPegasus = false; pony.isUnicorn = false; - Color color = new Color(bufferedimage.getRGB(0, 0), true); - Color color1 = new Color(249, 177, 49, 255); - Color color2 = new Color(136, 202, 240, 255); - Color color3 = new Color(209, 159, 228, 255); - Color color4 = new Color(254, 249, 252, 255); - if (color.equals(color1)) { - } - if (color.equals(color2)) { - pony.isPegasus = true; - } - if (color.equals(color3)) { - pony.isUnicorn = true; - } - if (color.equals(color4)) { - pony.isPegasus = true; - pony.isUnicorn = true; - } + Color color = new Color(bufferedimage.getRGB(0, 0), true); + Color color1 = new Color(249, 177, 49, 255); + Color color2 = new Color(136, 202, 240, 255); + Color color3 = new Color(209, 159, 228, 255); + Color color4 = new Color(254, 249, 252, 255); + if (color.equals(color1)) { + } + if (color.equals(color2)) { + pony.isPegasus = true; + } + if (color.equals(color3)) { + pony.isUnicorn = true; + } + if (color.equals(color4)) { + pony.isPegasus = true; + pony.isUnicorn = true; + } pony.checked = loc; } } catch (IOException e) { diff --git a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java index 9933d47d7..5bff9a1cb 100644 --- a/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java +++ b/src/main/java/noppes/npcs/client/renderer/blocks/BlockCouchWoolRenderer.java @@ -12,8 +12,19 @@ import net.minecraft.util.ResourceLocation; import noppes.npcs.CustomItems; import noppes.npcs.blocks.BlockCouchWool; import noppes.npcs.blocks.tiles.TileCouchWool; -import noppes.npcs.client.model.blocks.couch.*; -import noppes.npcs.client.model.blocks.legacy.couch.*; +import noppes.npcs.client.model.blocks.couch.ModelCouchCorner; +import noppes.npcs.client.model.blocks.couch.ModelCouchLeft; +import noppes.npcs.client.model.blocks.couch.ModelCouchMiddle; +import noppes.npcs.client.model.blocks.couch.ModelCouchRight; +import noppes.npcs.client.model.blocks.couch.ModelCouchSingle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchCorner; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchCornerWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchLeft; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchLeftWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchMiddle; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchMiddleWool; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchRight; +import noppes.npcs.client.model.blocks.legacy.couch.ModelLegacyCouchRightWool; import noppes.npcs.config.ConfigClient; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -119,13 +130,12 @@ public class BlockCouchWoolRenderer extends BlockRendererInterface { float[] color = ColorUtil.hexToRGB(tile.color); GL11.glColor3f(color[0], color[1], color[2]); - if (tile.hasCornerLeft){ + if (tile.hasCornerLeft) { GL11.glPushMatrix(); GL11.glRotatef(270, 0, 1, 0); modelCouchCorner.Cussion.render(0.0625F); GL11.glPopMatrix(); - } - else if (tile.hasCornerRight) + } else if (tile.hasCornerRight) modelCouchCorner.Cussion.render(0.0625F); else if (tile.hasLeft && tile.hasRight) modelCouch.Cussion.render(0.0625F); diff --git a/src/main/java/noppes/npcs/config/ConfigScript.java b/src/main/java/noppes/npcs/config/ConfigScript.java index 91d65ec41..15c2b9ca0 100644 --- a/src/main/java/noppes/npcs/config/ConfigScript.java +++ b/src/main/java/noppes/npcs/config/ConfigScript.java @@ -161,7 +161,7 @@ public class ConfigScript { if (ExpandedScriptLimit < 0) ExpandedScriptLimit = 0; - if(ActionManagerTickDefault < 0){ + if (ActionManagerTickDefault < 0) { ActionManagerTickDefault = 1; } diff --git a/src/main/java/noppes/npcs/config/GlyphCache.java b/src/main/java/noppes/npcs/config/GlyphCache.java index a62e4154d..98474c493 100644 --- a/src/main/java/noppes/npcs/config/GlyphCache.java +++ b/src/main/java/noppes/npcs/config/GlyphCache.java @@ -14,8 +14,11 @@ import java.io.InputStream; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.IntBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; -import java.util.*; /** * @author https://github.com/secretdataz/BetterFonts diff --git a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java index 608824c08..8c1995b8a 100644 --- a/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java +++ b/src/main/java/noppes/npcs/config/legacy/LegacyLoader.java @@ -2,7 +2,12 @@ package noppes.npcs.config.legacy; import noppes.npcs.LogWriter; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; import java.lang.reflect.Field; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java index 49f284b12..dc7026a06 100644 --- a/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java +++ b/src/main/java/noppes/npcs/containers/ContainerAnvilRepair.java @@ -3,7 +3,12 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import noppes.npcs.EventHooks; diff --git a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java index 59e6a720d..898bbfdc4 100644 --- a/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java +++ b/src/main/java/noppes/npcs/containers/ContainerCarpentryBench.java @@ -3,15 +3,21 @@ package noppes.npcs.containers; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.*; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.ICrafting; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCraftResult; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.inventory.Slot; +import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.ItemStack; import net.minecraft.network.play.server.S2FPacketSetSlot; import net.minecraft.world.World; import noppes.npcs.CustomItems; import noppes.npcs.EventHooks; -import noppes.npcs.scripted.event.RecipeScriptEvent; import noppes.npcs.controllers.RecipeController; import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.scripted.event.RecipeScriptEvent; public class ContainerCarpentryBench extends Container { public InventoryCrafting craftMatrix = new InventoryCrafting(this, 4, 4); diff --git a/src/main/java/noppes/npcs/controllers/AnimationController.java b/src/main/java/noppes/npcs/controllers/AnimationController.java index a25947cfe..65adfcd3d 100644 --- a/src/main/java/noppes/npcs/controllers/AnimationController.java +++ b/src/main/java/noppes/npcs/controllers/AnimationController.java @@ -10,7 +10,12 @@ import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.controllers.data.Animation; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java index 167af222a..d1036dc70 100644 --- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java +++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java @@ -18,7 +18,12 @@ import noppes.npcs.controllers.data.EffectScript; import noppes.npcs.controllers.data.PlayerEffect; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import java.util.Map; diff --git a/src/main/java/noppes/npcs/controllers/DialogController.java b/src/main/java/noppes/npcs/controllers/DialogController.java index 456f74335..3490735f3 100644 --- a/src/main/java/noppes/npcs/controllers/DialogController.java +++ b/src/main/java/noppes/npcs/controllers/DialogController.java @@ -19,7 +19,11 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class DialogController implements IDialogHandler { public HashMap categoriesSync = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/FactionController.java b/src/main/java/noppes/npcs/controllers/FactionController.java index 995fddd13..9ddf860ea 100644 --- a/src/main/java/noppes/npcs/controllers/FactionController.java +++ b/src/main/java/noppes/npcs/controllers/FactionController.java @@ -11,7 +11,12 @@ import noppes.npcs.api.handler.IFactionHandler; import noppes.npcs.api.handler.data.IFaction; import noppes.npcs.controllers.data.Faction; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/noppes/npcs/controllers/LinkedItemController.java b/src/main/java/noppes/npcs/controllers/LinkedItemController.java index d97948b49..c2bc19044 100644 --- a/src/main/java/noppes/npcs/controllers/LinkedItemController.java +++ b/src/main/java/noppes/npcs/controllers/LinkedItemController.java @@ -12,7 +12,12 @@ import noppes.npcs.controllers.data.LinkedItem; import noppes.npcs.controllers.data.LinkedItemScript; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.HashMap; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/noppes/npcs/controllers/MagicController.java b/src/main/java/noppes/npcs/controllers/MagicController.java index b18b9de70..40febf172 100644 --- a/src/main/java/noppes/npcs/controllers/MagicController.java +++ b/src/main/java/noppes/npcs/controllers/MagicController.java @@ -15,7 +15,12 @@ import noppes.npcs.controllers.data.Magic; import noppes.npcs.controllers.data.MagicAssociation; import noppes.npcs.controllers.data.MagicCycle; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.HashMap; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/noppes/npcs/controllers/PlayerDataController.java b/src/main/java/noppes/npcs/controllers/PlayerDataController.java index c779b8a95..c8964b31d 100644 --- a/src/main/java/noppes/npcs/controllers/PlayerDataController.java +++ b/src/main/java/noppes/npcs/controllers/PlayerDataController.java @@ -12,11 +12,20 @@ import net.minecraft.util.ChatComponentText; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.config.ConfigMain; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.Bank; +import noppes.npcs.controllers.data.PlayerBankData; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDataScript; +import noppes.npcs.controllers.data.PlayerMail; import noppes.npcs.util.CacheHashMap; import noppes.npcs.util.NBTJsonUtil; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/noppes/npcs/controllers/QuestController.java b/src/main/java/noppes/npcs/controllers/QuestController.java index 8fd507ac7..72688b7e5 100644 --- a/src/main/java/noppes/npcs/controllers/QuestController.java +++ b/src/main/java/noppes/npcs/controllers/QuestController.java @@ -18,7 +18,11 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; public class QuestController implements IQuestHandler { public HashMap categoriesSync = new HashMap(); diff --git a/src/main/java/noppes/npcs/controllers/RecipeController.java b/src/main/java/noppes/npcs/controllers/RecipeController.java index 28b67ddeb..7fccdec93 100644 --- a/src/main/java/noppes/npcs/controllers/RecipeController.java +++ b/src/main/java/noppes/npcs/controllers/RecipeController.java @@ -11,13 +11,20 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.api.handler.IRecipeHandler; import noppes.npcs.api.handler.data.IAnvilRecipe; import noppes.npcs.api.handler.data.IRecipe; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.RecipeAnvil; +import noppes.npcs.controllers.data.RecipeCarpentry; +import noppes.npcs.controllers.data.RecipeScript; +import noppes.npcs.controllers.data.RecipesDefault; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; public class RecipeController implements IRecipeHandler { private static Collection prevRecipes; @@ -278,7 +285,7 @@ public class RecipeController implements IRecipeHandler { SyncController.syncAllWorkbenchRecipes(); RecipeCarpentry carpentry = carpentryRecipes.remove(recipe.id); - if (carpentry != null){ + if (carpentry != null) { carpentryScripts.remove(recipe.id); SyncController.syncAllCarpentryRecipes(); } diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 523ad8ba9..3ea46b6a7 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -9,11 +9,20 @@ import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.NpcAPI; -import javax.script.*; +import javax.script.Compilable; +import javax.script.CompiledScript; +import javax.script.ScriptContext; +import javax.script.ScriptEngine; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; public class ScriptContainer { private static final String lock = "lock"; diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index 86cd950b9..d4246440b 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -30,7 +30,12 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static noppes.npcs.util.CustomNPCsThreader.customNPCThread; diff --git a/src/main/java/noppes/npcs/controllers/ServerCloneController.java b/src/main/java/noppes/npcs/controllers/ServerCloneController.java index da58101cc..ea61a0112 100644 --- a/src/main/java/noppes/npcs/controllers/ServerCloneController.java +++ b/src/main/java/noppes/npcs/controllers/ServerCloneController.java @@ -22,7 +22,14 @@ import noppes.npcs.util.NBTJsonUtil; import java.io.File; import java.io.FileInputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; public class ServerCloneController implements ICloneHandler { public static ServerCloneController Instance; diff --git a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java index 886fdfcfe..0221481e3 100644 --- a/src/main/java/noppes/npcs/controllers/ServerTagMapController.java +++ b/src/main/java/noppes/npcs/controllers/ServerTagMapController.java @@ -6,7 +6,12 @@ import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.controllers.data.TagMap; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; import java.util.zip.GZIPInputStream; public class ServerTagMapController { diff --git a/src/main/java/noppes/npcs/controllers/SpawnController.java b/src/main/java/noppes/npcs/controllers/SpawnController.java index 1608825f5..7a04d788d 100644 --- a/src/main/java/noppes/npcs/controllers/SpawnController.java +++ b/src/main/java/noppes/npcs/controllers/SpawnController.java @@ -10,8 +10,17 @@ import noppes.npcs.api.handler.INaturalSpawnsHandler; import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.controllers.data.SpawnData; -import java.io.*; -import java.util.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.zip.GZIPInputStream; public class SpawnController implements INaturalSpawnsHandler { diff --git a/src/main/java/noppes/npcs/controllers/TagController.java b/src/main/java/noppes/npcs/controllers/TagController.java index 14fd6b066..cbd2ed006 100644 --- a/src/main/java/noppes/npcs/controllers/TagController.java +++ b/src/main/java/noppes/npcs/controllers/TagController.java @@ -9,8 +9,18 @@ import noppes.npcs.api.handler.ITagHandler; import noppes.npcs.api.handler.data.ITag; import noppes.npcs.controllers.data.Tag; -import java.io.*; -import java.util.*; +import java.io.BufferedInputStream; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.UUID; import java.util.zip.GZIPInputStream; public class TagController implements ITagHandler { diff --git a/src/main/java/noppes/npcs/controllers/data/Availability.java b/src/main/java/noppes/npcs/controllers/data/Availability.java index ffc59bd3f..dcf5dacd6 100644 --- a/src/main/java/noppes/npcs/controllers/data/Availability.java +++ b/src/main/java/noppes/npcs/controllers/data/Availability.java @@ -10,7 +10,11 @@ import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IAvailability; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAvailabilityDialog; +import noppes.npcs.constants.EnumAvailabilityFaction; +import noppes.npcs.constants.EnumAvailabilityFactionType; +import noppes.npcs.constants.EnumAvailabilityQuest; +import noppes.npcs.constants.EnumDayTime; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.PlayerQuestController; import noppes.npcs.controllers.QuestController; diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java index 514da2dac..bf4327d38 100644 --- a/src/main/java/noppes/npcs/controllers/data/DataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java @@ -27,7 +27,13 @@ import noppes.npcs.scripted.constants.RoleType; import noppes.npcs.scripted.entity.ScriptNpc; import javax.script.ScriptEngine; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class DataScript implements INpcScriptHandler { public List eventScripts = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/Dialog.java b/src/main/java/noppes/npcs/controllers/data/Dialog.java index 884822098..e68fe717e 100644 --- a/src/main/java/noppes/npcs/controllers/data/Dialog.java +++ b/src/main/java/noppes/npcs/controllers/data/Dialog.java @@ -5,7 +5,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.ICompatibilty; import noppes.npcs.VersionCompatibility; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAvailability; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IDialogCategory; +import noppes.npcs.api.handler.data.IDialogImage; +import noppes.npcs.api.handler.data.IDialogOption; +import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumOptionType; import noppes.npcs.controllers.DialogController; diff --git a/src/main/java/noppes/npcs/controllers/data/EffectScript.java b/src/main/java/noppes/npcs/controllers/data/EffectScript.java index a6e66bec8..bd2b75dae 100644 --- a/src/main/java/noppes/npcs/controllers/data/EffectScript.java +++ b/src/main/java/noppes/npcs/controllers/data/EffectScript.java @@ -13,7 +13,12 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.scripted.event.player.PlayerEvent; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class EffectScript implements INpcScriptHandler { public ScriptContainer container; diff --git a/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java b/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java index c1a468279..335256e0f 100644 --- a/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/GlobalNPCDataScript.java @@ -15,7 +15,16 @@ import noppes.npcs.scripted.NpcAPI; import javax.annotation.CheckForNull; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.TreeMap; public class GlobalNPCDataScript implements INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java index 64c3dd7ff..cce8df255 100644 --- a/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java +++ b/src/main/java/noppes/npcs/controllers/data/LinkedItemScript.java @@ -12,7 +12,12 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class LinkedItemScript implements INpcScriptHandler { public ScriptContainer container; diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 66988a104..0fa6449ff 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -23,7 +23,11 @@ import noppes.npcs.controllers.QuestController; import java.io.BufferedReader; import java.io.InputStreamReader; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.UUID; public class Party implements IParty { private final UUID partyUUID; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerData.java b/src/main/java/noppes/npcs/controllers/data/PlayerData.java index 07cc91a1d..5f6a5e00d 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerData.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerData.java @@ -16,7 +16,14 @@ import net.minecraftforge.common.IExtendedEntityProperties; import noppes.npcs.CustomNpcs; import noppes.npcs.LogWriter; import noppes.npcs.api.entity.ICustomNpc; -import noppes.npcs.api.handler.*; +import noppes.npcs.api.handler.IPlayerBankData; +import noppes.npcs.api.handler.IPlayerData; +import noppes.npcs.api.handler.IPlayerDialogData; +import noppes.npcs.api.handler.IPlayerFactionData; +import noppes.npcs.api.handler.IPlayerItemGiverData; +import noppes.npcs.api.handler.IPlayerMailData; +import noppes.npcs.api.handler.IPlayerQuestData; +import noppes.npcs.api.handler.IPlayerTransportData; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumRoleType; import noppes.npcs.controllers.CustomEffectController; diff --git a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java index 2a8efced4..a425bdcd4 100644 --- a/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java +++ b/src/main/java/noppes/npcs/controllers/data/PlayerDataScript.java @@ -17,8 +17,18 @@ import noppes.npcs.scripted.event.player.PlayerEvent; import javax.annotation.CheckForNull; import java.lang.reflect.Array; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.OptionalDouble; +import java.util.OptionalInt; +import java.util.OptionalLong; +import java.util.TreeMap; public class PlayerDataScript implements INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/controllers/data/Quest.java b/src/main/java/noppes/npcs/controllers/data/Quest.java index 02f3e3f87..1f9097d8a 100644 --- a/src/main/java/noppes/npcs/controllers/data/Quest.java +++ b/src/main/java/noppes/npcs/controllers/data/Quest.java @@ -6,19 +6,34 @@ import kamkeel.npcs.network.packets.data.QuestCompletionPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.*; +import noppes.npcs.ICompatibilty; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.NpcMiscInventory; +import noppes.npcs.VersionCompatibility; import noppes.npcs.api.IContainer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.IPlayerData; import noppes.npcs.api.handler.IPlayerQuestData; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IPartyOptions; +import noppes.npcs.api.handler.data.IProfileOptions; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.handler.data.IQuestCategory; +import noppes.npcs.api.handler.data.IQuestInterface; +import noppes.npcs.api.handler.data.IQuestObjective; +import noppes.npcs.api.handler.data.ISlot; import noppes.npcs.config.ConfigMain; import noppes.npcs.constants.EnumProfileSync; import noppes.npcs.constants.EnumQuestCompletion; import noppes.npcs.constants.EnumQuestRepeat; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.controllers.QuestController; -import noppes.npcs.quests.*; +import noppes.npcs.quests.QuestDialog; +import noppes.npcs.quests.QuestInterface; +import noppes.npcs.quests.QuestItem; +import noppes.npcs.quests.QuestKill; +import noppes.npcs.quests.QuestLocation; +import noppes.npcs.quests.QuestManual; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java index 7809f63a7..f2bd33807 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeAnvil.java @@ -164,6 +164,7 @@ public class RecipeAnvil implements IAnvilRecipe { this.repairPercentage = recipe.repairPercentage; this.xpCost = recipe.xpCost; } + public RecipeScript getScriptHandler() { return RecipeController.Instance.anvilScripts.get(this.id); } diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java index ff574f133..5821b99a6 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeCarpentry.java @@ -47,7 +47,7 @@ public class RecipeCarpentry extends ShapedRecipes implements IRecipe { this.ignoreNBT = compound.getBoolean("IgnoreNBT"); this.isGlobal = compound.getBoolean("Global"); - if(!isGlobal){ + if (!isGlobal) { if (compound.hasKey("ScriptData", Constants.NBT.TAG_COMPOUND)) { RecipeScript handler = new RecipeScript(); handler.readFromNBT(compound.getCompoundTag("ScriptData")); diff --git a/src/main/java/noppes/npcs/controllers/data/RecipeScript.java b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java index 7095b02a5..b94acfbc6 100644 --- a/src/main/java/noppes/npcs/controllers/data/RecipeScript.java +++ b/src/main/java/noppes/npcs/controllers/data/RecipeScript.java @@ -12,7 +12,11 @@ import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.ScriptController; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; public class RecipeScript implements INpcScriptHandler { public ScriptContainer container; @@ -147,6 +151,7 @@ public class RecipeScript implements INpcScriptHandler { PRE("pre"), POST("post"); public final String function; + ScriptType(String functionName) { this.function = functionName; } diff --git a/src/main/java/noppes/npcs/controllers/data/SpawnData.java b/src/main/java/noppes/npcs/controllers/data/SpawnData.java index 821a0e3aa..f82d9b225 100644 --- a/src/main/java/noppes/npcs/controllers/data/SpawnData.java +++ b/src/main/java/noppes/npcs/controllers/data/SpawnData.java @@ -12,7 +12,13 @@ import noppes.npcs.api.handler.data.INaturalSpawn; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public class SpawnData extends WeightedRandom.Item implements INaturalSpawn { public List biomes = new ArrayList<>(); diff --git a/src/main/java/noppes/npcs/controllers/data/TagMap.java b/src/main/java/noppes/npcs/controllers/data/TagMap.java index 073439d50..e4c0ad57f 100644 --- a/src/main/java/noppes/npcs/controllers/data/TagMap.java +++ b/src/main/java/noppes/npcs/controllers/data/TagMap.java @@ -4,7 +4,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.UUID; public class TagMap { public int cloneTab; diff --git a/src/main/java/noppes/npcs/controllers/data/action/Action.java b/src/main/java/noppes/npcs/controllers/data/action/Action.java index aa24e6710..729603019 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/Action.java +++ b/src/main/java/noppes/npcs/controllers/data/action/Action.java @@ -2,7 +2,6 @@ package noppes.npcs.controllers.data.action; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.data.IAction; -import noppes.npcs.api.handler.data.IActionListener; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; @@ -505,6 +504,7 @@ public class Action implements IAction { } return null; } + @Override public IAction after(IAction after) { if (after instanceof IConditionalAction) @@ -637,6 +637,7 @@ public class Action implements IAction { for (Consumer task : tasks) parallel(task); } + @Override public IAction parallel(int delay, Consumer task) { return parallel(manager.create(delay, task)); diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java index 8cee13544..68a44ad43 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionList.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionList.java @@ -1,6 +1,5 @@ package noppes.npcs.controllers.data.action; -import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; import java.util.LinkedList; diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java index c249a6b2c..01b557a5e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionListener.java @@ -4,7 +4,8 @@ import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionListener; import noppes.npcs.api.handler.data.IActionQueue; -import java.util.*; +import java.util.Iterator; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class ActionListener implements IActionListener { @@ -38,17 +39,17 @@ public class ActionListener implements IActionListener { return object; } -// @Override + // @Override public Hook getOrCreateHook(String hookName) { return hooks.computeIfAbsent(hookName, Hook::new); } -// @Override + // @Override public Hook getHook(String hookName) { return hooks.get(hookName); } -// @Override + // @Override public boolean fire(String hookName) { Hook hook = hooks.get(hookName); if (hook != null) { diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java index 11a9b3344..753419970 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionLogger.java @@ -4,11 +4,15 @@ import noppes.npcs.LogWriter; import noppes.npcs.api.handler.data.IAction; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.config.ConfigDebug; -import noppes.npcs.config.ConfigScript; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Date; +import java.util.Deque; +import java.util.List; +import java.util.ListIterator; public class ActionLogger { // private final Map> snapshot = new HashMap<>(); @@ -138,7 +142,7 @@ public class ActionLogger { private static final String ANSI_RESET = "\u001B[0m"; public void println(String str) { - if(ConfigDebug.LogActionManager) + if (ConfigDebug.LogActionManager) System.out.printf("[%tT] %s[%s]:%s %s%s%n", new Date(), ANSI_CYAN, Thread.currentThread().getName(), ANSI_GOLD, str, ANSI_RESET); } diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java index 0b62ddce0..7f4e8412e 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionManager.java @@ -9,7 +9,11 @@ import noppes.npcs.api.handler.data.actions.IConditionalAction; import noppes.npcs.controllers.ScriptContainer; import noppes.npcs.controllers.data.action.action.ConditionalAction; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Consumer; import java.util.function.Function; @@ -38,7 +42,8 @@ public class ActionManager implements IActionManager { protected boolean debug = false; protected ScriptContainer reportTo; - public ActionManager() {} + public ActionManager() { + } public ActionManager(String name) { this.name = name; @@ -130,6 +135,7 @@ public class ActionManager implements IActionManager { public IAction create(int maxDuration, int delay, Consumer task) { return new Action(this, maxDuration, delay, task); } + @Override public IAction create(String name, int maxDuration, int delay, Consumer task) { return new Action(this, name, maxDuration, delay, task); @@ -151,32 +157,32 @@ public class ActionManager implements IActionManager { } @Override - public IConditionalAction create(Function condition, Consumer task) { + public IConditionalAction create(Function condition, Consumer task) { return new ConditionalAction(this, condition, task); } @Override - public IConditionalAction create(String name,Function condition, Consumer task) { + public IConditionalAction create(String name, Function condition, Consumer task) { return new ConditionalAction(this, name, condition, task); } @Override - public IConditionalAction create(Function condition, Consumer task,Function terminateWhen) { + public IConditionalAction create(Function condition, Consumer task, Function terminateWhen) { return new ConditionalAction(this, condition, task, terminateWhen); } @Override - public IConditionalAction create(String name,Function condition, Consumer task,Function terminateWhen) { + public IConditionalAction create(String name, Function condition, Consumer task, Function terminateWhen) { return new ConditionalAction(this, name, condition, task, terminateWhen); } @Override - public IConditionalAction create(Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { + public IConditionalAction create(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return new ConditionalAction(this, condition, task, terminateWhen, onTermination); } @Override - public IConditionalAction create(String name,Function condition, Consumer task,Function terminateWhen, Consumer onTermination) { + public IConditionalAction create(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return new ConditionalAction(this, name, condition, task, terminateWhen, onTermination); } @@ -277,6 +283,7 @@ public class ActionManager implements IActionManager { public IAction schedule(String name, Consumer task) { return sequentialQueue.schedule(name, task); } + @Override public IAction schedule(String name, int delay, Consumer task) { return sequentialQueue.schedule(name, delay, task); @@ -335,6 +342,7 @@ public class ActionManager implements IActionManager { public IAction scheduleParallel(String name, Consumer task) { return parallelQueue.schedule(name, task); } + @Override public IAction scheduleParallel(String name, int delay, Consumer task) { return parallelQueue.schedule(delay, task); @@ -365,33 +373,33 @@ public class ActionManager implements IActionManager { } @Override - public IConditionalAction schedule(Function condition, Consumer task) { + public IConditionalAction schedule(Function condition, Consumer task) { return schedule(new ConditionalAction(this, condition, task)); } @Override - public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen) { return schedule(new ConditionalAction(this, condition, task, terminateWhen)); } @Override - public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + public IConditionalAction schedule(Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return schedule(new ConditionalAction(this, condition, task, terminateWhen, onTermination)); } @Override - public IConditionalAction schedule(String name, Function condition, Consumer task) { + public IConditionalAction schedule(String name, Function condition, Consumer task) { return schedule(new ConditionalAction(this, name, condition, task)); } @Override - public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen) { return schedule(new ConditionalAction(this, name, condition, task, terminateWhen)); } @Override - public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { + public IConditionalAction schedule(String name, Function condition, Consumer task, Function terminateWhen, Consumer onTermination) { return schedule(new ConditionalAction(this, name, condition, task, terminateWhen, onTermination)); } @@ -415,6 +423,7 @@ public class ActionManager implements IActionManager { public boolean hasActiveTasks() { return Arrays.stream(getAllQueues()).anyMatch(queue -> queue.hasActiveTasks()); } + @Override public boolean hasAny(String name) { return getAny(name) != null; @@ -503,7 +512,7 @@ public class ActionManager implements IActionManager { // } if (debug && active) - LOGGER.finish("Finished Tick Cycle",this); + LOGGER.finish("Finished Tick Cycle", this); } @Override diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java index 0a20f4a5a..0b3d0b483 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionQueue.java @@ -6,7 +6,11 @@ import noppes.npcs.api.handler.data.IActionChain; import noppes.npcs.api.handler.data.IActionQueue; import noppes.npcs.controllers.data.action.chain.ActionChain; -import java.util.*; +import java.util.ArrayList; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.Queue; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.function.Consumer; @@ -47,6 +51,7 @@ public class ActionQueue implements IActionQueue { isWorking = false; return this; } + @Override public IActionManager getManager() { return manager; @@ -289,6 +294,7 @@ public class ActionQueue implements IActionQueue { return false; } + protected boolean tick(Action a) { if (a == null) return false; @@ -315,7 +321,7 @@ public class ActionQueue implements IActionQueue { if (!isParallel) { if (tick((Action) getCurrentAction())) - queue.pollFirst(); + queue.pollFirst(); } else { Iterator pit = queue.iterator(); while (pit.hasNext()) diff --git a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java index 813efd476..37e06c982 100644 --- a/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java +++ b/src/main/java/noppes/npcs/controllers/data/action/ActionThread.java @@ -4,7 +4,11 @@ import noppes.npcs.api.handler.data.IAction; import java.util.Queue; import java.util.Set; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; diff --git a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java index 77f78bda6..bc35d2038 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCInterface.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCInterface.java @@ -21,9 +21,24 @@ import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; import net.minecraft.command.ICommandSender; import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.*; +import net.minecraft.entity.DataWatcher; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityCreature; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.EnumCreatureAttribute; +import net.minecraft.entity.IRangedAttackMob; +import net.minecraft.entity.NPCEntityHelper; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.EntityAIAttackOnCollide; +import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.ai.EntityAIHurtByTarget; +import net.minecraft.entity.ai.EntityAILeapAtTarget; +import net.minecraft.entity.ai.EntityAIOpenDoor; +import net.minecraft.entity.ai.EntityAIRestrictSun; +import net.minecraft.entity.ai.EntityAISwimming; +import net.minecraft.entity.ai.EntityAITasks; import net.minecraft.entity.ai.EntityAITasks.EntityAITaskEntry; +import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.entity.boss.IBossDisplayData; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityMob; @@ -42,18 +57,60 @@ import net.minecraft.network.play.server.S0BPacketAnimation; import net.minecraft.pathfinding.PathNavigate; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.ServerChatEvent; -import noppes.npcs.*; +import noppes.npcs.CustomItems; +import noppes.npcs.CustomNpcs; +import noppes.npcs.DataAI; +import noppes.npcs.DataAdvanced; +import noppes.npcs.DataDisplay; +import noppes.npcs.DataInventory; +import noppes.npcs.DataStats; +import noppes.npcs.EventHooks; +import noppes.npcs.IChatMessages; +import noppes.npcs.NBTTags; +import noppes.npcs.NoppesUtilPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.NpcDamageSource; +import noppes.npcs.VersionCompatibility; +import noppes.npcs.ai.CombatHandler; +import noppes.npcs.ai.EntityAIAmbushTarget; +import noppes.npcs.ai.EntityAIAnimation; +import noppes.npcs.ai.EntityAIAttackTarget; +import noppes.npcs.ai.EntityAIAvoidTarget; +import noppes.npcs.ai.EntityAIBustDoor; +import noppes.npcs.ai.EntityAIDodgeShoot; +import noppes.npcs.ai.EntityAIFindShade; +import noppes.npcs.ai.EntityAIFollow; +import noppes.npcs.ai.EntityAIJob; +import noppes.npcs.ai.EntityAILook; import noppes.npcs.ai.EntityAIMoveIndoors; +import noppes.npcs.ai.EntityAIMovingPath; +import noppes.npcs.ai.EntityAIOrbitTarget; import noppes.npcs.ai.EntityAIPanic; +import noppes.npcs.ai.EntityAIPounceTarget; +import noppes.npcs.ai.EntityAIRangedAttack; +import noppes.npcs.ai.EntityAIReturn; +import noppes.npcs.ai.EntityAIRole; +import noppes.npcs.ai.EntityAISprintToTarget; +import noppes.npcs.ai.EntityAIStalkTarget; +import noppes.npcs.ai.EntityAITransform; import noppes.npcs.ai.EntityAIWander; import noppes.npcs.ai.EntityAIWatchClosest; -import noppes.npcs.ai.*; +import noppes.npcs.ai.EntityAIWaterNav; +import noppes.npcs.ai.EntityAIWorldLines; +import noppes.npcs.ai.EntityAIZigZagTarget; import noppes.npcs.ai.pathfinder.FlyingMoveHelper; import noppes.npcs.ai.pathfinder.PathNavigateFlying; import noppes.npcs.ai.selector.NPCAttackSelector; @@ -67,21 +124,46 @@ import noppes.npcs.api.item.IItemStack; import noppes.npcs.client.EntityUtil; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.ConfigScript; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumPotionType; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.LinkedNpcController; import noppes.npcs.controllers.LinkedNpcController.LinkedData; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.data.DataScript; +import noppes.npcs.controllers.data.DataTransform; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.DialogOption; +import noppes.npcs.controllers.data.Faction; +import noppes.npcs.controllers.data.Line; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.data.DataTimers; -import noppes.npcs.roles.*; +import noppes.npcs.roles.JobBard; +import noppes.npcs.roles.JobFollower; +import noppes.npcs.roles.JobInterface; +import noppes.npcs.roles.RoleCompanion; +import noppes.npcs.roles.RoleFollower; +import noppes.npcs.roles.RoleInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.entity.ScriptNpc; import noppes.npcs.scripted.event.NpcEvent; import noppes.npcs.util.GameProfileAlt; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.ConcurrentModificationException; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; public abstract class EntityNPCInterface extends EntityCreature implements IEntityAdditionalSpawnData, ICommandSender, IRangedAttackMob, IBossDisplayData { public ICustomNpc wrappedNPC; diff --git a/src/main/java/noppes/npcs/entity/EntityProjectile.java b/src/main/java/noppes/npcs/entity/EntityProjectile.java index 412d4813c..5391ff487 100644 --- a/src/main/java/noppes/npcs/entity/EntityProjectile.java +++ b/src/main/java/noppes/npcs/entity/EntityProjectile.java @@ -23,8 +23,14 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.play.server.S27PacketExplosion; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.DamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition.MovingObjectType; +import net.minecraft.util.Vec3; import net.minecraft.world.Explosion; import net.minecraft.world.World; import noppes.npcs.DataStats; diff --git a/src/main/java/noppes/npcs/items/ItemNpcTool.java b/src/main/java/noppes/npcs/items/ItemNpcTool.java index 3243fdc29..82d528eb2 100644 --- a/src/main/java/noppes/npcs/items/ItemNpcTool.java +++ b/src/main/java/noppes/npcs/items/ItemNpcTool.java @@ -144,39 +144,39 @@ public class ItemNpcTool extends Item { } public static boolean isPaintbrush(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; - if(itemStack.getItem() == null) + if (itemStack.getItem() == null) return false; - if(!(itemStack.getItem() instanceof ItemNpcTool)) + if (!(itemStack.getItem() instanceof ItemNpcTool)) return false; return itemStack.getItemDamage() == 1; } public static boolean isHammer(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; - if(itemStack.getItem() == null) + if (itemStack.getItem() == null) return false; - if(!(itemStack.getItem() instanceof ItemNpcTool)) + if (!(itemStack.getItem() instanceof ItemNpcTool)) return false; return itemStack.getItemDamage() == 0; } public static boolean isMagicBook(ItemStack itemStack) { - if(itemStack == null) + if (itemStack == null) return false; - if(itemStack.getItem() == null) + if (itemStack.getItem() == null) return false; - if(!(itemStack.getItem() instanceof ItemNpcTool)) + if (!(itemStack.getItem() instanceof ItemNpcTool)) return false; return itemStack.getItemDamage() == 2; diff --git a/src/main/java/noppes/npcs/quests/QuestDialog.java b/src/main/java/noppes/npcs/quests/QuestDialog.java index ea6bf3e73..6bcedde91 100644 --- a/src/main/java/noppes/npcs/quests/QuestDialog.java +++ b/src/main/java/noppes/npcs/quests/QuestDialog.java @@ -16,7 +16,13 @@ import noppes.npcs.controllers.data.Party; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; +import java.util.Vector; public class QuestDialog extends QuestInterface implements IQuestDialog { diff --git a/src/main/java/noppes/npcs/quests/QuestItem.java b/src/main/java/noppes/npcs/quests/QuestItem.java index a9302ff66..1e320258d 100644 --- a/src/main/java/noppes/npcs/quests/QuestItem.java +++ b/src/main/java/noppes/npcs/quests/QuestItem.java @@ -14,7 +14,13 @@ import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.util.ValueUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.Vector; public class QuestItem extends QuestInterface implements IQuestItem { public NpcMiscInventory items = new NpcMiscInventory(3); diff --git a/src/main/java/noppes/npcs/quests/QuestKill.java b/src/main/java/noppes/npcs/quests/QuestKill.java index 70f283938..c83a95209 100644 --- a/src/main/java/noppes/npcs/quests/QuestKill.java +++ b/src/main/java/noppes/npcs/quests/QuestKill.java @@ -15,7 +15,13 @@ import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.Vector; public class QuestKill extends QuestInterface implements IQuestKill { public TreeMap targets = new TreeMap(); diff --git a/src/main/java/noppes/npcs/quests/QuestManual.java b/src/main/java/noppes/npcs/quests/QuestManual.java index 80a59709e..c9b14a165 100644 --- a/src/main/java/noppes/npcs/quests/QuestManual.java +++ b/src/main/java/noppes/npcs/quests/QuestManual.java @@ -14,8 +14,12 @@ import noppes.npcs.controllers.data.PlayerQuestData; import noppes.npcs.controllers.data.QuestData; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map.Entry; +import java.util.TreeMap; +import java.util.Vector; public class QuestManual extends QuestInterface { public TreeMap manuals = new TreeMap(); diff --git a/src/main/java/noppes/npcs/roles/JobSpawner.java b/src/main/java/noppes/npcs/roles/JobSpawner.java index a533a7625..42a509e5a 100644 --- a/src/main/java/noppes/npcs/roles/JobSpawner.java +++ b/src/main/java/noppes/npcs/roles/JobSpawner.java @@ -11,7 +11,11 @@ import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.entity.EntityNPCInterface; import org.apache.commons.lang3.RandomStringUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; public class JobSpawner extends JobInterface { diff --git a/src/main/java/noppes/npcs/roles/RoleCompanion.java b/src/main/java/noppes/npcs/roles/RoleCompanion.java index 39209c238..93fdd9723 100644 --- a/src/main/java/noppes/npcs/roles/RoleCompanion.java +++ b/src/main/java/noppes/npcs/roles/RoleCompanion.java @@ -8,8 +8,13 @@ import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; +import net.minecraft.item.ItemBow; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.DamageSource; @@ -17,14 +22,28 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; import noppes.npcs.NoppesUtilServer; import noppes.npcs.NpcMiscInventory; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCompanionJobs; +import noppes.npcs.constants.EnumCompanionStage; +import noppes.npcs.constants.EnumCompanionTalent; +import noppes.npcs.constants.EnumGuiType; import noppes.npcs.controllers.data.PlayerData; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.companion.*; +import noppes.npcs.roles.companion.CompanionFarmer; +import noppes.npcs.roles.companion.CompanionFoodStats; +import noppes.npcs.roles.companion.CompanionGuard; +import noppes.npcs.roles.companion.CompanionJobInterface; +import noppes.npcs.roles.companion.CompanionTrader; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Random; +import java.util.TreeMap; +import java.util.UUID; public class RoleCompanion extends RoleInterface { public NpcMiscInventory inventory; diff --git a/src/main/java/noppes/npcs/scripted/NpcAPI.java b/src/main/java/noppes/npcs/scripted/NpcAPI.java index 45f6b4644..79a6c2fa6 100644 --- a/src/main/java/noppes/npcs/scripted/NpcAPI.java +++ b/src/main/java/noppes/npcs/scripted/NpcAPI.java @@ -23,7 +23,12 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Items; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEditableBook; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemWritableBook; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagString; @@ -39,12 +44,35 @@ import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeDictionary.Type; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.AbstractNpcAPI; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.ICommand; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.IDamageSource; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ISkinOverlay; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.ICustomNpc; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; -import noppes.npcs.api.handler.*; +import noppes.npcs.api.handler.IActionManager; +import noppes.npcs.api.handler.IAnimationHandler; +import noppes.npcs.api.handler.IAttributeHandler; +import noppes.npcs.api.handler.ICloneHandler; +import noppes.npcs.api.handler.ICustomEffectHandler; +import noppes.npcs.api.handler.IDialogHandler; +import noppes.npcs.api.handler.IFactionHandler; +import noppes.npcs.api.handler.IMagicHandler; +import noppes.npcs.api.handler.INaturalSpawnsHandler; +import noppes.npcs.api.handler.IPartyHandler; +import noppes.npcs.api.handler.IProfileHandler; +import noppes.npcs.api.handler.IQuestHandler; +import noppes.npcs.api.handler.IRecipeHandler; +import noppes.npcs.api.handler.ITransportHandler; import noppes.npcs.api.handler.data.IAnimation; import noppes.npcs.api.handler.data.IFrame; import noppes.npcs.api.handler.data.IFramePart; @@ -55,24 +83,74 @@ import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumAnimationPart; import noppes.npcs.containers.ContainerNpcInterface; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.ChunkController; +import noppes.npcs.controllers.CustomEffectController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.MagicController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.ScriptController; +import noppes.npcs.controllers.ScriptEntityData; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.Animation; +import noppes.npcs.controllers.data.Frame; +import noppes.npcs.controllers.data.FramePart; +import noppes.npcs.controllers.data.SkinOverlay; import noppes.npcs.controllers.data.action.ActionManager; import noppes.npcs.entity.EntityCustomNpc; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.entity.EntityProjectile; import noppes.npcs.items.ItemLinked; import noppes.npcs.items.ItemScripted; -import noppes.npcs.scripted.entity.*; +import noppes.npcs.scripted.entity.ScriptAnimal; +import noppes.npcs.scripted.entity.ScriptArrow; +import noppes.npcs.scripted.entity.ScriptDBCPlayer; +import noppes.npcs.scripted.entity.ScriptEntity; +import noppes.npcs.scripted.entity.ScriptEntityItem; +import noppes.npcs.scripted.entity.ScriptFishHook; +import noppes.npcs.scripted.entity.ScriptLiving; +import noppes.npcs.scripted.entity.ScriptLivingBase; +import noppes.npcs.scripted.entity.ScriptMonster; +import noppes.npcs.scripted.entity.ScriptPixelmon; +import noppes.npcs.scripted.entity.ScriptPlayer; +import noppes.npcs.scripted.entity.ScriptProjectile; +import noppes.npcs.scripted.entity.ScriptThrowable; +import noppes.npcs.scripted.entity.ScriptVillager; import noppes.npcs.scripted.gui.ScriptGui; -import noppes.npcs.scripted.item.*; +import noppes.npcs.scripted.item.ScriptCustomItem; +import noppes.npcs.scripted.item.ScriptItemArmor; +import noppes.npcs.scripted.item.ScriptItemBlock; +import noppes.npcs.scripted.item.ScriptItemBook; +import noppes.npcs.scripted.item.ScriptItemStack; +import noppes.npcs.scripted.item.ScriptLinkedItem; import noppes.npcs.scripted.overlay.ScriptOverlay; -import noppes.npcs.util.*; +import noppes.npcs.util.CacheHashMap; +import noppes.npcs.util.JsonException; +import noppes.npcs.util.LRUHashMap; +import noppes.npcs.util.NBTJsonUtil; +import noppes.npcs.util.SizeOfObjectUtil; -import java.io.*; +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/noppes/npcs/scripted/ScriptBlock.java b/src/main/java/noppes/npcs/scripted/ScriptBlock.java index 074ba4269..5d50d4543 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptBlock.java +++ b/src/main/java/noppes/npcs/scripted/ScriptBlock.java @@ -8,7 +8,12 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; public class ScriptBlock implements IBlock { protected IWorld world; diff --git a/src/main/java/noppes/npcs/scripted/ScriptNbt.java b/src/main/java/noppes/npcs/scripted/ScriptNbt.java index 88471dc94..fcc26ac7f 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptNbt.java +++ b/src/main/java/noppes/npcs/scripted/ScriptNbt.java @@ -1,6 +1,13 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.api.INbt; import noppes.npcs.util.NBTJsonUtil; diff --git a/src/main/java/noppes/npcs/scripted/ScriptParticle.java b/src/main/java/noppes/npcs/scripted/ScriptParticle.java index 11f8676be..9fb6689d1 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptParticle.java +++ b/src/main/java/noppes/npcs/scripted/ScriptParticle.java @@ -1,6 +1,11 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.NoppesUtilServer; import noppes.npcs.api.IParticle; import noppes.npcs.api.IPos; diff --git a/src/main/java/noppes/npcs/scripted/ScriptSound.java b/src/main/java/noppes/npcs/scripted/ScriptSound.java index 6afbb494f..b849ab2f6 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptSound.java +++ b/src/main/java/noppes/npcs/scripted/ScriptSound.java @@ -1,6 +1,11 @@ package noppes.npcs.scripted; -import net.minecraft.nbt.*; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.api.IPos; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.handler.data.ISound; diff --git a/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java b/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java index 89dbbd2e3..a5293d251 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java +++ b/src/main/java/noppes/npcs/scripted/ScriptTileEntity.java @@ -2,7 +2,11 @@ package noppes.npcs.scripted; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.INbt; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; public class ScriptTileEntity implements ITileEntity { protected T tileEntity; diff --git a/src/main/java/noppes/npcs/scripted/ScriptWorld.java b/src/main/java/noppes/npcs/scripted/ScriptWorld.java index e2396e1bb..c9b806ca9 100644 --- a/src/main/java/noppes/npcs/scripted/ScriptWorld.java +++ b/src/main/java/noppes/npcs/scripted/ScriptWorld.java @@ -11,7 +11,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntitySign; -import net.minecraft.util.*; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.Vec3; import net.minecraft.world.WorldServer; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.BlockSnapshot; @@ -19,7 +23,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.world.BlockEvent; import noppes.npcs.CustomNpcs; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPos; +import noppes.npcs.api.ITileEntity; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.ISound; @@ -30,7 +38,12 @@ import noppes.npcs.controllers.ServerCloneController; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.scoreboard.ScriptScoreboard; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; public class ScriptWorld implements IWorld { public WorldServer world; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java index 4e745a168..d5d5433c7 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptArrow.java @@ -14,7 +14,7 @@ public class ScriptArrow extends ScriptEntity implemen @Override public IEntity getShooter() { - if(entity.shootingEntity != null) + if (entity.shootingEntity != null) return NpcAPI.Instance().getIEntity(entity.shootingEntity); return null; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java index cee7a89a4..caac8d87d 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptEntity.java @@ -30,7 +30,12 @@ import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptParticle; import noppes.npcs.scripted.constants.EntityType; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ScriptEntity implements IEntity { protected T entity; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java index 0455fa43b..56d97f4e0 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptFishHook.java @@ -14,7 +14,7 @@ public class ScriptFishHook extends ScriptEntity im @Override public IPlayer getCaster() { - if(entity.field_146042_b != null) + if (entity.field_146042_b != null) return (IPlayer) NpcAPI.Instance().getIEntity(entity.field_146042_b); return null; } diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java index 356d3bf5a..66a0c1c1b 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java @@ -11,12 +11,22 @@ import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.entity.data.IModelData; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimationData; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IFaction; +import noppes.npcs.api.handler.data.ILines; +import noppes.npcs.api.handler.data.IMagicData; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.jobs.IJob; import noppes.npcs.api.roles.IRole; import noppes.npcs.config.ConfigMain; -import noppes.npcs.constants.*; +import noppes.npcs.constants.EnumAnimation; +import noppes.npcs.constants.EnumCombatPolicy; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.constants.EnumMovingType; +import noppes.npcs.constants.EnumNavType; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.constants.EnumStandingType; import noppes.npcs.controllers.FactionController; import noppes.npcs.controllers.data.DialogOption; import noppes.npcs.controllers.data.Line; @@ -25,7 +35,21 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.AnimationType; import noppes.npcs.scripted.constants.EntityType; -import noppes.npcs.scripted.roles.*; +import noppes.npcs.scripted.roles.ScriptJobBard; +import noppes.npcs.scripted.roles.ScriptJobConversation; +import noppes.npcs.scripted.roles.ScriptJobFollower; +import noppes.npcs.scripted.roles.ScriptJobGuard; +import noppes.npcs.scripted.roles.ScriptJobHealer; +import noppes.npcs.scripted.roles.ScriptJobInterface; +import noppes.npcs.scripted.roles.ScriptJobItemGiver; +import noppes.npcs.scripted.roles.ScriptJobSpawner; +import noppes.npcs.scripted.roles.ScriptRoleBank; +import noppes.npcs.scripted.roles.ScriptRoleCompanion; +import noppes.npcs.scripted.roles.ScriptRoleFollower; +import noppes.npcs.scripted.roles.ScriptRoleInterface; +import noppes.npcs.scripted.roles.ScriptRoleMailman; +import noppes.npcs.scripted.roles.ScriptRoleTrader; +import noppes.npcs.scripted.roles.ScriptRoleTransporter; import noppes.npcs.util.ValueUtil; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java index 68ce55aff..aa7152528 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java @@ -23,21 +23,43 @@ import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesStringUtils; import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; -import noppes.npcs.api.*; +import noppes.npcs.api.IBlock; +import noppes.npcs.api.IContainer; +import noppes.npcs.api.IParticle; +import noppes.npcs.api.IPixelmonPlayerData; +import noppes.npcs.api.IPos; +import noppes.npcs.api.IScreenSize; +import noppes.npcs.api.ITimers; +import noppes.npcs.api.IWorld; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.handler.IActionManager; import noppes.npcs.api.handler.IOverlayHandler; -import noppes.npcs.api.handler.data.*; +import noppes.npcs.api.handler.data.IAnimationData; +import noppes.npcs.api.handler.data.IDialog; +import noppes.npcs.api.handler.data.IMagicData; +import noppes.npcs.api.handler.data.IPlayerAttributes; +import noppes.npcs.api.handler.data.IQuest; +import noppes.npcs.api.handler.data.ISound; import noppes.npcs.api.item.IItemStack; import noppes.npcs.api.overlay.ICustomOverlay; import noppes.npcs.compat.PixelmonHelper; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumQuestType; import noppes.npcs.containers.ContainerCustomGui; -import noppes.npcs.controllers.*; -import noppes.npcs.controllers.data.*; +import noppes.npcs.controllers.CustomGuiController; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerQuestController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.Dialog; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.PlayerDialogData; +import noppes.npcs.controllers.data.PlayerQuestData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; import noppes.npcs.entity.EntityDialogNpc; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptPixelmonPlayerData; diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java index 53d639335..1c8400d47 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptThrowable.java @@ -1,7 +1,8 @@ package noppes.npcs.scripted.entity; import net.minecraft.entity.projectile.EntityThrowable; -import noppes.npcs.api.entity.*; +import noppes.npcs.api.entity.IEntityLivingBase; +import noppes.npcs.api.entity.IThrowable; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.constants.EntityType; @@ -13,7 +14,7 @@ public class ScriptThrowable extends ScriptEntity @Override public IEntityLivingBase getThrower() { - if(entity.getThrower() != null) + if (entity.getThrower() != null) return (IEntityLivingBase) NpcAPI.Instance().getIEntity(entity.getThrower()); return null; } diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java index 950af113f..1ebc173f6 100644 --- a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -1,12 +1,9 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.api.handler.data.IRecipe; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.RecipeScript; -import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.player.PlayerEvent; public class RecipeScriptEvent extends PlayerEvent { diff --git a/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java b/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java index bf2225176..e6a303234 100644 --- a/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/player/PlayerEvent.java @@ -13,16 +13,13 @@ import noppes.npcs.api.IDamageSource; import noppes.npcs.api.entity.IEntity; import noppes.npcs.api.entity.IEntityLivingBase; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.event.IItemEvent; import noppes.npcs.api.event.IPlayerEvent; import noppes.npcs.api.handler.data.IPlayerEffect; import noppes.npcs.api.handler.data.IProfile; -import noppes.npcs.api.item.IItemCustomizable; import noppes.npcs.api.item.IItemStack; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.CustomNPCsEvent; -import noppes.npcs.scripted.event.ItemEvent; public class PlayerEvent extends CustomNPCsEvent implements IPlayerEvent { public final IPlayer player; diff --git a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java index a3d5a62be..0a6535182 100644 --- a/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java +++ b/src/main/java/noppes/npcs/scripted/gui/ScriptGui.java @@ -5,7 +5,15 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.gui.*; +import noppes.npcs.api.gui.IButton; +import noppes.npcs.api.gui.ICustomGui; +import noppes.npcs.api.gui.ICustomGuiComponent; +import noppes.npcs.api.gui.IItemSlot; +import noppes.npcs.api.gui.ILabel; +import noppes.npcs.api.gui.ILine; +import noppes.npcs.api.gui.IScroll; +import noppes.npcs.api.gui.ITextField; +import noppes.npcs.api.gui.ITexturedRect; import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.CustomGuiController; import noppes.npcs.controllers.ScriptController; diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java index 7a3e2fdbf..0103a9af2 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptCustomItem.java @@ -12,7 +12,11 @@ import noppes.npcs.controllers.ScriptController; import noppes.npcs.controllers.data.INpcScriptHandler; import noppes.npcs.scripted.CustomNPCsException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; public class ScriptCustomItem extends ScriptCustomizableItem implements IItemCustom, INpcScriptHandler { public List scripts = new ArrayList(); diff --git a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java index 8e80f3eb6..6736369b9 100644 --- a/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java +++ b/src/main/java/noppes/npcs/scripted/item/ScriptItemStack.java @@ -9,7 +9,14 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemEditableBook; +import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemWritableBook; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTBase.NBTPrimitive; import net.minecraft.nbt.NBTTagCompound; @@ -25,7 +32,11 @@ import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.ScriptNbt; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; public class ScriptItemStack implements IItemStack { public ItemStack item; diff --git a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java index 7da5ade14..23ae8a89c 100644 --- a/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java +++ b/src/main/java/noppes/npcs/scripted/overlay/ScriptOverlay.java @@ -4,7 +4,11 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IPlayer; -import noppes.npcs.api.overlay.*; +import noppes.npcs.api.overlay.ICustomOverlay; +import noppes.npcs.api.overlay.ICustomOverlayComponent; +import noppes.npcs.api.overlay.IOverlayLabel; +import noppes.npcs.api.overlay.IOverlayLine; +import noppes.npcs.api.overlay.IOverlayTexturedRect; import noppes.npcs.controllers.CustomGuiController; import java.util.ArrayList; diff --git a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java index 8ab5de0b1..08582cb03 100644 --- a/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java +++ b/src/main/java/noppes/npcs/scripted/scoreboard/ScriptScoreboard.java @@ -1,6 +1,10 @@ package noppes.npcs.scripted.scoreboard; -import net.minecraft.scoreboard.*; +import net.minecraft.scoreboard.IScoreObjectiveCriteria; +import net.minecraft.scoreboard.Score; +import net.minecraft.scoreboard.ScoreObjective; +import net.minecraft.scoreboard.ScorePlayerTeam; +import net.minecraft.scoreboard.Scoreboard; import net.minecraft.server.MinecraftServer; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.scoreboard.IScoreboard; diff --git a/src/main/java/noppes/npcs/util/NBTJsonUtil.java b/src/main/java/noppes/npcs/util/NBTJsonUtil.java index 94f8756e2..fb2974f19 100644 --- a/src/main/java/noppes/npcs/util/NBTJsonUtil.java +++ b/src/main/java/noppes/npcs/util/NBTJsonUtil.java @@ -2,11 +2,27 @@ package noppes.npcs.util; import com.google.common.io.Files; import cpw.mods.fml.common.ObfuscationReflectionHelper; -import net.minecraft.nbt.*; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagByte; +import net.minecraft.nbt.NBTTagByteArray; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagDouble; +import net.minecraft.nbt.NBTTagFloat; +import net.minecraft.nbt.NBTTagInt; +import net.minecraft.nbt.NBTTagIntArray; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; +import net.minecraft.nbt.NBTTagShort; +import net.minecraft.nbt.NBTTagString; import noppes.npcs.LogWriter; import org.apache.commons.io.Charsets; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java index e6e63b402..e52742812 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabCustomNpc.java @@ -4,7 +4,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import noppes.npcs.CustomItems; -import noppes.npcs.client.gui.player.inventory.*; +import noppes.npcs.client.gui.player.inventory.GuiCNPCInventory; +import noppes.npcs.client.gui.player.inventory.GuiFaction; +import noppes.npcs.client.gui.player.inventory.GuiParty; +import noppes.npcs.client.gui.player.inventory.GuiProfiles; +import noppes.npcs.client.gui.player.inventory.GuiQuestLog; +import noppes.npcs.client.gui.player.inventory.GuiSettings; public class InventoryTabCustomNpc extends AbstractTab { public InventoryTabCustomNpc() { From 4bfdd6a5c48234f023f90c9bd59808301320a907 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 14:30:24 -0400 Subject: [PATCH 140/154] Update EntityNPCFlying.java --- src/main/java/noppes/npcs/entity/EntityNPCFlying.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java index d8d78b81e..92ad030c5 100644 --- a/src/main/java/noppes/npcs/entity/EntityNPCFlying.java +++ b/src/main/java/noppes/npcs/entity/EntityNPCFlying.java @@ -38,9 +38,6 @@ public abstract class EntityNPCFlying extends EntityNPCInterface { @Override public void onLivingUpdate() { super.onLivingUpdate(); - if (this.canFly() && this.getNavigator().noPath()) { - this.motionY = -Math.abs(this.ais.flyGravity); - } } public void moveEntityWithHeading(float p_70612_1_, float p_70612_2_) { From c2332647416df712106a6cd834538bde20fb5b27 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 21:31:34 -0400 Subject: [PATCH 141/154] Fix buildNoMixin task --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5096903ef..6b93c0c59 100644 --- a/build.gradle +++ b/build.gradle @@ -22,10 +22,13 @@ tasks.create('updateAPI', Exec) { } // No Mixin Build Task +def gradleWrapper = System.getProperty('os.name').toLowerCase().contains('windows') ? 'gradlew.bat' : './gradlew' + tasks.create('buildNoMixin', Exec) { description 'Builds mod without embed' group 'CustomNPC+' - commandLine 'build', '-Pnomixin' + workingDir project.rootDir + commandLine gradleWrapper, 'build', '-Pnomixin' } sourceSets { From b083e05f164cdca2cbecdf1f83aac0300490a705 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 23:14:29 -0400 Subject: [PATCH 142/154] Recipe Event API --- src/api | 2 +- .../npcs/scripted/event/RecipeScriptEvent.java | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/api b/src/api index b60245f21..bd03e27c4 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit b60245f21a43398a8d499f397ac9baaa690fff88 +Subproject commit bd03e27c472f27d6054df40bd0c7a03a73f051d3 diff --git a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java index 1ebc173f6..fb8ea2698 100644 --- a/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/RecipeScriptEvent.java @@ -2,11 +2,12 @@ package noppes.npcs.scripted.event; import cpw.mods.fml.common.eventhandler.Cancelable; import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.api.event.IRecipeEvent; import noppes.npcs.api.item.IItemStack; import noppes.npcs.controllers.data.RecipeScript; import noppes.npcs.scripted.event.player.PlayerEvent; -public class RecipeScriptEvent extends PlayerEvent { +public class RecipeScriptEvent extends PlayerEvent implements IRecipeEvent { public final Object recipe; public final IItemStack[] items; public final boolean isAnvil; @@ -18,20 +19,23 @@ public class RecipeScriptEvent extends PlayerEvent { this.isAnvil = anvil; } + @Override public Object getRecipe() { return recipe; } + @Override public IItemStack[] getItems() { return items; } + @Override public boolean isAnvil() { return isAnvil; } @Cancelable - public static class Pre extends RecipeScriptEvent { + public static class Pre extends RecipeScriptEvent implements IRecipeEvent.Pre { private String message = ""; private int xpCost = 0; private int materialUsage = 0; @@ -40,27 +44,33 @@ public class RecipeScriptEvent extends PlayerEvent { super(player, recipe, isAnvil, items); } + @Override public void setMessage(String message) { this.message = message == null ? "" : message; } + @Override public String getMessage() { return message; } + @Override public int getXpCost() { return xpCost; } + @Override public void setXpCost(int xpCost) { if (this.isAnvil) this.xpCost = xpCost; } + @Override public int getMaterialUsage() { return materialUsage; } + @Override public void setMaterialUsage(int materialUsage) { if (this.isAnvil) this.materialUsage = materialUsage; @@ -71,7 +81,7 @@ public class RecipeScriptEvent extends PlayerEvent { } } - public static class Post extends RecipeScriptEvent { + public static class Post extends RecipeScriptEvent implements IRecipeEvent.Post { private IItemStack result; public Post(IPlayer player, Object recipe, boolean isAnvil, IItemStack[] items, IItemStack result) { @@ -79,10 +89,12 @@ public class RecipeScriptEvent extends PlayerEvent { this.result = result; } + @Override public IItemStack getCraft() { return result; } + @Override public void setResult(IItemStack stack) { this.result = stack; } From 32c2d89f425e166c7a6ecbaa6503bac15600fe2e Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 23 Jul 2025 23:48:01 -0400 Subject: [PATCH 143/154] Fix region saving delimiter --- .../java/kamkeel/npcs/command/profile/CommandProfileRegion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java index aa798d30b..8f5a1b39c 100644 --- a/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java +++ b/src/main/java/kamkeel/npcs/command/profile/CommandProfileRegion.java @@ -78,7 +78,7 @@ public class CommandProfileRegion extends CommandProfileBase { for (List region : ConfigMain.RestrictedProfileRegions) { StringBuilder sb = new StringBuilder(); for (int i = 0; i < region.size(); i++) { - if (i > 0) sb.append(" "); + if (i > 0) sb.append(", "); sb.append(region.get(i)); } regionStrings.add(sb.toString()); From 6a31602701190a1d281b3d144def955af6821941 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 24 Jul 2025 01:56:20 -0400 Subject: [PATCH 144/154] 1.10.2 - beta4 --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6b93c0c59..a31ccfa3a 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2-beta3" +version = "1.10.2-beta4" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 5c13d0c5f..815a6e396 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -99,7 +99,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta3") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta4") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") From b6b4b20ba880586a5c35a4ab459b2cf7cff37c45 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 28 Jul 2025 13:27:57 -0400 Subject: [PATCH 145/154] Prevent NPE when party leader name missing --- src/main/java/noppes/npcs/controllers/data/Party.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/controllers/data/Party.java b/src/main/java/noppes/npcs/controllers/data/Party.java index 0fa6449ff..66e293dd4 100644 --- a/src/main/java/noppes/npcs/controllers/data/Party.java +++ b/src/main/java/noppes/npcs/controllers/data/Party.java @@ -219,7 +219,7 @@ public class Party implements IParty { @Override public String getPartyLeaderName() { if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { - return this.partyLeaderName; + return this.partyLeaderName == null ? "" : this.partyLeaderName; } else { EntityPlayer leader = this.getPartyLeader(); if (leader != null) From 88f48c6f943a7799c3a3fbc003158029e4ee8e88 Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 26 Aug 2025 04:09:51 -0400 Subject: [PATCH 146/154] Fix ClassCastException when interacting with hanging signs --- src/main/java/noppes/npcs/blocks/BlockSign.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/blocks/BlockSign.java b/src/main/java/noppes/npcs/blocks/BlockSign.java index 456cd0b33..241749360 100644 --- a/src/main/java/noppes/npcs/blocks/BlockSign.java +++ b/src/main/java/noppes/npcs/blocks/BlockSign.java @@ -11,7 +11,6 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import noppes.npcs.blocks.tiles.TileBanner; import noppes.npcs.blocks.tiles.TileSign; import noppes.npcs.blocks.tiles.TileVariant; @@ -37,7 +36,7 @@ public class BlockSign extends BlockRotated { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { - TileBanner tile = (TileBanner) world.getTileEntity(x, y, z); + TileSign tile = (TileSign) world.getTileEntity(x, y, z); return tile.canEdit(); } From d0923752bade8316fd74b38ea18999c382cb0c9a Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 26 Aug 2025 04:24:16 -0400 Subject: [PATCH 147/154] Fix key binding conflict with TinkersConstruct --- src/main/java/noppes/npcs/client/ClientProxy.java | 3 +-- .../resources/assets/customnpcs/lang/cs_CZ.lang | 3 ++- .../resources/assets/customnpcs/lang/de_DE.lang | 2 ++ .../resources/assets/customnpcs/lang/en_US.lang | 1 + .../resources/assets/customnpcs/lang/es_AR.lang | 13 +++++++------ .../resources/assets/customnpcs/lang/es_MX.lang | 13 +++++++------ .../resources/assets/customnpcs/lang/fr_FR.lang | 3 ++- .../resources/assets/customnpcs/lang/hu_HU.lang | 3 ++- .../resources/assets/customnpcs/lang/ko_KR.lang | 2 ++ .../resources/assets/customnpcs/lang/pl_PL.lang | 3 ++- .../resources/assets/customnpcs/lang/pt_BR.lang | 3 ++- .../resources/assets/customnpcs/lang/ru_RU.lang | 2 ++ .../resources/assets/customnpcs/lang/zh_CN.lang | 2 ++ 13 files changed, 34 insertions(+), 19 deletions(-) diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index 9f8694663..a8e2994a5 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -287,10 +287,9 @@ public class ClientProxy extends CommonProxy { } Minecraft mc = Minecraft.getMinecraft(); - NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc"); + NPCButton = new KeyBinding("key.npcInventory", Keyboard.KEY_N, "key.categories.customnpc"); ClientRegistry.registerKeyBinding(NPCButton); - mc.gameSettings.loadOptions(); new PresetController(CustomNpcs.Dir); diff --git a/src/main/resources/assets/customnpcs/lang/cs_CZ.lang b/src/main/resources/assets/customnpcs/lang/cs_CZ.lang index b377588b2..f8f092bbf 100644 --- a/src/main/resources/assets/customnpcs/lang/cs_CZ.lang +++ b/src/main/resources/assets/customnpcs/lang/cs_CZ.lang @@ -437,4 +437,5 @@ item.npcInfantryHelmet.name=Armádní helma item.npcOfficerHelmet.name=důstojnické brnění item.npcCrown.name=Koruna -item.npcCrown2.name=Koruna \ No newline at end of file +item.npcCrown2.name=Koruna +key.npcInventory=NPC inventář diff --git a/src/main/resources/assets/customnpcs/lang/de_DE.lang b/src/main/resources/assets/customnpcs/lang/de_DE.lang index 318e029d4..f88dd2769 100644 --- a/src/main/resources/assets/customnpcs/lang/de_DE.lang +++ b/src/main/resources/assets/customnpcs/lang/de_DE.lang @@ -869,3 +869,5 @@ companion.age=Alter companion.stage=Bühne #German by DewTix + +key.npcInventory=NPC Inventar diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index ad733fa6b..286f8446f 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1,6 +1,7 @@ customnpcs.defaultTextColor=404040 key.categories.customnpc=CustomNPC+ +key.npcInventory=NPC Inventory entity.CustomNpc.name=Custom Npc entity.customnpcs.CustomNpc.name=Custom Npc diff --git a/src/main/resources/assets/customnpcs/lang/es_AR.lang b/src/main/resources/assets/customnpcs/lang/es_AR.lang index 917abd4f4..27c79cd78 100644 --- a/src/main/resources/assets/customnpcs/lang/es_AR.lang +++ b/src/main/resources/assets/customnpcs/lang/es_AR.lang @@ -8,7 +8,7 @@ tile.npcCarpentyBench.name=Mesa de Carpinteria tile.npcBloodBlock.name=Bloque de Sangre gui.deleteConfirm=Estas Seguro de que quieres eliminar este npc? -gui.add=Añadir +gui.add=Añadir gui.remove=Remover gui.edit=Editar gui.name=Nombre @@ -31,13 +31,13 @@ gui.large=Grande gui.type=Tipo gui.always=Siempre gui.untilclose=HastaCerrar -gui.ignoreDamage=Ignorar daño +gui.ignoreDamage=Ignorar daño display.model=Modelo display.show=Mostrar display.hide=Esconder display.showAttacking=Mostrar cuando ataca -display.size=Tamaño +display.size=Tamaño display.texture=Textura display.textureCape=Textura de capa display.player=Jugador @@ -94,13 +94,13 @@ stats.creaturetype=Tipo de criatura stats.normal=Normal stats.undead=No-Muerto stats.arthropod=Artropodo -stats.nofalldamage=Sin daño de caida +stats.nofalldamage=Sin daño de caida stats.meleeproperties=Opciones de Melee stats.rangedproperties=RangedOptions stats.burninsun=Se quema al sol stats.amplify=Amplificado -stats.size=Tamaño +stats.size=Tamaño stats.speed=Rapidez stats.glows=Brilla stats.hasgravity=Tiene gravedad @@ -497,4 +497,5 @@ item.npcCrossbow.name=Ballesta item.npcCrossBolt.name=Flecha de Ballesta item.npcSlingshot.name=Slingshot item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventario de NPC diff --git a/src/main/resources/assets/customnpcs/lang/es_MX.lang b/src/main/resources/assets/customnpcs/lang/es_MX.lang index 2d34e3827..53bca03af 100644 --- a/src/main/resources/assets/customnpcs/lang/es_MX.lang +++ b/src/main/resources/assets/customnpcs/lang/es_MX.lang @@ -25,19 +25,19 @@ gui.day=Dia gui.night=Noche gui.constant=Constante gui.accelerate=Acelerar -gui.small=Pequeño +gui.small=Pequeño gui.medium=Mediano gui.large=Grande gui.type=Tipo gui.always=Siempre gui.untilclose=HastaCierre -gui.ignoreDamage=Ignorar Daño +gui.ignoreDamage=Ignorar Daño display.model=Modelo display.show=Mostrar display.hide=Esconder display.showAttacking=Mostrar Al Atacar -display.size=Tamaño +display.size=Tamaño display.texture=Textura display.textureCape=Textura de capa display.player=Jugador @@ -94,13 +94,13 @@ stats.creaturetype=Tipo de cratura stats.normal=Normal stats.undead=No-Muerto stats.arthropod=Artropodo -stats.nofalldamage=Sin daño de caida +stats.nofalldamage=Sin daño de caida stats.meleeproperties=Opciones de Melee stats.rangedproperties=PropiedadesDeDistancia stats.burninsun=Se quema al sol stats.amplify=Amplificar -stats.size=Tamaño +stats.size=Tamaño stats.speed=Rapidez stats.glows=Brilla stats.hasgravity=Tiene gravedad @@ -497,4 +497,5 @@ item.npcCrossbow.name=Ballesta item.npcCrossBolt.name=Flecha de Ballesta item.npcSlingshot.name=Slingshot item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventario de NPC diff --git a/src/main/resources/assets/customnpcs/lang/fr_FR.lang b/src/main/resources/assets/customnpcs/lang/fr_FR.lang index 15e98a29f..b22a75ac3 100644 --- a/src/main/resources/assets/customnpcs/lang/fr_FR.lang +++ b/src/main/resources/assets/customnpcs/lang/fr_FR.lang @@ -539,4 +539,5 @@ item.npcCrossbow.name=Arbalète item.npcCrossBolt.name=Carreau d'Arbalète item.npcSlingshot.name=Lance-Pièrre item.npcMusket.name=Mousquet -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventaire Pnj diff --git a/src/main/resources/assets/customnpcs/lang/hu_HU.lang b/src/main/resources/assets/customnpcs/lang/hu_HU.lang index c2873bbcd..1a9fc71f5 100644 --- a/src/main/resources/assets/customnpcs/lang/hu_HU.lang +++ b/src/main/resources/assets/customnpcs/lang/hu_HU.lang @@ -539,4 +539,5 @@ item.npcCrossbow.name=Számszeríj item.npcCrossBolt.name=Tüske item.npcSlingshot.name=Csúzli item.npcMusket.name=Muskéta -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=NPC felszerelés diff --git a/src/main/resources/assets/customnpcs/lang/ko_KR.lang b/src/main/resources/assets/customnpcs/lang/ko_KR.lang index 64c09c92f..993006c34 100644 --- a/src/main/resources/assets/customnpcs/lang/ko_KR.lang +++ b/src/main/resources/assets/customnpcs/lang/ko_KR.lang @@ -794,3 +794,5 @@ enchantment.damage=데미지 enchantment.confusion=혼란 enchantment.infinite=무한 enchantment.poison=독 + +key.npcInventory=NPC 인벤토리 diff --git a/src/main/resources/assets/customnpcs/lang/pl_PL.lang b/src/main/resources/assets/customnpcs/lang/pl_PL.lang index 2721d5fc4..2f1047663 100644 --- a/src/main/resources/assets/customnpcs/lang/pl_PL.lang +++ b/src/main/resources/assets/customnpcs/lang/pl_PL.lang @@ -495,4 +495,5 @@ item.npcCrossbow.name=Kusza item.npcCrossBolt.name=Strzałki do kuszy item.npcSlingshot.name=Proca item.npcMusket.name=Muszkiet -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inwentarz npc diff --git a/src/main/resources/assets/customnpcs/lang/pt_BR.lang b/src/main/resources/assets/customnpcs/lang/pt_BR.lang index c8f4d9a7c..c3bbd3c26 100644 --- a/src/main/resources/assets/customnpcs/lang/pt_BR.lang +++ b/src/main/resources/assets/customnpcs/lang/pt_BR.lang @@ -495,4 +495,5 @@ item.npcCrossbow.name=Besta item.npcCrossBolt.name=Flecha de Besta item.npcSlingshot.name=Estilingue item.npcMusket.name=Mosquete -item.npcExcalibur.name=Excalibur \ No newline at end of file +item.npcExcalibur.name=Excalibur +key.npcInventory=Inventário NPC diff --git a/src/main/resources/assets/customnpcs/lang/ru_RU.lang b/src/main/resources/assets/customnpcs/lang/ru_RU.lang index f0f552f84..54d0c2cf4 100644 --- a/src/main/resources/assets/customnpcs/lang/ru_RU.lang +++ b/src/main/resources/assets/customnpcs/lang/ru_RU.lang @@ -1015,3 +1015,5 @@ questgui.rewards=Награды: questgui.experience=Опыт: questgui.reject=Отменить questgui.accept=Принять + +key.npcInventory=Инвентарь NPC diff --git a/src/main/resources/assets/customnpcs/lang/zh_CN.lang b/src/main/resources/assets/customnpcs/lang/zh_CN.lang index d8de7694b..e5d0b172a 100644 --- a/src/main/resources/assets/customnpcs/lang/zh_CN.lang +++ b/src/main/resources/assets/customnpcs/lang/zh_CN.lang @@ -1238,3 +1238,5 @@ tint.hurt=伤害色彩 hitbox.hitbox=碰撞体积 hitbox.width=宽度比例 hitbox.height=身高比例 + +key.npcInventory=NPC物品栏 From 7615a60932ecd0c07939221da5070bddb8b4d963 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 27 Aug 2025 15:47:16 -0400 Subject: [PATCH 148/154] Temporary Disable Analytics --- .../java/noppes/npcs/ServerTickHandler.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index 98d3ebda0..d9e88ab29 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -37,23 +37,24 @@ public class ServerTickHandler { @SubscribeEvent public void playerLogin(PlayerEvent.PlayerLoggedInEvent event) { EntityPlayerMP player = (EntityPlayerMP) event.player; - if (serverName == null) { - String e = "local"; - MinecraftServer server = MinecraftServer.getServer(); - if (server.isDedicatedServer()) { - try { - e = InetAddress.getByName(server.getServerHostname()).getCanonicalHostName(); - } catch (UnknownHostException e1) { - e = MinecraftServer.getServer().getServerHostname(); - } - if (server.getPort() != 25565) - e += ":" + server.getPort(); - } - if (e == null || e.startsWith("192.168") || e.contains("127.0.0.1") || e.startsWith("localhost")) - e = "local"; - serverName = e; - } - AnalyticsTracking.sendData(event.player, "join", serverName); + // Temporary Disabled +// if (serverName == null) { +// String e = "local"; +// MinecraftServer server = MinecraftServer.getServer(); +// if (server.isDedicatedServer()) { +// try { +// e = InetAddress.getByName(server.getServerHostname()).getCanonicalHostName(); +// } catch (UnknownHostException e1) { +// e = MinecraftServer.getServer().getServerHostname(); +// } +// if (server.getPort() != 25565) +// e += ":" + server.getPort(); +// } +// if (e == null || e.startsWith("192.168") || e.contains("127.0.0.1") || e.startsWith("localhost")) +// e = "local"; +// serverName = e; +// } +// AnalyticsTracking.sendData(event.player, "join", serverName); PlayerData playerData = PlayerData.get(event.player); if (playerData != null) { From 065cfb152e1f71de7e3223be1437b99e9ccad567 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 27 Aug 2025 15:48:10 -0400 Subject: [PATCH 149/154] Restore Name --- src/main/java/noppes/npcs/client/ClientProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index a8e2994a5..f0346a5d3 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -287,7 +287,7 @@ public class ClientProxy extends CommonProxy { } Minecraft mc = Minecraft.getMinecraft(); - NPCButton = new KeyBinding("key.npcInventory", Keyboard.KEY_N, "key.categories.customnpc"); + NPCButton = new KeyBinding("NPC Inventory", Keyboard.KEY_N, "key.categories.customnpc"); ClientRegistry.registerKeyBinding(NPCButton); From 5b201c0f0e0ddd8056c1f775b86da5d4473d79c9 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 27 Aug 2025 15:48:31 -0400 Subject: [PATCH 150/154] Bump Release --- build.gradle | 2 +- src/main/java/noppes/npcs/CustomNpcs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a31ccfa3a..dc3a7dd3b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'idea' } -version = "1.10.2-beta4" +version = "1.10.2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 815a6e396..3cfcd18e4 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -99,7 +99,7 @@ import noppes.npcs.scripted.NpcAPI; import java.io.File; import java.util.Set; -@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2-beta4") +@Mod(modid = "customnpcs", name = "CustomNPC+", version = "1.10.2") public class CustomNpcs { @SidedProxy(clientSide = "noppes.npcs.client.ClientProxy", serverSide = "noppes.npcs.CommonProxy") From 2ae3a32ad1710cfc5fd0ab30222f8590ebfca8d1 Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 27 Aug 2025 16:27:40 -0400 Subject: [PATCH 151/154] Fix Profile Load Saving --- .../npcs/controllers/ProfileController.java | 17 +++++++++-------- .../java/noppes/npcs/ServerTickHandler.java | 5 ++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index bf9615d60..5968f06d3 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -1,5 +1,6 @@ package kamkeel.npcs.controllers; +import kamkeel.npcs.controllers.AttributeController; import kamkeel.npcs.controllers.data.profile.CNPCData; import kamkeel.npcs.controllers.data.profile.EnumProfileOperation; import kamkeel.npcs.controllers.data.profile.IProfileData; @@ -273,8 +274,10 @@ public class ProfileController implements IProfileHandler { } public synchronized void logout(EntityPlayer player) { - if (player != null) { - activeProfiles.remove(player.getUniqueID()); + if (player != null && activeProfiles.containsKey(player.getUniqueID())) { + saveSlotData(player); + Profile profile = activeProfiles.get(player.getUniqueID()); + save(player, profile); } } @@ -367,7 +370,6 @@ public class ProfileController implements IProfileHandler { return ProfileOperation.error(MSG_CANNOT_CLONE_CURRENT); } if (temporary) { - // Use a negative ID for temporary slots so they are never saved to disk. destinationSlotId = getNextAvailableTempSlot(profile); } else { if (destinationSlotId <= 0) { @@ -648,9 +650,6 @@ public class ProfileController implements IProfileHandler { if (slot == null) return; - PlayerData pdata = PlayerData.get(player); - pdata.profileSlot = profile.getCurrentSlotId(); - for (IProfileData profileData : profileTypes.values()) { NBTTagCompound data; if (slot.getComponents().containsKey(profileData.getTagName())) @@ -663,10 +662,12 @@ public class ProfileController implements IProfileHandler { profileData.save(player); } + PlayerData pdata = PlayerData.get(player); + pdata.profileSlot = profile.getCurrentSlotId(); + pdata.save(); + if (ConfigMain.AttributesEnabled) AttributeController.getTracker(player).recalcAttributes(player); - - // pdata.save(); } public List getProfileInfo(EntityPlayer player, int slotId) { diff --git a/src/main/java/noppes/npcs/ServerTickHandler.java b/src/main/java/noppes/npcs/ServerTickHandler.java index d9e88ab29..ef2ba0847 100644 --- a/src/main/java/noppes/npcs/ServerTickHandler.java +++ b/src/main/java/noppes/npcs/ServerTickHandler.java @@ -61,9 +61,9 @@ public class ServerTickHandler { playerData.onLogin(); } + ProfileController.Instance.login(player); SyncController.syncPlayer(player); SyncController.syncEffects(player); - ProfileController.Instance.login(player); } @SubscribeEvent @@ -72,5 +72,8 @@ public class ServerTickHandler { if (playerData != null) { playerData.onLogout(); } + + // Save and unload the player's profile data on logout + ProfileController.Instance.logout(event.player); } } From 88b5be2f25658deaf5ea9b2037f9f5c768ad8982 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 28 Aug 2025 22:01:24 -0400 Subject: [PATCH 152/154] Update ProfileController.java --- .../java/kamkeel/npcs/controllers/ProfileController.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 5968f06d3..3e874ab1c 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -122,7 +122,6 @@ public class ProfileController implements IProfileHandler { if (player == null) return; Profile profile; - boolean profileModified = false; if (activeProfiles.containsKey(player.getUniqueID())) { profile = activeProfiles.get(player.getUniqueID()); profile.player = player; @@ -135,16 +134,14 @@ public class ProfileController implements IProfileHandler { profile.getSlots().put(0, defaultSlot); profile.currentSlotId = 0; saveSlotData(player); - profileModified = true; } if (!profile.getSlots().containsKey(profile.currentSlotId)) { profile.currentSlotId = 0; } profile.player = player; activeProfiles.put(player.getUniqueID(), profile); + loadSlotData(player); verifySlotQuests(profile.player); - if (profileModified) - save(player, profile); } } From 82e97935d9c146b26feb20365cdd8707b94aa166 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 28 Aug 2025 22:18:16 -0400 Subject: [PATCH 153/154] fix: preserve profile data on relog --- .../java/kamkeel/npcs/controllers/ProfileController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/controllers/ProfileController.java b/src/main/java/kamkeel/npcs/controllers/ProfileController.java index 3e874ab1c..ceb138285 100644 --- a/src/main/java/kamkeel/npcs/controllers/ProfileController.java +++ b/src/main/java/kamkeel/npcs/controllers/ProfileController.java @@ -138,9 +138,16 @@ public class ProfileController implements IProfileHandler { if (!profile.getSlots().containsKey(profile.currentSlotId)) { profile.currentSlotId = 0; } + profile.player = player; activeProfiles.put(player.getUniqueID(), profile); - loadSlotData(player); + + PlayerData pdata = PlayerData.get(player); + if (profile.getSlots().containsKey(pdata.profileSlot)) { + profile.currentSlotId = pdata.profileSlot; + } + + saveSlotData(player); verifySlotQuests(profile.player); } } From 3d0c814861748efd46681a7d75d262c8678adae2 Mon Sep 17 00:00:00 2001 From: Kam Date: Mon, 6 Oct 2025 15:24:19 -0400 Subject: [PATCH 154/154] Fix Recipe Button Layout --- .../noppes/npcs/client/gui/global/GuiNpcManageRecipes.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java index dacdccc33..1b83b0639 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiNpcManageRecipes.java @@ -82,9 +82,10 @@ public class GuiNpcManageRecipes extends GuiContainerNPCInterface2 implements IS this.addButton(new GuiButtonBiDirectional(0, guiLeft + 280, y, 130, 20, new String[]{"menu.global", "tile.npcCarpentyBench.name", "tile.anvil.name"}, tab)); y += 106; + y += 44; - this.addButton(new GuiNpcButton(3, guiLeft + 226, y += 22, 50, 20, "gui.add")); - this.addButton(new GuiNpcButton(4, guiLeft + 226, y += 22, 50, 20, "gui.remove")); + this.addButton(new GuiNpcButton(3, guiLeft + 172, y, 50, 20, "gui.add")); + this.addButton(new GuiNpcButton(4, guiLeft + 226, y, 50, 20, "gui.remove")); this.addButton(new GuiNpcButton(10, guiLeft + 226, y += 30, 50, 20, "gui.copy")); if (container.width != 1) {