mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-17 16:55:12 +00:00
Fix Linked Item Duplication Bug
This commit is contained in:
1 parent
a5f661b679
commit
fdd47691ae
5 files changed
+57
-20
No files matched your search
+1
-1
Submodule src/api updated: 3f0171aafe...0d9abd56f6.
@@ -2,13 +2,11 @@ package noppes.npcs.controllers.data;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagInt;
|
||||
import net.minecraftforge.common.util.Constants;
|
||||
import noppes.npcs.CustomItems;
|
||||
import noppes.npcs.EventHooks;
|
||||
import noppes.npcs.api.handler.data.ILinkedItem;
|
||||
import noppes.npcs.api.item.IItemStack;
|
||||
import noppes.npcs.controllers.CustomEffectController;
|
||||
import noppes.npcs.controllers.LinkedItemController;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
import noppes.npcs.scripted.item.ScriptLinkedItem;
|
||||
@@ -102,6 +100,7 @@ public class LinkedItem implements ILinkedItem {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ILinkedItem save() {
|
||||
return LinkedItemController.getInstance().saveLinkedItem(this);
|
||||
}
|
||||
@@ -110,6 +109,7 @@ public class LinkedItem implements ILinkedItem {
|
||||
LinkedItemController.getInstance().linkedItemsScripts.put(this.id, handler);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IItemStack createStack() {
|
||||
LinkedItem copy = this.clone();
|
||||
ItemStack stack = new ItemStack(CustomItems.linked_item, 1);
|
||||
|
||||
@@ -1,6 +1,17 @@
|
||||
package noppes.npcs.items;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import noppes.npcs.CustomNpcs;
|
||||
import noppes.npcs.EventHooks;
|
||||
import noppes.npcs.api.item.IItemStack;
|
||||
import noppes.npcs.controllers.LinkedItemController;
|
||||
import noppes.npcs.controllers.data.LinkedItem;
|
||||
import noppes.npcs.scripted.NpcAPI;
|
||||
import noppes.npcs.scripted.item.ScriptLinkedItem;
|
||||
|
||||
public class ItemLinked extends ItemCustomizable {
|
||||
|
||||
@@ -9,4 +20,39 @@ public class ItemLinked extends ItemCustomizable {
|
||||
CustomNpcs.proxy.registerItem(this);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) {
|
||||
if (world.isRemote)
|
||||
return;
|
||||
|
||||
if(world.getTotalWorldTime() % 10 != 0)
|
||||
return;
|
||||
|
||||
IItemStack itemStack = NpcAPI.Instance().getIItemStack(stack);
|
||||
if(itemStack instanceof ScriptLinkedItem){
|
||||
ScriptLinkedItem scriptLinkedItem = (ScriptLinkedItem) itemStack;
|
||||
LinkedItem linkedItem = LinkedItemController.getInstance().get(scriptLinkedItem.linkedItem.getId());
|
||||
int prevVersion = scriptLinkedItem.linkedVersion;
|
||||
if(linkedItem != null && scriptLinkedItem.linkedVersion != linkedItem.version){
|
||||
scriptLinkedItem.linkedItem = linkedItem.clone();
|
||||
scriptLinkedItem.linkedVersion = linkedItem.version;
|
||||
scriptLinkedItem.saveItemData();
|
||||
|
||||
// Send Version Change Event
|
||||
EventHooks.onLinkedItemVersionChange(scriptLinkedItem, linkedItem.version, prevVersion);
|
||||
} else if (linkedItem == null){
|
||||
if (entity instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) entity;
|
||||
player.inventory.setInventorySlotContents(itemSlot, null); // Remove the item
|
||||
player.inventory.markDirty(); // Ensure inventory updates
|
||||
|
||||
// Sync inventory with client
|
||||
if (player instanceof EntityPlayerMP) {
|
||||
((EntityPlayerMP) player).sendContainerToPlayer(player.inventoryContainer);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -488,23 +488,12 @@ public class NpcAPI extends AbstractNpcAPI {
|
||||
}
|
||||
|
||||
// Version Check Linked Item
|
||||
if(scriptStack instanceof ScriptLinkedItem && CustomNpcs.side() == Side.SERVER){
|
||||
ScriptLinkedItem scriptLinkedItem = (ScriptLinkedItem) scriptStack;
|
||||
LinkedItem linkedItem = LinkedItemController.getInstance().get(scriptLinkedItem.linkedItem.getId());
|
||||
|
||||
int prevVersion = scriptLinkedItem.linkedVersion;
|
||||
if(linkedItem != null && scriptLinkedItem.linkedVersion != linkedItem.version){
|
||||
scriptLinkedItem.linkedItem = linkedItem.clone();
|
||||
scriptLinkedItem.linkedVersion = linkedItem.version;
|
||||
scriptLinkedItem.saveItemData();
|
||||
|
||||
// Send Version Change Event
|
||||
EventHooks.onLinkedItemVersionChange(scriptLinkedItem, linkedItem.version, prevVersion);
|
||||
} else if (linkedItem == null){
|
||||
// Destroy Linked Item
|
||||
scriptStack.item.stackSize = 0;
|
||||
}
|
||||
}
|
||||
// if(scriptStack instanceof ScriptLinkedItem && CustomNpcs.side() == Side.SERVER){
|
||||
// ScriptLinkedItem scriptLinkedItem = (ScriptLinkedItem) scriptStack;
|
||||
// LinkedItem linkedItem = LinkedItemController.getInstance().get(scriptLinkedItem.linkedItem.getId());
|
||||
//
|
||||
//
|
||||
// }
|
||||
return scriptStack;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,6 +51,8 @@ public class ScriptLinkedItem extends ScriptCustomizableItem implements IItemLin
|
||||
|
||||
@Override
|
||||
public INpcScriptHandler getScriptHandler() {
|
||||
if(this.getLinkedItem() == null)
|
||||
return null;
|
||||
return this.getLinkedItem().getScriptHandler();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user