From 0930cfd43e98836d5bd34751771d018b1b6269ef Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 7 Sep 2014 14:29:36 -0400 Subject: [PATCH 1/2] Fix crash when transferring some modded items. --- .../storagedrawers/block/tile/TileEntityDrawers.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java index 74aaeb8..4430a33 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/tile/TileEntityDrawers.java @@ -80,6 +80,13 @@ public class TileEntityDrawers extends TileEntity implements ISidedInventory return item.getItemStackLimit(protoStack) * stackCapacity(); } + public int stackSize () { + if (item == null) + return 0; + + return item.getItemStackLimit(protoStack); + } + public int remainingCapacity () { if (item == null) return 0; @@ -163,10 +170,7 @@ public class TileEntityDrawers extends TileEntity implements ISidedInventory } public int getStackSize (int slot) { - if (data[slot].getItem() == null) - return 0; - - return data[slot].getItem().getItemStackLimit(null); + return data[slot].stackSize(); } public ItemStack getSingleItemStack (int slot) { From 3f1fea32ec1ec30e103e09f65c2d742d49e20559 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Sun, 7 Sep 2014 14:34:24 -0400 Subject: [PATCH 2/2] Version update --- build.gradle | 2 +- resources/mcmod.info | 2 +- src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 796fa8e..fc2a9bc 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { apply plugin: 'forge' -version = "1.0.4" +version = "1.0.5" group= "com.jaquadro.storagedrawers" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "StorageDrawers" diff --git a/resources/mcmod.info b/resources/mcmod.info index 674d99d..c16a543 100644 --- a/resources/mcmod.info +++ b/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "StorageDrawers", "name": "Storage Drawers", "description": "Multi-drawer storage blocks for quick storage and retrieval.", - "version": "1.0.4", + "version": "1.0.5", "credits": "By jaquadro", "logoFile": "", "url": "http://www.jaquadro.com/", diff --git a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java index 402ac20..1345191 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/StorageDrawers.java @@ -19,7 +19,7 @@ public class StorageDrawers { public static final String MOD_ID = "StorageDrawers"; public static final String MOD_NAME = "Storage Drawers"; - public static final String MOD_VERSION = "1.0.4"; + public static final String MOD_VERSION = "1.0.5"; static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawers."; public static final ModBlocks blocks = new ModBlocks();