From e15a07bdb8106e2abe27c28ab4ab8b6cf37e2a5e Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Thu, 28 Jul 2016 14:59:08 +0200 Subject: [PATCH] Added creative tabs for blocks and items and associated language entries. Added check for iron nugget, to prevent double registry. --- src/main/java/com/sosnitzka/taiga/Blocks.java | 1 + .../java/com/sosnitzka/taiga/CreativeTab.java | 27 +++++++++++++++++++ src/main/java/com/sosnitzka/taiga/Items.java | 5 ++++ .../resources/assets/taiga/lang/de_DE.lang | 6 ++++- .../resources/assets/taiga/lang/en_US.lang | 6 ++++- .../resources/assets/taiga/lang/zh_CN.lang | 6 ++++- 6 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/sosnitzka/taiga/CreativeTab.java diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java index b430967..fd63131 100644 --- a/src/main/java/com/sosnitzka/taiga/Blocks.java +++ b/src/main/java/com/sosnitzka/taiga/Blocks.java @@ -105,6 +105,7 @@ public class Blocks { Class targetType = field.getType(); try { Block block = (Block) field.get(targetType); // Gets the field as a BasicBlock which is then casted to an Block + block.setCreativeTab(CreativeTab.tabTaigaBlock); Utils.registerBlockWithItem(block); // Registers block and its item if (block instanceof BasicBlock) { // Checks that the block is a BasicBlock if (((BasicBlock) block).isOreDict()) { // Checks that the block has an oreDict entry diff --git a/src/main/java/com/sosnitzka/taiga/CreativeTab.java b/src/main/java/com/sosnitzka/taiga/CreativeTab.java new file mode 100644 index 0000000..d421373 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/CreativeTab.java @@ -0,0 +1,27 @@ +package com.sosnitzka.taiga; + + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +import static com.sosnitzka.taiga.Blocks.adamantiteBlock; +import static com.sosnitzka.taiga.Items.noctunyxIngot; + +public class CreativeTab { + + public static final CreativeTabs tabTaigaBlock = new CreativeTabs("taiga_block") { + @Override + public Item getTabIconItem() { + return Item.getItemFromBlock(adamantiteBlock); + } + }; + + public static final CreativeTabs tabTaigaItem = new CreativeTabs("taiga_item") { + @Override + public Item getTabIconItem() { + return noctunyxIngot; + } + }; + + +} diff --git a/src/main/java/com/sosnitzka/taiga/Items.java b/src/main/java/com/sosnitzka/taiga/Items.java index 5ce462f..4e0e184 100644 --- a/src/main/java/com/sosnitzka/taiga/Items.java +++ b/src/main/java/com/sosnitzka/taiga/Items.java @@ -116,6 +116,11 @@ public class Items { Class targetType = field.getType(); try { Item item = (Item) field.get(targetType); // Gets the field as a BasicItem which is then casted to an Item + if (item.equals(iron_nugget) && OreDictionary.doesOreNameExist("nuggetIron")) { + System.out.println("TAIGA: Skipped registration of nuggetIron which already exists."); + continue; + } + item.setCreativeTab(CreativeTab.tabTaigaItem); GameRegistry.register(item); // Registers the item into the game if (item instanceof BasicItem) { // Checks that the item is a BasicItem if (((BasicItem) item).isOreDict()) { // Checks if this item should be registered into the oreDict and registers it diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index 748ab9c..8592d85 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -266,4 +266,8 @@ item.spectrum_dust.name=Spektrumstaub item.tiberium_shard_instable.name=Instabile Tiberiumscherbe item.tiberium_nugget.name=Tiberium Nugget item.radiant_pearl.name=Radiumperle -item.luminar_dust.name=Luminarstaub \ No newline at end of file +item.luminar_dust.name=Luminarstaub + +gui.taiga_configuration.mainTitle=TAIGA Configuration +itemGroup.taiga_block=TAIGA Blocks +itemGroup.taiga_item=TAIGA Items \ No newline at end of file diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index 9e7e63e..b86e7e8 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -266,4 +266,8 @@ item.spectrum_dust.name=Spectrum Dust item.tiberium_shard_instable.name=Unstable Tiberium Shard item.tiberium_nugget.name=Tiberium Nugget item.radiant_pearl.name=Radiant Pearl -item.luminar_dust.name=Luminar Dust \ No newline at end of file +item.luminar_dust.name=Luminar Dust + +gui.taiga_configuration.mainTitle=TAIGA Configuration +itemGroup.taiga_block=TAIGA Blocks +itemGroup.taiga_item=TAIGA Items \ No newline at end of file diff --git a/src/main/resources/assets/taiga/lang/zh_CN.lang b/src/main/resources/assets/taiga/lang/zh_CN.lang index 1b59180..caafa17 100644 --- a/src/main/resources/assets/taiga/lang/zh_CN.lang +++ b/src/main/resources/assets/taiga/lang/zh_CN.lang @@ -266,4 +266,8 @@ item.spectrum_dust.name=复光粉末 item.tiberium_shard_instable.name=不稳定泰伯利亚碎片 item.tiberium_nugget.name=泰伯利亚粒 item.radiant_pearl.name=辐射珍珠 -item.luminar_dust.name=流明粉 \ No newline at end of file +item.luminar_dust.name=流明粉 + +gui.taiga_configuration.mainTitle=TAIGA 组态 +itemGroup.taiga_block=TAIGA 块 +itemGroup.taiga_item=TAIGA 对象 \ No newline at end of file