From edcc279c4581d86881ff8bea3e05440d92c0ffff Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Wed, 15 Jul 2015 11:23:11 +0200
Subject: [PATCH] Fixed up Container Derpup

---
 .../ellpeck/actuallyadditions/inventory/ContainerBreaker.java   | 2 +-
 .../actuallyadditions/inventory/ContainerCanolaPress.java       | 2 +-
 .../actuallyadditions/inventory/ContainerCoalGenerator.java     | 2 +-
 .../actuallyadditions/inventory/ContainerCoffeeMachine.java     | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerDrill.java     | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerDropper.java   | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerEnergizer.java | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerEnervator.java | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerFeeder.java    | 2 +-
 .../actuallyadditions/inventory/ContainerFermentingBarrel.java  | 2 +-
 .../actuallyadditions/inventory/ContainerFluidCollector.java    | 2 +-
 .../actuallyadditions/inventory/ContainerFurnaceDouble.java     | 2 +-
 .../actuallyadditions/inventory/ContainerGiantChest.java        | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerGrinder.java   | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerInputter.java  | 2 +-
 .../actuallyadditions/inventory/ContainerOilGenerator.java      | 2 +-
 .../actuallyadditions/inventory/ContainerPhantomPlacer.java     | 2 +-
 .../ellpeck/actuallyadditions/inventory/ContainerRepairer.java  | 2 +-
 .../actuallyadditions/inventory/ContainerXPSolidifier.java      | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java
index c4dcfb94c..91b4a954b 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java
@@ -63,7 +63,7 @@ public class ContainerBreaker extends Container{
                         return null;
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java
index 88278d433..cda7be5d5 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java
@@ -71,7 +71,7 @@ public class ContainerCanolaPress extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java
index 7f9979f20..8c3df9ceb 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoalGenerator.java
@@ -61,7 +61,7 @@ public class ContainerCoalGenerator extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java
index 89204c475..063fb0e58 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCoffeeMachine.java
@@ -92,7 +92,7 @@ public class ContainerCoffeeMachine extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java
index 6b103f7b0..e13662db8 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDrill.java
@@ -96,7 +96,7 @@ public class ContainerDrill extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java
index 4313158f1..60b80d628 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerDropper.java
@@ -63,7 +63,7 @@ public class ContainerDropper extends Container{
                         return null;
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java
index f806b1c42..c8414fa3d 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnergizer.java
@@ -93,7 +93,7 @@ public class ContainerEnergizer extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java
index d9aba92d0..1f8a0409a 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerEnervator.java
@@ -92,7 +92,7 @@ public class ContainerEnervator extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java
index 37a5e3451..1a7771e45 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java
@@ -58,7 +58,7 @@ public class ContainerFeeder extends Container{
                         return null;
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java
index 6e614f6ad..79376cfca 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFermentingBarrel.java
@@ -70,7 +70,7 @@ public class ContainerFermentingBarrel extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java
index 39422469b..29b1a896e 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFluidCollector.java
@@ -68,7 +68,7 @@ public class ContainerFluidCollector extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java
index 4fc95e36f..e6dd530d0 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java
@@ -72,7 +72,7 @@ public class ContainerFurnaceDouble extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java
index 59f332787..b57a52abf 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java
@@ -63,7 +63,7 @@ public class ContainerGiantChest extends Container{
                         return null;
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java
index e0c46e5e3..763a48c96 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java
@@ -80,7 +80,7 @@ public class ContainerGrinder extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java
index a88d0ceaa..65794c470 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java
@@ -74,7 +74,7 @@ public class ContainerInputter extends Container{
                         return null;
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java
index bea2ccd80..3082f7534 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerOilGenerator.java
@@ -65,7 +65,7 @@ public class ContainerOilGenerator extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java
index ca09d525f..27d36ab58 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerPhantomPlacer.java
@@ -63,7 +63,7 @@ public class ContainerPhantomPlacer extends Container{
                         return null;
                 }
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java
index feb6548c6..be8cdd80a 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java
@@ -62,7 +62,7 @@ public class ContainerRepairer extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();
diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java
index 76461c9df..5726698e2 100644
--- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java
+++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerXPSolidifier.java
@@ -55,7 +55,7 @@ public class ContainerXPSolidifier extends Container{
                 }
                 else if(slot >= inventoryEnd+1 && slot < hotbarEnd+1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
             }
-            else if(!this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false)) return null;
+            else if(!this.mergeItemStack(newStack, inventoryStart, hotbarEnd+1, false)) return null;
 
             if (newStack.stackSize == 0) theSlot.putStack(null);
             else theSlot.onSlotChanged();