From 617a33aea3212821764483cd127c9bdf6612bd0e Mon Sep 17 00:00:00 2001 From: Gig Date: Mon, 4 May 2015 21:26:51 +0100 Subject: [PATCH] More machines --- .../techreborn/blocks/BlockChunkLoader.java | 8 +-- .../blocks/BlockDistillationTower.java | 62 ++++++++++++++++++ .../blocks/BlockElectricCraftingTable.java | 62 ++++++++++++++++++ .../java/techreborn/blocks/BlockIDSU.java | 8 +-- .../techreborn/blocks/BlockLesuStorage.java | 62 ++++++++++++++++++ .../techreborn/blocks/BlockMetalShelf.java | 62 ++++++++++++++++++ .../techreborn/blocks/BlockVacuumFreezer.java | 62 ++++++++++++++++++ src/main/java/techreborn/init/ModBlocks.java | 25 +++++++ .../textures/blocks/machine/dimstorage_in.png | Bin 562 -> 0 bytes .../blocks/machine/dimstorage_out.png | Bin 592 -> 0 bytes .../blocks/machine/dimstorage_side.png | Bin 579 -> 0 bytes 11 files changed, 343 insertions(+), 8 deletions(-) create mode 100644 src/main/java/techreborn/blocks/BlockDistillationTower.java create mode 100644 src/main/java/techreborn/blocks/BlockElectricCraftingTable.java create mode 100644 src/main/java/techreborn/blocks/BlockLesuStorage.java create mode 100644 src/main/java/techreborn/blocks/BlockMetalShelf.java create mode 100644 src/main/java/techreborn/blocks/BlockVacuumFreezer.java delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_in.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_out.png delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_side.png diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/BlockChunkLoader.java index 8a7bcd427..79a7c6da6 100644 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/BlockChunkLoader.java @@ -49,10 +49,10 @@ public class BlockChunkLoader extends BlockMachineBase{ @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/machine_side"); - this.iconTop = icon.registerIcon("techreborn:machine/machine_side"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_side"); + this.blockIcon = icon.registerIcon("techreborn:machine/industrial_chunk_loader_side"); + this.iconFront = icon.registerIcon("techreborn:machine/industrial_chunk_loader_side"); + this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); + this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/blocks/BlockDistillationTower.java b/src/main/java/techreborn/blocks/BlockDistillationTower.java new file mode 100644 index 000000000..65b195aa1 --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockDistillationTower.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 BlockDistillationTower extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockDistillationTower(Material material) + { + super(material); + setBlockName("techreborn.distillationtower"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); + this.iconFront = icon.registerIcon("techreborn:machine/distillation_tower_front_off"); + this.iconTop = icon.registerIcon("techreborn:machine/advanced_machine_side"); + this.iconBottom = icon.registerIcon("techreborn:machine/advanced_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/BlockElectricCraftingTable.java b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java new file mode 100644 index 000000000..4bd1a3263 --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.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 BlockElectricCraftingTable extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockElectricCraftingTable(Material material) + { + super(material); + setBlockName("techreborn.electriccraftingtable"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); + this.iconFront = icon.registerIcon("techreborn:machine/electric_crafting_table_front"); + this.iconTop = icon.registerIcon("techreborn:machine/electric_crafting_table_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 == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } + +} diff --git a/src/main/java/techreborn/blocks/BlockIDSU.java b/src/main/java/techreborn/blocks/BlockIDSU.java index 9a3b56fa0..3cfc58268 100644 --- a/src/main/java/techreborn/blocks/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/BlockIDSU.java @@ -42,10 +42,10 @@ public class BlockIDSU extends BlockMachineBase { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/dimstorage_side"); - this.iconFront = icon.registerIcon("techreborn:machine/dimstorage_in"); - this.iconTop = icon.registerIcon("techreborn:machine/dimstorage_side"); - this.iconBottom = icon.registerIcon("techreborn:machine/dimstorage_side"); + this.blockIcon = icon.registerIcon("techreborn:machine/idsu_side"); + this.iconFront = icon.registerIcon("techreborn:machine/idsu_front"); + this.iconTop = icon.registerIcon("techreborn:machine/idsu_side"); + this.iconBottom = icon.registerIcon("techreborn:machine/idsu_side"); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/techreborn/blocks/BlockLesuStorage.java b/src/main/java/techreborn/blocks/BlockLesuStorage.java new file mode 100644 index 000000000..40d19426b --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockLesuStorage.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 BlockLesuStorage extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockLesuStorage(Material material) + { + super(material); + setBlockName("techreborn.lesustorage"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/lesu_block"); + this.iconFront = icon.registerIcon("techreborn:machine/lesu_block"); + this.iconTop = icon.registerIcon("techreborn:machine/lesu_block"); + this.iconBottom = icon.registerIcon("techreborn:machine/lesu_block"); + } + + @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/BlockMetalShelf.java b/src/main/java/techreborn/blocks/BlockMetalShelf.java new file mode 100644 index 000000000..5b1d088f9 --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockMetalShelf.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 BlockMetalShelf extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockMetalShelf(Material material) + { + super(material); + setBlockName("techreborn.metalshelf"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); + this.iconFront = icon.registerIcon("techreborn:machine/metal_shelf_empty"); + 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 == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } + +} diff --git a/src/main/java/techreborn/blocks/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/BlockVacuumFreezer.java new file mode 100644 index 000000000..c74cc150d --- /dev/null +++ b/src/main/java/techreborn/blocks/BlockVacuumFreezer.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 BlockVacuumFreezer extends BlockMachineBase { + + @SideOnly(Side.CLIENT) + private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconBottom; + + public BlockVacuumFreezer(Material material) + { + super(material); + setBlockName("techreborn.vacuumfreezer"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) + { + this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); + this.iconFront = icon.registerIcon("techreborn:machine/vacuum_freezer_front"); + this.iconTop = icon.registerIcon("techreborn:machine/vacuum_freezer_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 == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } + +} diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index 0c7439667..60bcb12db 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -13,7 +13,9 @@ import techreborn.blocks.BlockCentrifuge; import techreborn.blocks.BlockChemicalReactor; import techreborn.blocks.BlockChunkLoader; import techreborn.blocks.BlockDieselGenerator; +import techreborn.blocks.BlockDistillationTower; import techreborn.blocks.BlockDragonEggSiphoner; +import techreborn.blocks.BlockElectricCraftingTable; import techreborn.blocks.BlockGrinder; import techreborn.blocks.BlockHighlyAdvancedMachine; import techreborn.blocks.BlockIDSU; @@ -21,10 +23,12 @@ import techreborn.blocks.BlockImplosionCompressor; import techreborn.blocks.BlockIndustrialElectrolyzer; import techreborn.blocks.BlockLathe; import techreborn.blocks.BlockLesu; +import techreborn.blocks.BlockLesuStorage; import techreborn.blocks.BlockMachineCasing; import techreborn.blocks.BlockMagicEnergyAbsorber; import techreborn.blocks.BlockMagicEnergyConverter; import techreborn.blocks.BlockMatterFabricator; +import techreborn.blocks.BlockMetalShelf; import techreborn.blocks.BlockOre; import techreborn.blocks.BlockPlateCuttingMachine; import techreborn.blocks.BlockQuantumChest; @@ -34,6 +38,7 @@ import techreborn.blocks.BlockSemiFluidGenerator; import techreborn.blocks.BlockStorage; import techreborn.blocks.BlockSupercondensator; import techreborn.blocks.BlockThermalGenerator; +import techreborn.blocks.BlockVacuumFreezer; import techreborn.blocks.BlockWoodenshelf; import techreborn.client.TechRebornCreativeTab; import techreborn.itemblocks.ItemBlockMachineCasing; @@ -87,6 +92,11 @@ public class ModBlocks { public static Block Lesu; public static Block Supercondensator; public static Block Woodenshelf; + public static Block Metalshelf; + public static Block LesuStorage; + public static Block Distillationtower; + public static Block ElectricCraftingTable; + public static Block VacuumFreezer; public static Block ore; public static Block storage; @@ -212,6 +222,21 @@ public class ModBlocks { Woodenshelf = new BlockWoodenshelf(Material.wood); GameRegistry.registerBlock(Woodenshelf, "woodenshelf"); + + Metalshelf = new BlockMetalShelf(Material.rock); + GameRegistry.registerBlock(Metalshelf, "metalshelf"); + + LesuStorage = new BlockLesuStorage(Material.rock); + GameRegistry.registerBlock(LesuStorage, "lesustorage"); + + Distillationtower = new BlockDistillationTower(Material.rock); + GameRegistry.registerBlock(Distillationtower, "distillationtower"); + + ElectricCraftingTable = new BlockElectricCraftingTable(Material.rock); + GameRegistry.registerBlock(ElectricCraftingTable, "electriccraftingtable"); + + VacuumFreezer = new BlockVacuumFreezer(Material.rock); + GameRegistry.registerBlock(VacuumFreezer, "vacuumfreezer"); registerOreDict(); } diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_in.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_in.png deleted file mode 100644 index 0fed64f722e990e9822356da2d34a05ced645739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmV-20?qx2P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0i#JoK~y+TZIby)LQxRL&ujSg@4~q=-#2Gw&WN!I^XRzAXqq%n%}&o- zmp%Si{&26>$X05Zay3~jxi>a#{?KYL>+K*6(hxf z5J`bn5(4?d$S=RX6kD3q6nke3hIg2=ImL=E7|rZ~Lc6O^FAYKC_D*I5vsSw%Q2&G2 zHzdWb-`r9?TLcXZ1x$$>=_J=|%Z-4FamcqiDjk?vvi-UNwC*3+IjDg1cCNslGD+G6 ztg~Q|coFYrjH$7(Y%9&M-W=F%jqMF6fyM6n0Siy2dkDZ8^8f$<07*qoM6N<$f&}#Z A0{{R3 diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_out.png b/src/main/resources/assets/techreborn/textures/blocks/machine/dimstorage_out.png deleted file mode 100644 index 067e9c8653fbc132ebf5633a8058aacc0aba7db3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmV-W0Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0l`T`K~y+Tb&^?5fzAgCY*(C=r+L?4_KN&iDtcXdyTiK&_K$!Y!c?9ANa z{Ib#HaEH&*M^~j}{wk3x#4=fXV9)IKZFqM!eSXJoP^@g)UBL+Og!i}i55EK-CYAPNze|C9-Jxf;L7?lOFfdgJR2rM&8FSb0i%#O>|PK)H>b& z1hf%Jo%0|Di%poE9_DkH&2!6tREMP4#pk9JNZXnv1o8uFeK3%-hsq%Uw2`^HXE40O zlG!TOUEbZq5lB^QbS!7D09%a+EE+AEKz;KcMbN;z|LhT93HNLfG%yk{B`VShPk|-a zP(kgjb5^-l>A=F8`A-GF+u?+X0pieUialkLvO*lmsN e^eBPBV*3G`TIP&B)yJs-0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;Eegmrwuz0kla(K~y+Tb&^?2LQxcj&;JghAcE+rC}>jC zw4BY7oKjOOt;`{(tZX9ZG|eAS-{r``9)hLpd+%E7ti8_`vkOZz^NVwf%S$Wkt6O@5 z%^6HxCGSd!{9Qa(h-R|Z;}fIPv*-4jJx4a5Uu>JL4u1%^f~SY4vGZd2zSDi|4<0`I zpxkT;F{hwAunWD_G5sq4_6|>oAMiBzLYycRJ>jS`5XN-JViRP**c&+mWT>_~P@jh* z*c6C!uW!mu6HK2_YBZtBFcN66;1G8x0yHweqiFm%mbffeE3G!^@s^;Lz(_i30wO7U zENk7K45K0eItgFh(8i=`>`5=bDYh!)``B#`(@E1*7o|$A_xYcIHbUuZE@acRFAR1U z^Eu1rdCNDNmOT0YGWwPR8C#2lKt2%kbv%Z_zdV5gJ#R8kbq2#dY#1$K*WvcXlOSEK zNqa06V5<>