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

Storage saving fixes

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-06-23 20:06:41 +02:00
parent a91f760d2e
commit cfa6e76347
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/refinedstorage/block/BlockStorage.java
View File

@@ -85,10 +85,6 @@ public class BlockStorage extends BlockSlave {
public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { public List<ItemStack> getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
TileStorage storage = (TileStorage) world.getTileEntity(pos); TileStorage storage = (TileStorage) world.getTileEntity(pos);
if (storage.getStorage() != null) {
storage.getStorage().writeToNBT();
}
List<ItemStack> drops = new ArrayList<ItemStack>(); List<ItemStack> drops = new ArrayList<ItemStack>();
ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state));

12
src/main/java/refinedstorage/tile/TileDiskDrive.java
View File

@@ -5,6 +5,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
@@ -97,6 +98,17 @@ public class TileDiskDrive extends TileSlave implements IStorageProvider, IStora
public void updateSlave() { public void updateSlave() {
} }
@Override
public void disconnect(World world) {
super.disconnect(world);
for (Storage storage : this.storages) {
if (storage != null) {
storage.writeToNBT();
}
}
}
@Override @Override
public void provide(List<IStorage> storages) { public void provide(List<IStorage> storages) {
for (IStorage storage : this.storages) { for (IStorage storage : this.storages) {

10
src/main/java/refinedstorage/tile/TileStorage.java
View File

@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorage;
@@ -78,6 +79,15 @@ public class TileStorage extends TileSlave implements IStorageProvider, IStorage
} }
} }
@Override
public void disconnect(World world) {
super.disconnect(world);
if (storage != null) {
storage.writeToNBT();
}
}
@Override @Override
public void provide(List<IStorage> storages) { public void provide(List<IStorage> storages) {
if (storage != null) { if (storage != null) {