Skip to content

#700 fix #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avalon2106 wants to merge 1 commit into
base: dev/main
Choose a base branch
from
Open

#700 fix #713

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/main/java/pl/pabilo8/immersiveintelligence/common/util/item/IIArmorItemStackHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package pl.pabilo8.immersiveintelligence.common.util.item;

import blusunrize.immersiveengineering.common.util.EnergyHelper;
import blusunrize.immersiveengineering.common.util.ItemNBTHelper;
import blusunrize.immersiveengineering.common.util.Utils;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
Expand Down Expand Up @@ -53,6 +56,12 @@ protected void onContentsChanged(int slot)
super.onContentsChanged(slot);
if(onChange!=null)
onChange.run();
//set inventory to the itemstack so it survives being removed from the workbench
if(this.stack!=null && !this.stack.isEmpty())
{
NBTTagList list = Utils.writeInventory(this.stacks);
ItemNBTHelper.getTag(this.stack).setTag("Inv", list);
}
}

@Override
Expand All @@ -69,10 +78,20 @@ public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFaci
{
int idealSize = ((ItemIIUpgradeableArmor)stack.getItem()).getSlotCount();
NonNullList<ItemStack> newList = NonNullList.withSize(idealSize, ItemStack.EMPTY);
for(int i = 0; i < Math.min(stacks.size(), idealSize); i++)
newList.set(i, stacks.get(i));
//If itemstack already had a saved inventory, load it. Otherwise keep items as is
if(ItemNBTHelper.hasKey(this.stack, "Inv"))
{
NBTTagList list = ItemNBTHelper.getTag(this.stack).getTagList("Inv", 10);
NonNullList<ItemStack> inv = Utils.readInventory(list, idealSize);
for(int i = 0; i < Math.min(inv.size(), idealSize); i++)
newList.set(i, inv.get(i));
}
else
{
for(int i = 0; i < Math.min(stacks.size(), idealSize); i++)
newList.set(i, stacks.get(i));
}
stacks = newList;
stack = ItemStack.EMPTY;
first = false;
}
if(capability==CapabilityEnergy.ENERGY)
Expand Down
Loading