Better Copy Handling

This commit is contained in:
Kam committed 2026-03-10 03:47:07 -04:00
1 parent 18d788974a
commit 270cb26460
15 files changed
+382 -52

No files matched your search

@@ -11,10 +11,12 @@ import kamkeel.npcs.controllers.data.telegraph.TelegraphInstance;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.packets.request.ability.BuiltInAbilityGetPacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilityGetPacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilityClonePacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilityRemovePacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilitySavePacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilitiesGetPacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilityGetPacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilityClonePacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilityRemovePacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilitySavePacket;
import kamkeel.npcs.network.packets.request.category.AbilityCategoryMovePacket;
@@ -271,24 +273,11 @@ public class GuiAbilityDirectory extends GuiDirectoryCategorized
protected void onCloneItem() {
if (currentIsBuiltIn) return;
if (isChainedMode() && selectedChain != null) {
ChainedAbility clone = new ChainedAbility();
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(true)));
PacketClient.sendClient(new ChainedAbilityClonePacket(selectedChain.getName()));
if (selectedCatId >= 0) requestItemsInCategory(selectedCatId);
} else if (selectedAbility != null) {
NBTTagCompound abilityNbt = selectedAbility.writeNBT(true);
abilityNbt.setString("id", UUID.randomUUID().toString());
Ability clone = AbilityController.Instance.fromNBT(abilityNbt);
if (clone != null) {
String cloneName = selectedAbility.getName() + "_copy";
clone.setName(cloneName);
PacketClient.sendClient(new CustomAbilitySavePacket(clone.writeNBT(true)));
if (selectedCatId >= 0 && isCustomMode()) requestItemsInCategory(selectedCatId);
}
PacketClient.sendClient(new CustomAbilityClonePacket(selectedAbility.getName()));
if (selectedCatId >= 0 && isCustomMode()) requestItemsInCategory(selectedCatId);
}
}
@@ -8,6 +8,7 @@ import kamkeel.npcs.network.packets.request.category.CategoryRemovePacket;
import kamkeel.npcs.network.packets.request.category.CategorySavePacket;
import kamkeel.npcs.network.packets.request.effects.EffectGetPacket;
import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket;
import kamkeel.npcs.network.packets.request.effects.EffectClonePacket;
import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.texture.TextureManager;
@@ -89,12 +90,7 @@ public class GuiEffectDirectory extends GuiDirectoryCategorized {
@Override
protected void onCloneItem() {
if (effect != null && effect.id >= 0) {
NBTTagCompound cloneNbt = effect.writeToNBT(true);
cloneNbt.setInteger("ID", -1);
String name = cloneNbt.getString("name");
while (itemData.containsKey(name)) name += "_";
cloneNbt.setString("name", name);
PacketClient.sendClient(new EffectSavePacket(cloneNbt, ""));
PacketClient.sendClient(new EffectClonePacket(effect.id));
}
}
@@ -9,6 +9,7 @@ import kamkeel.npcs.network.packets.request.category.CategorySavePacket;
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.LinkedItemClonePacket;
import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket;
import kamkeel.npcs.util.ColorUtil;
import net.minecraft.client.gui.GuiScreen;
@@ -90,12 +91,7 @@ public class GuiLinkedItemDirectory extends GuiDirectoryCategorized {
@Override
protected void onCloneItem() {
if (linkedItem != null && linkedItem.id >= 0) {
NBTTagCompound cloneNbt = linkedItem.writeToNBT(true);
cloneNbt.setInteger("Id", -1);
String name = cloneNbt.getString("Name");
while (itemData.containsKey(name)) name += "_";
cloneNbt.setString("Name", name);
PacketClient.sendClient(new LinkedItemSavePacket(cloneNbt, ""));
PacketClient.sendClient(new LinkedItemClonePacket(linkedItem.id));
}
}
@@ -3,6 +3,7 @@ package noppes.npcs.client.gui.global;
import kamkeel.npcs.network.PacketClient;
import kamkeel.npcs.network.packets.request.effects.EffectGetPacket;
import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket;
import kamkeel.npcs.network.packets.request.effects.EffectClonePacket;
import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
import kamkeel.npcs.network.packets.request.effects.EffectsGetPacket;
import net.minecraft.client.gui.GuiButton;
@@ -106,10 +107,9 @@ public class GuiNPCManageEffects extends GuiNPCInterface2 implements ICustomScro
displayGuiScreen(guiyesno);
}
} else if (button.id == 2) {
CustomEffect effect = this.effect.cloneEffect();
while (data.containsKey(effect.name))
effect.name += "_";
PacketClient.sendClient(new EffectSavePacket(effect.writeToNBT(false), ""));
if (effect != null && effect.id >= 0) {
PacketClient.sendClient(new EffectClonePacket(effect.id));
}
}
if (button.id == 66) {
@@ -5,6 +5,7 @@ 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.LinkedItemClonePacket;
import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket;
import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket;
import kamkeel.npcs.network.packets.request.linked.LinkedNPCRemovePacket;
@@ -288,13 +289,7 @@ public class GuiNPCManageLinked extends GuiNPCInterface2 implements IScrollData,
}
if (button.id == 4) {
if (data.containsKey(scroll.getSelected()) && linkedItem != null && linkedItem.id >= 0) {
String name = linkedItem.name;
while (data.containsKey(name))
name += "_";
LinkedItem linkedItemClone = this.linkedItem.clone();
linkedItemClone.name = name;
linkedItemClone.id = -1;
PacketClient.sendClient(new LinkedItemSavePacket(linkedItemClone.writeToNBT(false), ""));
PacketClient.sendClient(new LinkedItemClonePacket(this.linkedItem.id));
}
}
if (button.id == 5) {
@@ -673,13 +673,7 @@ 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() + "_");
}
@@ -714,4 +708,23 @@ public class CustomEffectController implements ICustomEffectHandler {
return getCustomEffects().get(customEffect.getID());
}
public CustomEffect cloneEffect(int originalId) {
CustomEffect original = getCustomEffects().get(originalId);
if (original == null) return null;
NBTTagCompound nbt = original.writeToNBT(true);
int newId = getUnusedId();
nbt.setInteger("ID", newId);
CustomEffect clone = new CustomEffect();
clone.readFromNBT(nbt);
String name = clone.getName();
while (has(name)) name += "_";
clone.name = name;
saveEffect(clone);
return clone;
}
}
@@ -209,13 +209,7 @@ 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() + "_");
}
@@ -247,6 +241,25 @@ public class LinkedItemController implements ILinkedItemHandler {
return linkedItems.get(linkedItem.getId());
}
public LinkedItem cloneLinkedItem(int originalId) {
LinkedItem original = linkedItems.get(originalId);
if (original == null) return null;
NBTTagCompound nbt = original.writeToNBT(true);
int newId = getUnusedId();
nbt.setInteger("Id", newId);
LinkedItem clone = new LinkedItem();
clone.readFromNBT(nbt);
String name = clone.getName();
while (hasName(name)) name += "_";
clone.name = name;
saveLinkedItem(clone);
return clone;
}
private boolean hasOther(String name, int id) {
for (LinkedItem linkedItem : linkedItems.values()) {
if (linkedItem.getId() != id && linkedItem.getName().equalsIgnoreCase(name))