Merge pull request #23 from GTNewHorizons/experimental

update

4 files changed, 8 insertions, 21 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index 4e80b7b779..73a8fac252 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -17,8 +17,7 @@ import net.minecraft.item.ItemStack;
 import java.util.Arrays;
 import java.util.Comparator;
 
-public class GT_MetaTileEntity_ChestBuffer
-        extends GT_MetaTileEntity_Buffer {
+public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
     private static final int[] tickRate = {400, 200, 100, 20, 4, 1, 1, 1, 1, 1, 1, 1, 1};
 
 
@@ -26,7 +25,7 @@ public class GT_MetaTileEntity_ChestBuffer
         super(aID, aName, aNameRegional, aTier, 28, new String[]{
                         		"Buffers up to 27 Item Stacks",
                         		"Use Screwdriver to regulate output stack size",
-                        		"Consumes 3EU per moved Item",
+                        		"Does not consume energy to move Item",
                         		getTickRateDesc(aTier)});
     }
 
@@ -69,10 +68,7 @@ public class GT_MetaTileEntity_ChestBuffer
         if ( (mSuccess <= 0 ) || (mSuccess > 43) || ((mSuccess % 5) == 0 )){
             super.moveItems(aBaseMetaTileEntity, aTimer);
         }
-        // mSuccesss is set to 50 on a successful move
-        //if(mSuccess == 50) {
-        //    fillStacksIntoFirstSlots();
-        //}
+
         if(mSuccess < 0) {
             mSuccess = 0;
         }
@@ -110,13 +106,7 @@ public class GT_MetaTileEntity_ChestBuffer
                     id1 = o1.getItemDamage();
                     id2 = o2.getItemDamage();
 
-                    if ( id1 < id2 ) {
-                        return -1;
-                    }
-                    if ( id1 > id2 ) {
-                        return 1;
-                    }
-                    return 0;
+                    return Integer.compare(id1, id2);
                 }
             });
     }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
index a2f17ef6f3..1f87b45ced 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
@@ -13,8 +13,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class GT_MetaTileEntity_Filter
-        extends GT_MetaTileEntity_Buffer {
+public class GT_MetaTileEntity_Filter extends GT_MetaTileEntity_Buffer {
     public boolean bIgnoreNBT = false;
     public boolean bInvertFilter = false;
 
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
index da35f17518..84df068972 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
@@ -9,13 +9,12 @@ import gregtech.common.gui.GT_Container_SuperBuffer;
 import gregtech.common.gui.GT_GUIContainer_SuperBuffer;
 import net.minecraft.entity.player.InventoryPlayer;
 
-public class GT_MetaTileEntity_SuperBuffer
-        extends GT_MetaTileEntity_ChestBuffer {
+public class GT_MetaTileEntity_SuperBuffer extends GT_MetaTileEntity_ChestBuffer {
     public GT_MetaTileEntity_SuperBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 257, new String[]{
                         		"Buffers up to 256 Item Stacks",
                         		"Use Screwdriver to regulate output stack size",
-                        		"Consumes 1EU per moved Item",
+                        		"Does not consume energy to move Item",
                                 getTickRateDesc(aTier)});
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
index 6292a769a2..ec60dc00e9 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
@@ -16,8 +16,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class GT_MetaTileEntity_TypeFilter
-        extends GT_MetaTileEntity_Buffer {
+public class GT_MetaTileEntity_TypeFilter extends GT_MetaTileEntity_Buffer {
     public boolean bNBTAllowed = false;
     public boolean bInvertFilter = false;
     public int mRotationIndex = 0;