diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java index 18896e6d1..7d66b1d60 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java @@ -21,6 +21,9 @@ import java.util.List; public class BlockOreMagnet extends BlockContainerBase implements INameableItem{ + private IIcon topIcon; + private IIcon bottomIcon; + public BlockOreMagnet(){ super(Material.rock); this.setHarvestLevel("pickaxe", 0); @@ -36,13 +39,15 @@ public class BlockOreMagnet extends BlockContainerBase implements INameableItem{ @Override public IIcon getIcon(int side, int meta){ - return this.blockIcon; + return (side == 1 ? this.topIcon : (side == 0 ? this.bottomIcon : this.blockIcon)); } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()); + this.topIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Top"); + this.bottomIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+"Bottom"); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index d7dd646f0..3b194ebe1 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -92,7 +92,7 @@ public class BlockCrafting{ //Lava Factory if(ConfigCrafting.LAVA_FACTORY.isEnabled()) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController), - " C ", "ISI", " L ", + "SCS", "ISI", "LLL", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()), 'I', "blockIron", @@ -100,7 +100,7 @@ public class BlockCrafting{ //Casing if(ConfigCrafting.CASING.isEnabled()) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 8, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 32, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()), "ICI", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()), 'I', "blockIron")); diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnet.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnet.png new file mode 100644 index 000000000..8e1a53740 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnet.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetBottom.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetBottom.png new file mode 100644 index 000000000..187a42d75 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetBottom.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetTop.png new file mode 100644 index 000000000..283b945ee Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOreMagnetTop.png differ