From ba9ae62e514e7b96a30783582a081deb1ad1e75f Mon Sep 17 00:00:00 2001 From: Kam Date: Tue, 10 Mar 2026 02:45:52 -0400 Subject: [PATCH] Cloning for Scripts --- .../controllers/data/ability/AbilityAction.java | 11 +++++++++-- .../data/ability/data/ChainedAbility.java | 1 + .../ability/data/entry/ChainedAbilityEntry.java | 6 +++++- .../npcs/client/gui/global/GuiAbilityDirectory.java | 13 ++++++++----- .../npcs/client/gui/global/GuiEffectDirectory.java | 2 +- .../client/gui/global/GuiLinkedItemDirectory.java | 2 +- .../npcs/controllers/CustomEffectController.java | 6 ++++++ .../npcs/controllers/LinkedItemController.java | 6 ++++++ 8 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java index 5c156a056..e9909bcf9 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AbilityAction.java @@ -5,6 +5,8 @@ import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import kamkeel.npcs.controllers.data.ability.data.IAbilityAction; import net.minecraft.nbt.NBTTagCompound; +import java.util.UUID; + /** * Unified slot for storing any combat action: inline ability, ability reference, or chain reference. * Support for all {@link IAbilityAction} types. @@ -218,7 +220,9 @@ public class AbilityAction { Ability resolved = getAbility(); if (resolved == null) return false; - inlineAbility = AbilityController.Instance.fromNBT(resolved.writeNBT(true)); + NBTTagCompound nbt = resolved.writeNBT(true); + nbt.setString("id", UUID.randomUUID().toString()); + inlineAbility = AbilityController.Instance.fromNBT(nbt); slotType = SlotType.INLINE_ABILITY; referenceId = null; cachedAction = null; @@ -230,7 +234,10 @@ public class AbilityAction { ChainedAbility resolved = getChainedAbility(); if (resolved == null) return false; - inlineChain = resolved.deepCopy(); + inlineChain = new ChainedAbility(); + NBTTagCompound chainNbt = resolved.writeNBT(true); + chainNbt.setString("Id", UUID.randomUUID().toString()); + inlineChain.readNBT(chainNbt); slotType = SlotType.INLINE_CHAIN; referenceId = null; cachedAction = null; diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java index bdf95508f..fea8005d3 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/ChainedAbility.java @@ -15,6 +15,7 @@ import kamkeel.npcs.util.FileNameHelper; import java.util.ArrayList; import java.util.List; +import java.util.UUID; /** * A chained ability is an ordered sequence of ability references that execute diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java index 0e7b4bf97..ec7fade19 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/data/entry/ChainedAbilityEntry.java @@ -5,6 +5,8 @@ import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.data.ChainedAbility; import net.minecraft.nbt.NBTTagCompound; +import java.util.UUID; + /** * A single entry in a {@link ChainedAbility}, representing one ability * to execute in sequence along with its delay configuration. @@ -155,7 +157,9 @@ public class ChainedAbilityEntry { Ability resolved = ctrl.resolveAbility(abilityReference); if (resolved == null) return false; - inlineAbility = ctrl.fromNBT(resolved.writeNBT(true)); + NBTTagCompound nbt = resolved.writeNBT(true); + nbt.setString("id", UUID.randomUUID().toString()); + inlineAbility = ctrl.fromNBT(nbt); entryType = EntryType.INLINE; abilityReference = ""; return true; diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java index 0fc52f08b..b16bccd81 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiAbilityDirectory.java @@ -272,18 +272,21 @@ public class GuiAbilityDirectory extends GuiDirectoryCategorized if (currentIsBuiltIn) return; if (isChainedMode() && selectedChain != null) { ChainedAbility clone = new ChainedAbility(); - clone.readNBT(selectedChain.writeNBT(false)); + NBTTagCompound chainNbt = selectedChain.writeNBT(true); + chainNbt.setString("Id", UUID.randomUUID().toString()); + clone.readNBT(chainNbt); String cloneName = selectedChain.getName() + "_copy"; clone.setName(cloneName); - PacketClient.sendClient(new ChainedAbilitySavePacket(clone.writeNBT(false))); + PacketClient.sendClient(new ChainedAbilitySavePacket(clone.writeNBT(true))); if (selectedCatId >= 0) requestItemsInCategory(selectedCatId); } else if (selectedAbility != null) { - Ability clone = AbilityController.Instance.fromNBT(selectedAbility.writeNBT(false)); + NBTTagCompound abilityNbt = selectedAbility.writeNBT(true); + abilityNbt.setString("id", UUID.randomUUID().toString()); + Ability clone = AbilityController.Instance.fromNBT(abilityNbt); if (clone != null) { - clone.setId(UUID.randomUUID().toString()); String cloneName = selectedAbility.getName() + "_copy"; clone.setName(cloneName); - PacketClient.sendClient(new CustomAbilitySavePacket(clone.writeNBT(false))); + PacketClient.sendClient(new CustomAbilitySavePacket(clone.writeNBT(true))); if (selectedCatId >= 0 && isCustomMode()) requestItemsInCategory(selectedCatId); } } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java index c6af6597d..dedce0052 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiEffectDirectory.java @@ -91,7 +91,7 @@ public class GuiEffectDirectory extends GuiDirectoryCategorized { if (effect != null && effect.id >= 0) { CustomEffect clone = effect.cloneEffect(); while (itemData.containsKey(clone.name)) clone.name += "_"; - PacketClient.sendClient(new EffectSavePacket(clone.writeToNBT(false), "")); + PacketClient.sendClient(new EffectSavePacket(clone.writeToNBT(true), "")); } } diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java b/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java index 2b9744758..92715a8fc 100644 --- a/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java +++ b/src/main/java/noppes/npcs/client/gui/global/GuiLinkedItemDirectory.java @@ -93,7 +93,7 @@ public class GuiLinkedItemDirectory extends GuiDirectoryCategorized { LinkedItem clone = linkedItem.clone(); while (itemData.containsKey(clone.name)) clone.name += "_"; clone.id = -1; - PacketClient.sendClient(new LinkedItemSavePacket(clone.writeToNBT(false), "")); + PacketClient.sendClient(new LinkedItemSavePacket(clone.writeToNBT(true), "")); } } diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java index 528a3397d..c5f083788 100644 --- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java +++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java @@ -673,7 +673,13 @@ public class CustomEffectController implements ICustomEffectHandler { @Override public ICustomEffect saveEffect(ICustomEffect customEffect) { if (customEffect.getID() < 0) { + int oldId = customEffect.getID(); customEffect.setID(getUnusedId()); + // Move script handler from old ID to new ID (e.g. during clone) + EffectScript handler = customEffectScriptHandlers.remove(oldId); + if (handler != null) { + customEffectScriptHandlers.put(customEffect.getID(), handler); + } while (has(customEffect.getName())) customEffect.setName(customEffect.getName() + "_"); } diff --git a/src/main/java/noppes/npcs/controllers/LinkedItemController.java b/src/main/java/noppes/npcs/controllers/LinkedItemController.java index 54f676fc8..1820a21ac 100644 --- a/src/main/java/noppes/npcs/controllers/LinkedItemController.java +++ b/src/main/java/noppes/npcs/controllers/LinkedItemController.java @@ -209,7 +209,13 @@ public class LinkedItemController implements ILinkedItemHandler { public ILinkedItem saveLinkedItem(ILinkedItem linkedItem) { if (linkedItem.getId() < 0) { + int oldId = linkedItem.getId(); linkedItem.setId(getUnusedId()); + // Move script handler from old ID to new ID (e.g. during clone) + LinkedItemScript handler = linkedItemsScripts.remove(oldId); + if (handler != null) { + linkedItemsScripts.put(linkedItem.getId(), handler); + } while (hasName(linkedItem.getName())) linkedItem.setName(linkedItem.getName() + "_"); }