From a06d1635759f2791bd0e6e2b0fac404b26991f9e Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 14 Oct 2016 23:00:47 +0200 Subject: [PATCH] Storage disks and storage blocks now don't despawn anymore when dropped in the world --- CHANGELOG.md | 1 + CREDITS.md | 1 + src/main/java/refinedstorage/item/ItemBlockFluidStorage.java | 5 +++++ src/main/java/refinedstorage/item/ItemBlockStorage.java | 5 +++++ src/main/java/refinedstorage/item/ItemFluidStorageDisk.java | 5 +++++ src/main/java/refinedstorage/item/ItemStorageDisk.java | 5 +++++ 6 files changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d7853192..28a82c789 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - The Destructor can now pick up items in the world (InusualZ) - Stack upgrade in Importer / Exporter in fluid mode and Fluid Interface now transfers 64 buckets at once (raoulvdberge) - Detector without any filter will detect based on total items or fluids stored (raoulvdberge) +- Storage disks and storage blocks now don't despawn anymore when dropped in the world (raoulvdberge) - Fixed resetting a stack of patterns yields 1 blank pattern (raoulvdberge) - Fixed being able to pipe items in the export slots of the Interface (InusualZ) - Fixed Interface being stuck when item isn't accepted in storage (InusualZ) diff --git a/CREDITS.md b/CREDITS.md index dcc2c47bf..f8271f0f3 100755 --- a/CREDITS.md +++ b/CREDITS.md @@ -4,6 +4,7 @@ - raoulvdberge - way2muchnoise - tomevoll (providing small patches) +- InusualZ (providing small features) - blay09 (Crafting Tweaks integration) ## Art diff --git a/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java b/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java index 1719caac8..bc88e67b0 100755 --- a/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockFluidStorage.java @@ -81,6 +81,11 @@ public class ItemBlockFluidStorage extends ItemBlockBase { initNBT(stack); } + @Override + public int getEntityLifespan(ItemStack stack, World world) { + return Integer.MAX_VALUE; + } + public static ItemStack initNBT(ItemStack stack) { NBTTagCompound tag = new NBTTagCompound(); tag.setTag(TileFluidStorage.NBT_STORAGE, FluidStorageNBT.createNBT()); diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index 4f179ca4a..87052c98c 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -81,6 +81,11 @@ public class ItemBlockStorage extends ItemBlockBase { initNBT(stack); } + @Override + public int getEntityLifespan(ItemStack stack, World world) { + return Integer.MAX_VALUE; + } + public static ItemStack initNBT(ItemStack stack) { NBTTagCompound tag = new NBTTagCompound(); tag.setTag(TileStorage.NBT_STORAGE, ItemStorageNBT.createNBT()); diff --git a/src/main/java/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/refinedstorage/item/ItemFluidStorageDisk.java index b0b1630b2..8ecc8af42 100755 --- a/src/main/java/refinedstorage/item/ItemFluidStorageDisk.java +++ b/src/main/java/refinedstorage/item/ItemFluidStorageDisk.java @@ -114,4 +114,9 @@ public class ItemFluidStorageDisk extends ItemBase { FluidStorageNBT.createStackWithNBT(stack); } + + @Override + public int getEntityLifespan(ItemStack stack, World world) { + return Integer.MAX_VALUE; + } } diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java index e793eade6..0457cc721 100755 --- a/src/main/java/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -125,4 +125,9 @@ public class ItemStorageDisk extends ItemBase { ItemStorageNBT.createStackWithNBT(stack); } + + @Override + public int getEntityLifespan(ItemStack stack, World world) { + return Integer.MAX_VALUE; + } }