Fixed up Container Derpup

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();

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();