From 23e432ac2346b7e6df812f8b39551fdadf53ae34 Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sat, 5 Jan 2013 23:19:56 +0800 Subject: [PATCH] Added own creative tab --- .../assemblyline/language/en_US.properties | 1 + .../assemblyline/common/AssemblyLine.java | 1 + .../assemblyline/common/TabAssemblyLine.java | 21 +++++++++++++++++++ .../assemblyline/common/block/BlockCrate.java | 4 ++-- .../common/machine/BlockManipulator.java | 4 ++-- .../common/machine/BlockRejector.java | 4 ++-- .../machine/belt/BlockConveyorBelt.java | 4 ++-- .../machine/detector/BlockDetector.java | 4 ++-- .../common/machine/encoder/BlockEncoder.java | 4 ++-- .../common/machine/encoder/ItemDisk.java | 4 ++-- .../machine/imprinter/BlockImprinter.java | 4 ++-- .../machine/imprinter/ItemImprinter.java | 4 ++-- 12 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 src/minecraft/assemblyline/common/TabAssemblyLine.java diff --git a/resources/assemblyline/language/en_US.properties b/resources/assemblyline/language/en_US.properties index ddb8fae2..892ecde3 100644 --- a/resources/assemblyline/language/en_US.properties +++ b/resources/assemblyline/language/en_US.properties @@ -2,6 +2,7 @@ # @author Calclavia # Gui +itemGroup.assemblyline=Assembly Line assemblyline.gui.crafting=Crafting # Blocks diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index a62a54f8..0a4f5807 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -103,6 +103,7 @@ public class AssemblyLine GameRegistry.registerBlock(blockDetector, "Detector"); GameRegistry.registerBlock(blockRejector, "Rejector"); + TabAssemblyLine.itemStack = new ItemStack(AssemblyLine.blockConveyorBelt); UpdateNotifier.INSTANCE.checkUpdate(NAME, VERSION, "http://calclavia.com/downloads/al/recommendedversion.txt"); proxy.preInit(); diff --git a/src/minecraft/assemblyline/common/TabAssemblyLine.java b/src/minecraft/assemblyline/common/TabAssemblyLine.java new file mode 100644 index 00000000..6e6ffd0f --- /dev/null +++ b/src/minecraft/assemblyline/common/TabAssemblyLine.java @@ -0,0 +1,21 @@ +package assemblyline.common; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; + +public class TabAssemblyLine extends CreativeTabs +{ + public static final TabAssemblyLine INSTANCE = new TabAssemblyLine("assemblyline"); + public static ItemStack itemStack; + + public TabAssemblyLine(String par2Str) + { + super(CreativeTabs.getNextID(), par2Str); + } + + @Override + public ItemStack getIconItemStack() + { + return itemStack; + } +} diff --git a/src/minecraft/assemblyline/common/block/BlockCrate.java b/src/minecraft/assemblyline/common/block/BlockCrate.java index e0a058f7..0a096a24 100644 --- a/src/minecraft/assemblyline/common/block/BlockCrate.java +++ b/src/minecraft/assemblyline/common/block/BlockCrate.java @@ -8,9 +8,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.UniversalElectricity; import universalelectricity.prefab.BlockMachine; -import universalelectricity.prefab.UETab; import assemblyline.api.IFilterable; import assemblyline.common.AssemblyLine; +import assemblyline.common.TabAssemblyLine; import assemblyline.common.machine.imprinter.ItemImprinter; /** @@ -26,7 +26,7 @@ public class BlockCrate extends BlockMachine { super("crate", id, UniversalElectricity.machine); this.blockIndexInTexture = texture; - this.setCreativeTab(UETab.INSTANCE); + this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH); } diff --git a/src/minecraft/assemblyline/common/machine/BlockManipulator.java b/src/minecraft/assemblyline/common/machine/BlockManipulator.java index b13003b0..b565ea3a 100644 --- a/src/minecraft/assemblyline/common/machine/BlockManipulator.java +++ b/src/minecraft/assemblyline/common/machine/BlockManipulator.java @@ -5,8 +5,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import universalelectricity.core.UniversalElectricity; -import universalelectricity.prefab.UETab; import assemblyline.client.render.BlockRenderingHandler; +import assemblyline.common.TabAssemblyLine; import assemblyline.common.machine.imprinter.BlockImprintable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -21,7 +21,7 @@ public class BlockManipulator extends BlockImprintable { public BlockManipulator(int id) { - super("manipulator", id, UniversalElectricity.machine, UETab.INSTANCE); + super("manipulator", id, UniversalElectricity.machine, TabAssemblyLine.INSTANCE); this.setBlockBounds(0, 0, 0, 1, 0.3f, 1); } diff --git a/src/minecraft/assemblyline/common/machine/BlockRejector.java b/src/minecraft/assemblyline/common/machine/BlockRejector.java index d10f022e..7b638e01 100644 --- a/src/minecraft/assemblyline/common/machine/BlockRejector.java +++ b/src/minecraft/assemblyline/common/machine/BlockRejector.java @@ -3,8 +3,8 @@ package assemblyline.common.machine; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import universalelectricity.core.UniversalElectricity; -import universalelectricity.prefab.UETab; import assemblyline.client.render.BlockRenderingHandler; +import assemblyline.common.TabAssemblyLine; import assemblyline.common.machine.imprinter.BlockImprintable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -13,7 +13,7 @@ public class BlockRejector extends BlockImprintable { public BlockRejector(int id) { - super("rejector", id, UniversalElectricity.machine, UETab.INSTANCE); + super("rejector", id, UniversalElectricity.machine, TabAssemblyLine.INSTANCE); } @Override diff --git a/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java b/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java index 59b2c716..026698ba 100644 --- a/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java +++ b/src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java @@ -10,8 +10,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.UniversalElectricity; import universalelectricity.prefab.BlockMachine; -import universalelectricity.prefab.UETab; import assemblyline.client.render.BlockRenderingHandler; +import assemblyline.common.TabAssemblyLine; import assemblyline.common.machine.belt.TileEntityConveyorBelt.SlantType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +27,7 @@ public class BlockConveyorBelt extends BlockMachine { super("conveyorBelt", id, UniversalElectricity.machine); this.setBlockBounds(0, 0, 0, 1, 0.3f, 1); - this.setCreativeTab(UETab.INSTANCE); + this.setCreativeTab(TabAssemblyLine.INSTANCE); } @Override diff --git a/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java b/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java index 362132e8..b8a3264e 100644 --- a/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java +++ b/src/minecraft/assemblyline/common/machine/detector/BlockDetector.java @@ -8,8 +8,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import universalelectricity.core.UniversalElectricity; -import universalelectricity.prefab.UETab; import assemblyline.common.AssemblyLine; +import assemblyline.common.TabAssemblyLine; import assemblyline.common.machine.imprinter.BlockImprintable; /** @@ -19,7 +19,7 @@ public class BlockDetector extends BlockImprintable { public BlockDetector(int blockID, int texture) { - super("detector", blockID, UniversalElectricity.machine, UETab.INSTANCE); + super("detector", blockID, UniversalElectricity.machine, TabAssemblyLine.INSTANCE); this.blockIndexInTexture = texture; this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH); } diff --git a/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java b/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java index 88ae5a27..db7546e3 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java +++ b/src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java @@ -5,9 +5,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import universalelectricity.prefab.BlockMachine; -import universalelectricity.prefab.UETab; import assemblyline.common.AssemblyLine; import assemblyline.common.CommonProxy; +import assemblyline.common.TabAssemblyLine; public class BlockEncoder extends BlockMachine { @@ -16,7 +16,7 @@ public class BlockEncoder extends BlockMachine super(id, Material.wood); this.blockIndexInTexture = 4; this.setBlockName("encoder"); - this.setCreativeTab(UETab.INSTANCE); + this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH); } diff --git a/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java b/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java index 71bd5493..d1c1fef2 100644 --- a/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java +++ b/src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java @@ -8,8 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import universalelectricity.prefab.UETab; import assemblyline.common.AssemblyLine; +import assemblyline.common.TabAssemblyLine; public class ItemDisk extends Item { @@ -18,7 +18,7 @@ public class ItemDisk extends Item super(id); this.setItemName("disk"); this.setIconIndex(0); - this.setCreativeTab(UETab.INSTANCE); + this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setHasSubtypes(true); this.setTextureFile(AssemblyLine.ITEM_TEXTURE_PATH); } diff --git a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java index 699af406..5b3e65cc 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import universalelectricity.prefab.BlockMachine; -import universalelectricity.prefab.UETab; import assemblyline.common.AssemblyLine; import assemblyline.common.CommonProxy; +import assemblyline.common.TabAssemblyLine; public class BlockImprinter extends BlockMachine { @@ -15,7 +15,7 @@ public class BlockImprinter extends BlockMachine super(id, Material.wood); this.blockIndexInTexture = 4; this.setBlockName("imprinter"); - this.setCreativeTab(UETab.INSTANCE); + this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH); } diff --git a/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java b/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java index f0a6b764..1f6ce20c 100644 --- a/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java +++ b/src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java @@ -8,8 +8,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import universalelectricity.prefab.UETab; import assemblyline.common.AssemblyLine; +import assemblyline.common.TabAssemblyLine; public class ItemImprinter extends Item { @@ -18,7 +18,7 @@ public class ItemImprinter extends Item super(id); this.setItemName("imprint"); this.setIconIndex(1); - this.setCreativeTab(UETab.INSTANCE); + this.setCreativeTab(TabAssemblyLine.INSTANCE); this.setHasSubtypes(true); this.setTextureFile(AssemblyLine.ITEM_TEXTURE_PATH); }