Cleanup inventory package

Author: kappa-maintainer

patches/minecraft/net/minecraft/inventory/Container.java.patch

@@ -1,61 +1,6 @@
 --- before/net/minecraft/inventory/ContainerBeacon.java
 +++ after/net/minecraft/inventory/ContainerBeacon.java
-@@ -20,21 +20,20 @@
-         int i = 36;
-         int j = 137;
- 
--        for (int k = 0; k < 3; k++)
-+        for (int k = 0; k < 3; ++k)
-         {
--            for (int l = 0; l < 9; l++)
-+            for (int l = 0; l < 9; ++l)
-             {
-                 this.addSlotToContainer(new Slot(playerInventory, l + k * 9 + 9, 36 + l * 18, 137 + k * 18));
-             }
-         }
- 
--        for (int i1 = 0; i1 < 9; i1++)
-+        for (int i1 = 0; i1 < 9; ++i1)
-         {
-             this.addSlotToContainer(new Slot(playerInventory, i1, 36 + i1 * 18, 195));
-         }
-     }
- 
--    @Override
-     public void addListener(IContainerListener listener)
-     {
-         super.addListener(listener);
-@@ -42,7 +41,6 @@
-     }
- 
-     @SideOnly(Side.CLIENT)
--    @Override
-     public void updateProgressBar(int id, int data)
-     {
-         this.tileBeacon.setField(id, data);
-@@ -53,7 +51,6 @@
-         return this.tileBeacon;
-     }
- 
--    @Override
-     public void onContainerClosed(EntityPlayer playerIn)
-     {
-         super.onContainerClosed(playerIn);
-@@ -69,13 +66,11 @@
-         }
-     }
- 
--    @Override
-     public boolean canInteractWith(EntityPlayer playerIn)
-     {
-         return this.tileBeacon.isUsableByPlayer(playerIn);
-     }
- 
--    @Override
-     public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
-     {
-         ItemStack itemstack = ItemStack.EMPTY;
-@@ -95,12 +90,9 @@
+@@ -95,12 +95,9 @@
 
                  slot.onSlotChange(itemstack1, itemstack);
              }
@@ -70,19 +15,13 @@
              }
              else if (index >= 1 && index < 28)
              {
-@@ -148,14 +140,11 @@
-             super(inventoryIn, index, xIn, yIn);
-         }
- 
--        @Override
+@@ -151,8 +148,7 @@
+         @Override
          public boolean isItemValid(ItemStack stack)
          {
 -            Item item = stack.getItem();
 -            return item == Items.EMERALD || item == Items.DIAMOND || item == Items.GOLD_INGOT || item == Items.IRON_INGOT;
 +            return stack.getItem().isBeaconPayment(stack);
          }
 
--        @Override
-         public int getSlotStackLimit()
-         {
-             return 1;
+         @Override

patches/minecraft/net/minecraft/inventory/ContainerBeacon.java.patch

@@ -1,122 +1,23 @@
 --- before/net/minecraft/inventory/ContainerBrewingStand.java
 +++ after/net/minecraft/inventory/ContainerBrewingStand.java
-@@ -29,33 +29,31 @@
-         this.slot = this.addSlotToContainer(new ContainerBrewingStand.Ingredient(tileBrewingStandIn, 3, 79, 17));
-         this.addSlotToContainer(new ContainerBrewingStand.Fuel(tileBrewingStandIn, 4, 17, 17));
- 
--        for (int i = 0; i < 3; i++)
-+        for (int i = 0; i < 3; ++i)
-         {
--            for (int j = 0; j < 9; j++)
-+            for (int j = 0; j < 9; ++j)
-             {
-                 this.addSlotToContainer(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-             }
-         }
- 
--        for (int k = 0; k < 9; k++)
-+        for (int k = 0; k < 9; ++k)
-         {
-             this.addSlotToContainer(new Slot(playerInventory, k, 8 + k * 18, 142));
-         }
-     }
- 
--    @Override
-     public void addListener(IContainerListener listener)
-     {
-         super.addListener(listener);
-         listener.sendAllWindowProperties(this, this.tileBrewingStand);
-     }
- 
--    @Override
-     public void detectAndSendChanges()
-     {
-         super.detectAndSendChanges();
- 
--        for (int i = 0; i < this.listeners.size(); i++)
-+        for (int i = 0; i < this.listeners.size(); ++i)
-         {
-             IContainerListener icontainerlistener = this.listeners.get(i);
- 
-@@ -75,19 +73,16 @@
-     }
- 
-     @SideOnly(Side.CLIENT)
--    @Override
-     public void updateProgressBar(int id, int data)
-     {
-         this.tileBrewingStand.setField(id, data);
-     }
- 
--    @Override
-     public boolean canInteractWith(EntityPlayer playerIn)
-     {
-         return this.tileBrewingStand.isUsableByPlayer(playerIn);
-     }
- 
--    @Override
-     public ItemStack transferStackInSlot(EntityPlayer playerIn, int index)
-     {
-         ItemStack itemstack = ItemStack.EMPTY;
-@@ -177,7 +172,6 @@
-                 super(iInventoryIn, index, xPosition, yPosition);
-             }
- 
--            @Override
-             public boolean isItemValid(ItemStack stack)
-             {
-                 return isValidBrewingFuel(stack);
-@@ -188,7 +182,6 @@
-                 return itemStackIn.getItem() == Items.BLAZE_POWDER;
-             }
- 
--            @Override
-             public int getSlotStackLimit()
-             {
-                 return 64;
-@@ -202,13 +195,11 @@
-                 super(iInventoryIn, index, xPosition, yPosition);
-             }
- 
--            @Override
+@@ -205,7 +205,7 @@
+             @Override
              public boolean isItemValid(ItemStack stack)
              {
 -                return PotionHelper.isReagent(stack);
 +                return net.minecraftforge.common.brewing.BrewingRecipeRegistry.isValidIngredient(stack);
              }
 
--            @Override
-             public int getSlotStackLimit()
-             {
-                 return 64;
-@@ -222,25 +213,23 @@
-                 super(p_i47598_1_, p_i47598_2_, p_i47598_3_, p_i47598_4_);
-             }
- 
--            @Override
-             public boolean isItemValid(ItemStack stack)
-             {
-                 return canHoldPotion(stack);
-             }
- 
--            @Override
-             public int getSlotStackLimit()
-             {
-                 return 1;
-             }
- 
--            @Override
-             public ItemStack onTake(EntityPlayer thePlayer, ItemStack stack)
-             {
-                 PotionType potiontype = PotionUtils.getPotionFromItem(stack);
+             @Override
+@@ -241,6 +241,7 @@
 
                  if (thePlayer instanceof EntityPlayerMP)
                  {
 +                    net.minecraftforge.event.ForgeEventFactory.onPlayerBrewedPotion(thePlayer, stack);
                      CriteriaTriggers.BREWED_POTION.trigger((EntityPlayerMP)thePlayer, potiontype);
                  }
 
-@@ -250,8 +239,7 @@
+@@ -250,8 +251,7 @@
 
              public static boolean canHoldPotion(ItemStack stack)
              {