dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed storage not saving ItemStack capabilities

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-06 20:10:07 +02:00
parent e9d1bf0385
commit 6ffeca4c54
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
- Fixed not being able to place sugar cane - Fixed not being able to place sugar cane
- Fixed not being able to place seeds - Fixed not being able to place seeds
- Fixed stacks not splitting between storages correctly - Fixed stacks not splitting between storages correctly
- Fixed storage not saving ItemStack capabilities
**Features** **Features**
- Added an API - Added an API

17
src/main/java/refinedstorage/api/storage/NBTStorage.java
View File

@@ -21,6 +21,7 @@ public abstract class NBTStorage implements IStorage {
public static final String NBT_ITEM_QUANTITY = "Quantity"; public static final String NBT_ITEM_QUANTITY = "Quantity";
public static final String NBT_ITEM_DAMAGE = "Damage"; public static final String NBT_ITEM_DAMAGE = "Damage";
public static final String NBT_ITEM_NBT = "NBT"; public static final String NBT_ITEM_NBT = "NBT";
public static final String NBT_ITEM_CAPS = "Caps";
private NBTTagCompound tag; private NBTTagCompound tag;
private int capacity; private int capacity;
@@ -49,10 +50,11 @@ public abstract class NBTStorage implements IStorage {
ItemStack stack = new ItemStack( ItemStack stack = new ItemStack(
Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)), Item.getItemById(tag.getInteger(NBT_ITEM_TYPE)),
tag.getInteger(NBT_ITEM_QUANTITY), tag.getInteger(NBT_ITEM_QUANTITY),
tag.getInteger(NBT_ITEM_DAMAGE) tag.getInteger(NBT_ITEM_DAMAGE),
tag.hasKey(NBT_ITEM_CAPS) ? tag.getCompoundTag(NBT_ITEM_CAPS) : null
); );
stack.setTagCompound(tag.hasKey(NBT_ITEM_NBT) ? ((NBTTagCompound) tag.getTag(NBT_ITEM_NBT)) : null); stack.setTagCompound(tag.hasKey(NBT_ITEM_NBT) ? tag.getCompoundTag(NBT_ITEM_NBT) : null);
if (stack.getItem() != null) { if (stack.getItem() != null) {
stacks.add(stack); stacks.add(stack);
@@ -68,6 +70,9 @@ public abstract class NBTStorage implements IStorage {
public void writeToNBT(NBTTagCompound tag) { public void writeToNBT(NBTTagCompound tag) {
NBTTagList list = new NBTTagList(); NBTTagList list = new NBTTagList();
// Dummy value for extracting ForgeCaps
NBTTagCompound dummy = new NBTTagCompound();
for (ItemStack stack : stacks) { for (ItemStack stack : stacks) {
NBTTagCompound itemTag = new NBTTagCompound(); NBTTagCompound itemTag = new NBTTagCompound();
@@ -79,6 +84,14 @@ public abstract class NBTStorage implements IStorage {
itemTag.setTag(NBT_ITEM_NBT, stack.getTagCompound()); itemTag.setTag(NBT_ITEM_NBT, stack.getTagCompound());
} }
stack.writeToNBT(dummy);
if (dummy.hasKey("ForgeCaps")) {
itemTag.setTag(NBT_ITEM_CAPS, dummy.getTag("ForgeCaps"));
}
dummy.removeTag("ForgeCaps");
list.appendTag(itemTag); list.appendTag(itemTag);
} }