diff --git a/src/main/java/com/hbm/hazard/type/HazardTypeHot.java b/src/main/java/com/hbm/hazard/type/HazardTypeHot.java index c603bf8f2..8bcf9058e 100644 --- a/src/main/java/com/hbm/hazard/type/HazardTypeHot.java +++ b/src/main/java/com/hbm/hazard/type/HazardTypeHot.java @@ -34,7 +34,9 @@ public class HazardTypeHot extends HazardTypeBase { gloves = armor.getItem() instanceof ItemModGloves || ArmorUtil.checkForHazmat(target); if(!gloves) { ItemStack mod = ArmorModHandler.pryMods(armor)[ArmorModHandler.legs_only]; - gloves = mod.getItem() instanceof ItemModGloves; + + if(mod != null) + gloves = mod.getItem() instanceof ItemModGloves; } } } diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java b/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java index 52649c3bc..75a9a5f57 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java +++ b/src/main/java/com/hbm/inventory/container/ContainerMachineReactorBreeding.java @@ -43,14 +43,17 @@ public class ContainerMachineReactorBreeding extends Container { 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) { diff --git a/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java b/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java index 4f82aec44..99365242e 100644 --- a/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java +++ b/src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java @@ -79,11 +79,11 @@ public class ContainerReactorZirnox extends Container { } else { if(FluidContainerRegistry.getFluidContent(stack, Fluids.CARBONDIOXIDE) > 0) { - if(!this.mergeItemStack(stack, 24, 25, true)) + if(!this.mergeItemStack(stack, 24, 26, false)) return null; } else if(FluidContainerRegistry.getFluidContent(stack, Fluids.WATER) > 0) { - if(!this.mergeItemStack(stack, 25, 26, true)) + if(!this.mergeItemStack(stack, 26, 28, false)) return null; } else { diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 436664c12..267dfb971 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -377,9 +377,10 @@ public class CraftingManager { addShapelessAuto(new ItemStack(ModBlocks.asphalt, 1), new Object[] { ModBlocks.asphalt_light }); addRecipeAuto(new ItemStack(ModBlocks.block_niter_reinforced, 1), new Object[] { "TCT", "CNC", "TCT", 'T', TCALLOY.ingot(), 'C', ModBlocks.concrete, 'N', KNO.block() }); + String[] dyes = { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "LightGray", "Gray", "Pink", "Lime", "Yellow", "LightBlue", "Magenta", "Orange", "White" }; + for(int i = 0; i < 16; i++) { - String dyeName = ItemDye.field_150923_a[15 - i]; - dyeName = "dye" + dyeName.substring(0, 1).toUpperCase() + dyeName.substring(1); + String dyeName = "dye" + dyes[15 - i]; addRecipeAuto(new ItemStack(ModBlocks.concrete_colored, 8, i), new Object[] { "CCC", "CDC", "CCC", 'C', ModBlocks.concrete_smooth, 'D', dyeName }); addRecipeAuto(new ItemStack(ModBlocks.concrete_colored, 8, i), new Object[] { "CCC", "CDC", "CCC", 'C', ModBlocks.concrete_colored, 'D', dyeName }); } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java index c466e4229..2c44c1338 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLiquefactor.java @@ -88,6 +88,9 @@ public class TileEntityMachineLiquefactor extends TileEntityMachineBase implemen FluidStack out = LiquefactionRecipes.getOutput(slots[0]); + if(out == null) + return false; + if(out.type != tank.getTankType() && tank.getFill() > 0) return false;