From e15a07bdb8106e2abe27c28ab4ab8b6cf37e2a5e Mon Sep 17 00:00:00 2001
From: Robert Sosnitzka <robert.sosnitzka@gmail.com>
Date: Thu, 28 Jul 2016 14:59:08 +0200
Subject: 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 +
 src/main/java/com/sosnitzka/taiga/CreativeTab.java | 27 ++++++++++++++++++++++
 src/main/java/com/sosnitzka/taiga/Items.java       |  5 ++++
 3 files changed, 33 insertions(+)
 create mode 100644 src/main/java/com/sosnitzka/taiga/CreativeTab.java

(limited to 'src/main/java/com/sosnitzka')

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
-- 
cgit v1.2.3