diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index d08c2bbf4..c528e154c 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -1,26 +1,12 @@ package techreborn; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import techreborn.blocks.BlockOre; -import techreborn.blocks.BlockQuantumChest; -import techreborn.blocks.BlockQuantumTank; -import techreborn.blocks.BlockThermalGenerator; import techreborn.client.GuiHandler; -import techreborn.client.TechRebornCreativeTab; -import techreborn.tiles.TileQuantumChest; -import techreborn.tiles.TileQuantumTank; -import net.minecraft.item.Item; import techreborn.init.ModBlocks; import techreborn.init.ModItems; -import techreborn.itemblocks.ItemBlockOre; -import techreborn.items.ItemDusts; import techreborn.lib.ModInfo; -import techreborn.tiles.TileThermalGenerator; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; @Mod(modid = ModInfo.MOD_ID, name = ModInfo.MOD_NAME, version = ModInfo.MOD_VERSION, dependencies = ModInfo.MOD_DEPENDENCUIES) public class Core { diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index ada66aad4..3d3cf2b55 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -1,9 +1,13 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; @@ -12,6 +16,11 @@ import techreborn.tiles.TileQuantumChest; public class BlockQuantumChest extends BlockContainer { + @SideOnly(Side.CLIENT) + private IIcon top; + @SideOnly(Side.CLIENT) + private IIcon other; + public BlockQuantumChest() { super(Material.piston); setHardness(2f); @@ -27,4 +36,22 @@ public class BlockQuantumChest extends BlockContainer { player.openGui(Core.INSTANCE, GuiHandler.quantumChestID, world, x, y, z); return true; } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) { + top = icon.registerIcon("techreborn:quantum_top"); + other = icon.registerIcon("techreborn:quantum_chest"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int currentSide, int meta) { + //TODO chest rotation + if (currentSide == 1) { + return top; + } else { + return other; + } + } } diff --git a/src/main/java/techreborn/blocks/BlockQuantumTank.java b/src/main/java/techreborn/blocks/BlockQuantumTank.java index fd57d4777..96510f8ce 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/BlockQuantumTank.java @@ -1,9 +1,13 @@ package techreborn.blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; @@ -11,6 +15,11 @@ import techreborn.tiles.TileQuantumTank; public class BlockQuantumTank extends BlockContainer { + @SideOnly(Side.CLIENT) + private IIcon top; + @SideOnly(Side.CLIENT) + private IIcon other; + public BlockQuantumTank() { super(Material.piston); setHardness(2f); @@ -26,4 +35,21 @@ public class BlockQuantumTank extends BlockContainer { player.openGui(Core.INSTANCE, GuiHandler.quantumTankID, world, x, y, z); return true; } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister icon) { + top = icon.registerIcon("techreborn:quantum_top"); + other = icon.registerIcon("techreborn:ThermalGenerator_other"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int currentSide, int meta) { + if (currentSide == 1) { + return top; + } else { + return other; + } + } } diff --git a/src/main/resources/assets/techreborn/textures/blocks/quantum_chest.png b/src/main/resources/assets/techreborn/textures/blocks/quantum_chest.png new file mode 100644 index 000000000..93d63d0b0 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/quantum_chest.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/quantum_top.png b/src/main/resources/assets/techreborn/textures/blocks/quantum_top.png new file mode 100644 index 000000000..894358b88 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/quantum_top.png differ