Merge branch 'dev' into syntax-highlighter-unified

This commit is contained in:
Kam committed 2026-03-10 05:50:32 -04:00
commit 057ef7b80e
20 files changed
+451 -67

No files matched your search

@@ -401,6 +401,24 @@ public class AbilityController implements IAbilityHandler {
}
}
public Ability cloneCustomAbility(String originalName) {
Ability original = customAbilities.get(originalName);
if (original == null || original.isBuiltIn()) return null;
NBTTagCompound nbt = original.writeNBT(true);
nbt.setString("id", UUID.randomUUID().toString());
Ability clone = fromNBT(nbt);
if (clone == null) return null;
String name = clone.getName();
while (customAbilities.containsKey(name)) name += "_";
clone.setName(name);
saveCustomAbility(clone);
return clone;
}
public boolean deleteCustomAbility(String name) {
if (name == null || name.isEmpty()) return false;
@@ -748,6 +766,24 @@ public class AbilityController implements IAbilityHandler {
}
}
public ChainedAbility cloneChainedAbility(String originalName) {
ChainedAbility original = chainedAbilities.get(originalName);
if (original == null) return null;
NBTTagCompound nbt = original.writeNBT(true);
nbt.setString("Id", UUID.randomUUID().toString());
ChainedAbility clone = new ChainedAbility();
clone.readNBT(nbt);
String name = clone.getName();
while (chainedAbilities.containsKey(name)) name += "_";
clone.setName(name);
saveChainedAbility(clone);
return clone;
}
public boolean deleteChainedAbility(String name) {
if (name == null || name.isEmpty()) return false;
@@ -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;
@@ -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;
@@ -90,6 +90,7 @@ import kamkeel.npcs.network.packets.request.ability.AbilitiesNpcGetPacket;
import kamkeel.npcs.network.packets.request.ability.AbilitiesNpcSavePacket;
import kamkeel.npcs.network.packets.request.ability.BuiltInAbilityGetPacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilitiesGetPacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilityClonePacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilityGetPacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilityRemovePacket;
import kamkeel.npcs.network.packets.request.ability.ChainedAbilitySavePacket;
@@ -100,6 +101,7 @@ import kamkeel.npcs.network.packets.request.category.CategoryListRequestPacket;
import kamkeel.npcs.network.packets.request.category.CategoryMoveItemPacket;
import kamkeel.npcs.network.packets.request.category.CategoryRemovePacket;
import kamkeel.npcs.network.packets.request.category.CategorySavePacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilityClonePacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilityGetPacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilityRemovePacket;
import kamkeel.npcs.network.packets.request.ability.CustomAbilitySavePacket;
@@ -136,6 +138,7 @@ 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.EffectClonePacket;
import kamkeel.npcs.network.packets.request.effects.EffectGetPacket;
import kamkeel.npcs.network.packets.request.effects.EffectRemovePacket;
import kamkeel.npcs.network.packets.request.effects.EffectSavePacket;
@@ -156,6 +159,7 @@ import kamkeel.npcs.network.packets.request.jobs.JobSpawnerRemovePacket;
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.LinkedItemClonePacket;
import kamkeel.npcs.network.packets.request.linked.LinkedItemRemovePacket;
import kamkeel.npcs.network.packets.request.linked.LinkedItemSavePacket;
import kamkeel.npcs.network.packets.request.linked.LinkedNPCAddPacket;
@@ -353,6 +357,7 @@ public class PacketHandler {
REQUEST_PACKET.registerPacket(new LinkedItemSavePacket());
REQUEST_PACKET.registerPacket(new LinkedItemRemovePacket());
REQUEST_PACKET.registerPacket(new LinkedItemBuildPacket());
REQUEST_PACKET.registerPacket(new LinkedItemClonePacket());
// Bank Packets
@@ -509,6 +514,7 @@ public class PacketHandler {
REQUEST_PACKET.registerPacket(new EffectsGetPacket());
REQUEST_PACKET.registerPacket(new EffectSavePacket());
REQUEST_PACKET.registerPacket(new EffectRemovePacket());
REQUEST_PACKET.registerPacket(new EffectClonePacket());
// Magic Packets
REQUEST_PACKET.registerPacket(new MagicCycleRemovePacket());
@@ -533,6 +539,8 @@ public class PacketHandler {
REQUEST_PACKET.registerPacket(new ChainedAbilityGetPacket());
REQUEST_PACKET.registerPacket(new ChainedAbilitySavePacket());
REQUEST_PACKET.registerPacket(new ChainedAbilityRemovePacket());
REQUEST_PACKET.registerPacket(new CustomAbilityClonePacket());
REQUEST_PACKET.registerPacket(new ChainedAbilityClonePacket());
// Category Packets
REQUEST_PACKET.registerPacket(new CategorySavePacket());
@@ -223,4 +223,9 @@ public enum EnumRequestPacket {
CategoryListRequest,
CategoryItemsRequest,
AbilityCategoryMoveItem,
CustomAbilityClone,
ChainedAbilityClone,
LinkedItemClone,
EffectClone,
}
@@ -0,0 +1,71 @@
package kamkeel.npcs.network.packets.request.ability;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.controllers.AbilityController;
import kamkeel.npcs.controllers.data.ability.data.ChainedAbility;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
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;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.NoppesUtilServer;
import java.io.IOException;
public final class ChainedAbilityClonePacket extends AbstractPacket {
public static String packetName = "Request|ChainedAbilityClone";
private String name;
public ChainedAbilityClonePacket() {
}
public ChainedAbilityClonePacket(String name) {
this.name = name;
}
@Override
public Enum getType() {
return EnumRequestPacket.ChainedAbilityClone;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_ABILITY;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeString(out, name);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
return;
String chainName = ByteBufUtils.readString(in);
ChainedAbility clone = AbilityController.Instance.cloneChainedAbility(chainName);
if (clone != null) {
NoppesUtilServer.sendChainedAbilitiesData((EntityPlayerMP) player);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, clone.writeNBT(false));
}
}
}
@@ -0,0 +1,71 @@
package kamkeel.npcs.network.packets.request.ability;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.controllers.AbilityController;
import kamkeel.npcs.controllers.data.ability.Ability;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
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;
import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.NoppesUtilServer;
import java.io.IOException;
public final class CustomAbilityClonePacket extends AbstractPacket {
public static String packetName = "Request|CustomAbilityClone";
private String name;
public CustomAbilityClonePacket() {
}
public CustomAbilityClonePacket(String name) {
this.name = name;
}
@Override
public Enum getType() {
return EnumRequestPacket.CustomAbilityClone;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_ABILITY;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
ByteBufUtils.writeString(out, name);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
return;
String abilityName = ByteBufUtils.readString(in);
Ability clone = AbilityController.Instance.cloneCustomAbility(abilityName);
if (clone != null) {
NoppesUtilServer.sendCustomAbilitiesData((EntityPlayerMP) player);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, clone.writeNBT(false));
}
}
}
@@ -14,6 +14,7 @@ import kamkeel.npcs.util.ByteBufUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.constants.EnumCategoryType;
import noppes.npcs.controllers.CategoryManager;
import java.io.IOException;
@@ -63,6 +64,11 @@ public final class AbilityCategoryMovePacket extends AbstractPacket {
String itemName = ByteBufUtils.readString(in);
int cat = in.readInt();
// Validate target category exists (0 = Uncategorized is always valid)
CategoryManager cm = CategorySavePacket.getManager(type);
if (cm == null) return;
if (cat != CategoryManager.UNCATEGORIZED_ID && cm.getCategory(cat) == null) return;
switch (type) {
case EnumCategoryType.ABILITY:
AbilityController.Instance.moveCustomAbilityToCategory(itemName, cat);
@@ -14,6 +14,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import kamkeel.npcs.controllers.AbilityController;
import noppes.npcs.constants.EnumCategoryType;
import noppes.npcs.controllers.AnimationController;
import noppes.npcs.controllers.CategoryManager;
import noppes.npcs.controllers.CustomEffectController;
import noppes.npcs.controllers.LinkedItemController;
@@ -65,6 +66,11 @@ public final class CategoryMoveItemPacket extends AbstractPacket {
int item = in.readInt();
int cat = in.readInt();
// Validate target category exists (0 = Uncategorized is always valid)
CategoryManager cm = CategorySavePacket.getManager(type);
if (cm == null) return;
if (cat != CategoryManager.UNCATEGORIZED_ID && cm.getCategory(cat) == null) return;
switch (type) {
case EnumCategoryType.EFFECT: CustomEffectController.getInstance().moveItemToCategory(item, cat); break;
case EnumCategoryType.ANIMATION: AnimationController.getInstance().moveItemToCategory(item, cat); break;
@@ -0,0 +1,69 @@
package kamkeel.npcs.network.packets.request.effects;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import io.netty.buffer.ByteBuf;
import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
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;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.controllers.CustomEffectController;
import noppes.npcs.controllers.data.CustomEffect;
import java.io.IOException;
public final class EffectClonePacket extends AbstractPacket {
public static String packetName = "Request|EffectClone";
private int id;
public EffectClonePacket() {
}
public EffectClonePacket(int id) {
this.id = id;
}
@Override
public Enum getType() {
return EnumRequestPacket.EffectClone;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_EFFECT;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
out.writeInt(this.id);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
return;
int effectId = in.readInt();
CustomEffect clone = CustomEffectController.getInstance().cloneEffect(effectId);
if (clone != null) {
NoppesUtilServer.sendCustomEffectDataAll((EntityPlayerMP) player);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, clone.writeToNBT(false));
}
}
}
@@ -0,0 +1,69 @@
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.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
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;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.NoppesUtilServer;
import noppes.npcs.controllers.LinkedItemController;
import noppes.npcs.controllers.data.LinkedItem;
import java.io.IOException;
public final class LinkedItemClonePacket extends AbstractPacket {
public static String packetName = "Request|LinkedItemClone";
private int id;
public LinkedItemClonePacket() {
}
public LinkedItemClonePacket(int id) {
this.id = id;
}
@Override
public Enum getType() {
return EnumRequestPacket.LinkedItemClone;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_LINKED;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
out.writeInt(this.id);
}
@Override
public void receiveData(ByteBuf in, EntityPlayer player) throws IOException {
if (!(player instanceof EntityPlayerMP))
return;
if (!PacketUtil.verifyItemPacket(packetName, EnumItemPacketType.WAND, player))
return;
int linkedId = in.readInt();
LinkedItem clone = LinkedItemController.getInstance().cloneLinkedItem(linkedId);
if (clone != null) {
NoppesUtilServer.sendLinkedItemDataAll((EntityPlayerMP) player);
GuiDataPacket.sendGuiData((EntityPlayerMP) player, clone.writeToNBT(false));
}
}
}
@@ -38,6 +38,7 @@ public class SubGuiTagSelect extends SubGuiInterface implements IScrollData, ICu
public SubGuiTagSelect(HashSet<UUID> tagUUIDs) {
this.tagUUIDs = tagUUIDs;
setBackground("menubg.png");
closeOnEsc = true;
xSize = 430;
ySize = 220;
@@ -142,6 +143,10 @@ public class SubGuiTagSelect extends SubGuiInterface implements IScrollData, ICu
}
public void keyTyped(char c, int i) {
if (i == 1) {
close();
return;
}
super.keyTyped(c, i);
if (getTextField(4) != null) {
if (search.equals(getTextField(4).getText()))
@@ -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,21 +273,11 @@ public class GuiAbilityDirectory extends GuiDirectoryCategorized
protected void onCloneItem() {
if (currentIsBuiltIn) return;
if (isChainedMode() && selectedChain != null) {
ChainedAbility clone = new ChainedAbility();
clone.readNBT(selectedChain.writeNBT(false));
String cloneName = selectedChain.getName() + "_copy";
clone.setName(cloneName);
PacketClient.sendClient(new ChainedAbilitySavePacket(clone.writeNBT(false)));
PacketClient.sendClient(new ChainedAbilityClonePacket(selectedChain.getName()));
if (selectedCatId >= 0) requestItemsInCategory(selectedCatId);
} else if (selectedAbility != null) {
Ability clone = AbilityController.Instance.fromNBT(selectedAbility.writeNBT(false));
if (clone != null) {
clone.setId(UUID.randomUUID().toString());
String cloneName = selectedAbility.getName() + "_copy";
clone.setName(cloneName);
PacketClient.sendClient(new CustomAbilitySavePacket(clone.writeNBT(false)));
if (selectedCatId >= 0 && isCustomMode()) requestItemsInCategory(selectedCatId);
}
PacketClient.sendClient(new CustomAbilityClonePacket(selectedAbility.getName()));
if (selectedCatId >= 0 && isCustomMode()) requestItemsInCategory(selectedCatId);
}
}
@@ -772,44 +764,47 @@ public class GuiAbilityDirectory extends GuiDirectoryCategorized
GL11.glEnable(GL11.GL_SCISSOR_TEST);
setScissorClip(previewX, previewY, previewW, previewH);
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
GL11.glPushMatrix();
GL11.glTranslatef(npcScreenX, npcScreenY, 500F);
GL11.glScalef(-renderZoom, renderZoom, renderZoom);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(CAMERA_PITCH, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
GL11.glRotatef(135F, 0.0F, 1.0F, 0.0F);
RenderHelper.enableStandardItemLighting();
GL11.glRotatef(-135F, 0.0F, 1.0F, 0.0F);
GL11.glTranslatef(0.0F, npc.yOffset, 0.0F);
RenderManager.instance.playerViewY = 180F;
ClientEventHandler.renderingEntityInGUI = true;
// Render NPC at its position delta
try {
RenderManager.instance.renderEntityWithPosYaw(npc, npcDeltaX, npcDeltaY, npcDeltaZ, 0.0F, partialTicks);
} catch (Exception ignored) {}
GL11.glEnable(GL11.GL_COLOR_MATERIAL);
GL11.glPushMatrix();
// Render preview entities
renderPreviewEntities(partialTicks);
GL11.glTranslatef(npcScreenX, npcScreenY, 500F);
GL11.glScalef(-renderZoom, renderZoom, renderZoom);
GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
GL11.glRotatef(CAMERA_PITCH, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(rotation, 0.0F, 1.0F, 0.0F);
// Render telegraph
renderPreviewTelegraph(partialTicks);
GL11.glRotatef(135F, 0.0F, 1.0F, 0.0F);
RenderHelper.enableStandardItemLighting();
GL11.glRotatef(-135F, 0.0F, 1.0F, 0.0F);
ClientEventHandler.renderingEntityInGUI = false;
GL11.glPopMatrix();
GL11.glTranslatef(0.0F, npc.yOffset, 0.0F);
RenderManager.instance.playerViewY = 180F;
ClientEventHandler.renderingEntityInGUI = true;
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
GL11.glDisable(GL11.GL_TEXTURE_2D);
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
// Render NPC at its position delta
try {
RenderManager.instance.renderEntityWithPosYaw(npc, npcDeltaX, npcDeltaY, npcDeltaZ, 0.0F, partialTicks);
} catch (Exception ignored) {}
GL11.glDisable(GL11.GL_SCISSOR_TEST);
// Render preview entities
renderPreviewEntities(partialTicks);
// Render telegraph
renderPreviewTelegraph(partialTicks);
ClientEventHandler.renderingEntityInGUI = false;
GL11.glPopMatrix();
RenderHelper.disableStandardItemLighting();
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
GL11.glDisable(GL11.GL_TEXTURE_2D);
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
} finally {
ClientEventHandler.renderingEntityInGUI = false;
GL11.glDisable(GL11.GL_SCISSOR_TEST);
}
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
}
@@ -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,9 +90,7 @@ public class GuiEffectDirectory extends GuiDirectoryCategorized {
@Override
protected void onCloneItem() {
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 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,10 +91,7 @@ public class GuiLinkedItemDirectory extends GuiDirectoryCategorized {
@Override
protected void onCloneItem() {
if (linkedItem != null && linkedItem.id >= 0) {
LinkedItem clone = linkedItem.clone();
while (itemData.containsKey(clone.name)) clone.name += "_";
clone.id = -1;
PacketClient.sendClient(new LinkedItemSavePacket(clone.writeToNBT(false), ""));
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) {
@@ -771,7 +771,7 @@ public abstract class GuiDirectoryCategorized extends GuiDirectory
if (subgui instanceof SubGuiEditText) {
if (!((SubGuiEditText) subgui).cancelled && selectedCatId > 0) {
String name = ((SubGuiEditText) subgui).text;
if (name != null && !name.isEmpty() && !catData.containsKey(name)) {
if (name != null && !name.isEmpty() && !name.equals(prevCatName) && !catData.containsKey(name)) {
Category cat = new Category(selectedCatId, name);
onSaveCategory(cat);
catData.remove(prevCatName);
@@ -779,6 +779,8 @@ public abstract class GuiDirectoryCategorized extends GuiDirectory
prevCatName = name;
}
}
// Restore category selection to current name (handles validation failure)
catScroll.setSelected(prevCatName);
}
if (subgui instanceof SubGuiCategoryMoveConfirm) {
SubGuiCategoryMoveConfirm confirm = (SubGuiCategoryMoveConfirm) subgui;
@@ -708,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;
}
}
@@ -241,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))