diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java b/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java index 52649c3bc..f017c98f1 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java @@ -11,58 +11,61 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; public class ContainerMachineReactorBreeding extends Container { - + private TileEntityMachineReactorBreeding reactor; - + public ContainerMachineReactorBreeding(InventoryPlayer invPlayer, TileEntityMachineReactorBreeding tedf) { - + reactor = tedf; - + this.addSlotToContainer(new Slot(tedf, 0, 35, 35)); this.addSlotToContainer(new SlotMachineOutput(tedf, 1, 125, 35)); - + for(int i = 0; i < 3; i++) { for(int j = 0; j < 9; j++) { this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); } } - + for(int i = 0; i < 9; i++) { this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142)); } } - + @Override - public ItemStack transferStackInSlot(EntityPlayer player, int index) { - + public ItemStack transferStackInSlot(EntityPlayer player, int index) { + ItemStack var3 = null; Slot slot = (Slot) this.inventorySlots.get(index); - - if (slot != null && slot.getHasStack()) { - + + if(slot != null && slot.getHasStack()) { + ItemStack stack = slot.getStack(); var3 = stack.copy(); - - if (index <= 2) { - if (!this.mergeItemStack(stack, 2, this.inventorySlots.size(), true)) { + + if(index <= 2) { + if(!this.mergeItemStack(stack, 2, this.inventorySlots.size(), true)) { return null; } - - } else if(stack.getItem() instanceof ItemBreedingRod) - if (!this.mergeItemStack(stack, 0, 1, false)) { + + } else if(stack.getItem() instanceof ItemBreedingRod) { + if(!this.mergeItemStack(stack, 0, 1, false)) { return null; + } + } else { + return null; } - - if (stack.stackSize == 0) { + + if(stack.stackSize == 0) { slot.putStack((ItemStack) null); - + } else { slot.onSlotChanged(); } } - + return var3; - } + } @Override public boolean canInteractWith(EntityPlayer player) { diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 938564432..035718e67 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4130)"; + public static final String VERSION = "1.0.27 BETA (4130H1)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 9984f40c1..5f4b4f557 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "Hbm's Nuclear Tech", "description": "A mod that adds weapons, nuclear themed stuff and machines", - "version":"1.0.27_X4130", + "version":"1.0.27_X4130H1", "mcversion": "1.7.10", "url": "", "updateUrl": "",