mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-19 04:59:05 +00:00
Cloning for Scripts
This commit is contained in:
1 parent
b05a028137
commit
ba9ae62e51
8 files changed
+37
-10
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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
|
||||
|
||||
+5
-1
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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), ""));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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), ""));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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() + "_");
|
||||
}
|
||||
|
||||
@@ -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() + "_");
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user