From e6702d3c6f15e67fe6db67089809fdb8fd120ac3 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 3 Jul 2015 00:23:44 +0200 Subject: [PATCH] Tweaked the Inputter --- .../ellpeck/actuallyadditions/tile/TileEntityInputter.java | 6 ++---- src/main/resources/assets/actuallyadditions/lang/en_US.lang | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java index 18ce63522..65d27c101 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java @@ -138,8 +138,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt boolean can = false; ItemStack theStack = null; - for(int i = theSlotToPull; i < this.slotToPullEnd; i++){ - if(i < 0) continue; + for(int i = Math.max(theSlotToPull, 0); i < this.slotToPullEnd; i++){ if(i >= theInventory.getSizeInventory()) return; ItemStack tempStack = theInventory.getStackInSlot(i); @@ -201,8 +200,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt if(this.slots[0] != null){ ItemStack theStack = null; - for(int i = theSlotToPut; i < this.slotToPutEnd; i++){ - if(i < 0) continue; + for(int i = Math.max(theSlotToPut, 0); i < this.slotToPutEnd; i++){ if(i >= theInventory.getSizeInventory()) return; ItemStack tempStack = theInventory.getStackInSlot(i); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 695e353a3..5eef799ed 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -554,10 +554,6 @@ info.actuallyadditions.update.download.desc=[{"text":"Download the newest Versio info.actuallyadditions.update.failed.desc=[{"text":"The Update Check for "},{"text":"Actually Additions ","color":"dark_green","bold":"true"},{"text":"failed! Check your Internet Connection and the Logs for more Info!","color":"none"}] info.actuallyadditions.update.changelog.desc=Updates: %s -info.actuallyadditions.squidKilled.desc.1=You just killed a squid, am I right!? -info.actuallyadditions.squidKilled.desc.2=YOU DIDN'T JUST DO THAT! -info.actuallyadditions.squidKilled.desc.3=The thing you just did... someone's gonna be pissed about that! - achievement.actuallyadditions.pickUpSolidXP=Square and yummy! achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience achievement.actuallyadditions.craftKnifeBlade=Sharp! So Sharp!