Fix upgrades not being able to be properly removed

jaquadro · Jul 8, 2017 · f77d9e5 · f77d9e5
1 parent 08176d1
commit f77d9e5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -131,7 +131,6 @@ jar {
     include "com/jaquadro/minecraft/storagedrawers/**"
     include "assets/**"
     include "mcmod.info"
-    include "pack.mcmeta"
 }
 
 task deobfJar(type: Jar) {

diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 
 minecraft_base_version=1.12
 minecraft_version=1.12
-mod_version=5.2.3
+mod_version=5.2.4
 chameleon_version=4.1.0
 chameleon_max_version=5.0.0
 

diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/tile/tiledata/UpgradeData.java b/src/com/jaquadro/minecraft/storagedrawers/block/tile/tiledata/UpgradeData.java
@@ -79,7 +79,7 @@ public boolean setUpgrade (int slot, @Nonnull ItemStack upgrade) {
         upgrades[slot] = ItemStack.EMPTY;
         syncStorageMultiplier();
 
-        if (!canAddUpgrade(upgrade)) {
+        if (!upgrade.isEmpty() && !canAddUpgrade(upgrade)) {
             upgrades[slot] = prevUpgrade;
             syncStorageMultiplier();
             return false;

diff --git a/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java b/src/com/jaquadro/minecraft/storagedrawers/inventory/InventoryUpgrade.java
@@ -14,7 +14,7 @@
 
 public class InventoryUpgrade implements IInventory
 {
-    private static final int upgradeCapacity = 5;
+    private static final int upgradeCapacity = 7;
 
     private TileEntityDrawers tile;