diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java b/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java index c99c41064..3dd70b977 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiFurnace.java @@ -31,10 +31,9 @@ public class MachineDiFurnace extends BlockContainer { private final boolean isActive; private static boolean keepInventory; - @SideOnly(Side.CLIENT) - private IIcon iconFront; - @SideOnly(Side.CLIENT) - private IIcon iconTop; + @SideOnly(Side.CLIENT) private IIcon iconFront; + @SideOnly(Side.CLIENT) private IIcon iconTop; + @SideOnly(Side.CLIENT) private IIcon iconBottom; public MachineDiFurnace(boolean blockState) { super(Material.iron); @@ -44,16 +43,16 @@ public class MachineDiFurnace extends BlockContainer { @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_top_on" : ":difurnace_top_off")); - this.iconFront = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_front_on" : ":difurnace_front_off")); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":difurnace_side"); + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_top_on_alt" : ":difurnace_top_off_alt")); + this.iconFront = iconRegister.registerIcon(RefStrings.MODID + (this.isActive ? ":difurnace_front_on_alt" : ":difurnace_front_off_alt")); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":difurnace_side_alt"); + this.iconBottom = iconRegister.registerIcon(RefStrings.MODID + ":brick_fire"); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { - //Reactivate in case of emergency - //return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : this.iconTop); + if(side == 0) return iconBottom; return metadata == 0 && side == 3 ? this.iconFront : (side == metadata ? this.iconFront : (side == 1 ? this.iconTop : this.blockIcon)); } diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index e0a7f7179..84af77106 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -436,6 +436,7 @@ public class MineralRecipes { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.ingot_am_mix, 1), new Object[] { "tinyAm241", "tinyAm241", "tinyAm241", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242", "tinyAm242" })); CraftingManager.addShapelessAuto(new ItemStack(ModItems.ball_fireclay, 4), new Object[] { Items.clay_ball, Items.clay_ball, Items.clay_ball, AL.dust() }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.ball_fireclay, 4), new Object[] { Items.clay_ball, Items.clay_ball, Items.clay_ball, AL.ore() }); } //Bundled 1/9 recipes diff --git a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java index c0e9fd2f0..05feda2bd 100644 --- a/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java @@ -211,8 +211,7 @@ public class AnvilRecipes { constructionRecipes.add(new AnvilConstructionRecipe( new AStack[] { new ComparableStack(Blocks.stonebrick, 4), - new OreDictStack(IRON.ingot(), 2), - new OreDictStack(W.ingot(), 4), + new ComparableStack(ModItems.ingot_firebrick, 4), new ComparableStack(ModItems.board_copper, 2) }, new AnvilOutput(new ItemStack(ModBlocks.machine_difurnace_off))).setTier(1)); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java index 40e65db2a..51a441b2f 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java @@ -4,6 +4,10 @@ import java.util.ArrayList; import java.util.List; import com.hbm.blocks.BlockDummyable; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.standard.EntityProcessorStandard; +import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; +import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard; import com.hbm.interfaces.IFluidAcceptor; import com.hbm.interfaces.IFluidSource; import com.hbm.inventory.fluid.FluidType; @@ -143,7 +147,6 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid if(outputOps == 0) { this.hasExploded = true; - worldObj.newExplosion(null, xCoord + 0.5, yCoord + 2, zCoord + 0.5, 5F, false, false); BlockDummyable.safeRem = true; for(int x = xCoord - 1; x <= xCoord + 1; x++) { for(int y = yCoord + 2; y <= yCoord + 3; y++) { @@ -153,6 +156,13 @@ public class TileEntityHeatBoiler extends TileEntityLoadedBase implements IFluid } } worldObj.setBlockToAir(xCoord, yCoord + 1, zCoord); + + ExplosionVNT xnt = new ExplosionVNT(worldObj, xCoord + 0.5, yCoord + 2, zCoord + 0.5, 5F); + xnt.setEntityProcessor(new EntityProcessorStandard().withRangeMod(3F)); + xnt.setPlayerProcessor(new PlayerProcessorStandard()); + xnt.setSFX(new ExplosionEffectStandard()); + xnt.explode(); + BlockDummyable.safeRem = false; } } diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_front_off_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_front_off_alt.png new file mode 100644 index 000000000..6a79f4360 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/difurnace_front_off_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_front_on_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_front_on_alt.png new file mode 100644 index 000000000..6d2515722 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/difurnace_front_on_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_side_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_side_alt.png new file mode 100644 index 000000000..223262e22 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/difurnace_side_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_top_off_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_top_off_alt.png new file mode 100644 index 000000000..34589b39c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/difurnace_top_off_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/difurnace_top_on_alt.png b/src/main/resources/assets/hbm/textures/blocks/difurnace_top_on_alt.png new file mode 100644 index 000000000..6d4439662 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/difurnace_top_on_alt.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off.png deleted file mode 100644 index 3a3485de8..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off_old.png deleted file mode 100644 index 108e4671e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_off_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on.png deleted file mode 100644 index 684d7d755..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on_old.png deleted file mode 100644 index 05726a984..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_front_on_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side.png deleted file mode 100644 index 7b9aec7a8..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side_old.png deleted file mode 100644 index af913d28b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_side_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off.png deleted file mode 100644 index d5f3f0afa..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off_old.png deleted file mode 100644 index fa590c8b4..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_off_old.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on.png deleted file mode 100644 index e78f3ce92..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on_old.png b/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on_old.png deleted file mode 100644 index 231440b69..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/test_difurnace_top_on_old.png and /dev/null differ