From bd2adf690287e15f3264ae69fed5a010b53e88a3 Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Fri, 29 Jul 2016 04:16:44 +1000
Subject: + Added Frameboxes with Colours and Names. + Added config option for
 the Division Sigil.

---
 .../miscutil/core/item/base/itemblock/ItemBlockBase.java  |  6 +++---
 .../core/item/base/itemblock/ItemBlockGtFrameBox.java     | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/Java/miscutil/core/item/base')

diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java
index df01123923..ca04497049 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java
+++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockBase.java
@@ -2,13 +2,13 @@ package miscutil.core.item.base.itemblock;
 
 import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlockWithMetadata;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-public class ItemBlockBase extends ItemBlockWithMetadata {
+public class ItemBlockBase extends ItemBlock {
 
         public ItemBlockBase(Block block) {
-                super(block, block);
+                super(block);
                 this.setCreativeTab(AddToCreativeTab.tabBlock);
         }
 
diff --git a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
index ca28daf232..982c5a4b91 100644
--- a/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
+++ b/src/Java/miscutil/core/item/base/itemblock/ItemBlockGtFrameBox.java
@@ -1,17 +1,20 @@
 package miscutil.core.item.base.itemblock;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemBlock;
 
-public class ItemBlockGtFrameBox extends ItemBlockBase{
+public class ItemBlockGtFrameBox extends ItemBlock{
 
+	protected int blockColour;
+	
 	public ItemBlockGtFrameBox(Block block) {
 		super(block);
+		this.blockColour = block.getBlockColor();
+       // this.setCreativeTab(AddToCreativeTab.tabBlock);
 	}
 
-	@Override
-	public int getColorFromItemStack(ItemStack iStack, int colour) {
-		return super.getColorFromItemStack(iStack, colour);
-	}
+    public int getRenderColor(int aMeta) {
+        return blockColour;
+    }
 
 }
-- 
cgit