diff --git a/src/main/java/techreborn/blocks/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/BlockAlloySmelter.java index ae3406745..87d7c036f 100644 --- a/src/main/java/techreborn/blocks/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/BlockAlloySmelter.java @@ -71,7 +71,7 @@ public class BlockAlloySmelter extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/BlockAssemblingMachine.java new file mode 100644 index 000000000..9f84ebf61 --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockAssemblingMachine.java @@ -0,0 +1,78 @@ +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 BlockAssemblingMachine extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockAssemblingMachine(Material material) + { + super(material); + setBlockName("techreborn.assemblingmachine"); + } + + @Override + public TileEntity createNewTileEntity(World world, int p_149915_2_) + { + return new TileAlloySmelter(); + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, + EntityPlayer player, int side, float hitX, float hitY, float hitZ) + { + if (!player.isSneaking()) + player.openGui(Core.INSTANCE, GuiHandler.alloySmelterID, world, x, y, + z); + return true; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + 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"); + } + + @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/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/BlockBlastFurnace.java index 30d27985d..76dc52bca 100644 --- a/src/main/java/techreborn/blocks/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/BlockBlastFurnace.java @@ -83,7 +83,7 @@ public class BlockBlastFurnace extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockCentrifuge.java b/src/main/java/techreborn/blocks/BlockCentrifuge.java index 4b80dce6a..3fd89f7ae 100644 --- a/src/main/java/techreborn/blocks/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/BlockCentrifuge.java @@ -66,7 +66,7 @@ public class BlockCentrifuge extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java index c8c5a3b2f..f3cba1fdf 100644 --- a/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java @@ -54,7 +54,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockGrinder.java b/src/main/java/techreborn/blocks/BlockGrinder.java index 5faaf294d..7554e5b6d 100644 --- a/src/main/java/techreborn/blocks/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/BlockGrinder.java @@ -67,7 +67,7 @@ public class BlockGrinder extends BlockMachineBase{ return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index 24331b7de..8a50783c4 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -39,7 +39,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase{ return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/BlockImplosionCompressor.java index 596b48bae..ba485df8f 100644 --- a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/BlockImplosionCompressor.java @@ -67,7 +67,7 @@ public class BlockImplosionCompressor extends BlockMachineBase{ return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? 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 0aaa11d4f..c8d77f251 100644 --- a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java @@ -54,7 +54,7 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/BlockMatterFabricator.java index 12a74c5bb..3dfd0ce0f 100644 --- a/src/main/java/techreborn/blocks/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/BlockMatterFabricator.java @@ -67,7 +67,7 @@ public class BlockMatterFabricator extends BlockMachineBase{ return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index 643fe339f..e193d6f88 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -62,7 +62,7 @@ public class BlockQuantumChest extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockRollingMachine.java b/src/main/java/techreborn/blocks/BlockRollingMachine.java index 7672f3b8d..1812e41b6 100644 --- a/src/main/java/techreborn/blocks/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/BlockRollingMachine.java @@ -57,17 +57,16 @@ public class BlockRollingMachine extends BlockMachineBase { { this.blockIcon = icon.registerIcon("techreborn:machine/rolling_machine_side_off"); this.iconFront = icon.registerIcon("techreborn:machine/rolling_machine_side_off"); - this.iconTop = icon.registerIcon("techreborn:machine/rollingmachine_top"); + this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { - return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/BlockThermalGenerator.java index 481ad80dd..28d6fa463 100644 --- a/src/main/java/techreborn/blocks/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/BlockThermalGenerator.java @@ -71,7 +71,7 @@ public class BlockThermalGenerator extends BlockMachineBase { return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : - side == 6 ? this.iconBottom: (side == 0 ? this.iconTop + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png deleted file mode 100644 index b2f831113..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_on.png b/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_on.png deleted file mode 100644 index fd71e2d82..000000000 Binary files a/src/main/resources/assets/techreborn/textures/blocks/machine/centrifuge_front_on.png and /dev/null differ