From afc750993cbb341f75092b64c5b42bb484e37be9 Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 3 May 2015 23:09:13 +0100 Subject: [PATCH] Added magicrnergyabsorber --- .../blocks/BlockAssemblingMachine.java | 2 +- .../blocks/BlockIndustrialElectrolyzer.java | 2 +- .../blocks/BlockMagicEnergyAbsorber.java | 62 +++++++++++++++++++ .../blocks/BlockMagicEnergyConverter.java | 6 +- src/main/java/techreborn/init/ModBlocks.java | 5 ++ 5 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java diff --git a/src/main/java/techreborn/blocks/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/BlockAssemblingMachine.java index fd5a77c60..8e94e6145 100644 --- a/src/main/java/techreborn/blocks/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/BlockAssemblingMachine.java @@ -45,7 +45,7 @@ public class BlockAssemblingMachine extends BlockMachineBase { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/assembling_machine_front_off"); this.iconTop = icon.registerIcon("techreborn:machine/assembling_machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_side"); + this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java index b95637410..c47385d2f 100644 --- a/src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/BlockIndustrialElectrolyzer.java @@ -42,7 +42,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); + this.blockIcon = icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_off"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_off"); this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); diff --git a/src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java new file mode 100644 index 000000000..4e1a02ae2 --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockMagicEnergyAbsorber.java @@ -0,0 +1,62 @@ +package techreborn.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import techreborn.Core; +import techreborn.client.GuiHandler; +import techreborn.client.TechRebornCreativeTab; +import techreborn.tiles.TileAlloySmelter; +import techreborn.tiles.TileBlastFurnace; +import techreborn.tiles.TileMachineCasing; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockMagicEnergyAbsorber extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockMagicEnergyAbsorber(Material material) + { + super(material); + setBlockName("techreborn.magicrnergyabsorber"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/magic_energy_absorber_side"); + this.iconFront = icon.registerIcon("techreborn:machine/magic_energy_absorber_side"); + this.iconTop = icon.registerIcon("techreborn:machine/magic_energy_absorber_top"); + this.iconBottom = icon.registerIcon("techreborn:machine/magic_energy_absorber_bottom"); + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + + return metadata == 0 && side == 3 ? this.iconFront + : side == 1 ? this.iconTop : + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } + +} diff --git a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java index d450088dd..09a3b9c49 100644 --- a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java @@ -43,9 +43,9 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { public void registerBlockIcons(IIconRegister icon) { this.blockIcon = icon.registerIcon("techreborn:machine/magic_energy_converter_side"); - this.iconFront = icon.registerIcon("techreborn:machine/magic_energy_converter_front"); - this.iconTop = icon.registerIcon("techreborn:machine/magic_energy_converter_side"); - this.iconBottom = icon.registerIcon("techreborn:machine/magic_energy_absorber_bottom"); + this.iconFront = icon.registerIcon("techreborn:machine/magic_energy_converter_front_off"); + this.iconTop = icon.registerIcon("techreborn:machine/magic_energy_converter_top"); + this.iconBottom = icon.registerIcon("techreborn:machine/magic_energy_converter_bottom"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 04405a57b..860d9a0f0 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -16,6 +16,7 @@ import techreborn.blocks.BlockHighlyAdvancedMachine; import techreborn.blocks.BlockImplosionCompressor; import techreborn.blocks.BlockIndustrialElectrolyzer; import techreborn.blocks.BlockMachineCasing; +import techreborn.blocks.BlockMagicEnergyAbsorber; import techreborn.blocks.BlockMagicEnergyConverter; import techreborn.blocks.BlockMatterFabricator; import techreborn.blocks.BlockOre; @@ -65,6 +66,7 @@ public class ModBlocks { public static Block AssemblyMachine; public static Block DieselGenerator; public static Block IndustrialElectrolyzer; + public static Block MagicalAbsorber; public static Block ore; public static Block storage; @@ -157,6 +159,9 @@ public class ModBlocks { IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.rock); GameRegistry.registerBlock(IndustrialElectrolyzer, "industrialelectrolyzer"); + + MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.rock); + GameRegistry.registerBlock(MagicalAbsorber, "magicrnergyabsorber"); registerOreDict(); }