diff options
Diffstat (limited to 'src/Java/miscutil/core/item')
3 files changed, 14 insertions, 15 deletions
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 801bb33b64..f466786055 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -3,14 +3,12 @@ import static miscutil.core.creative.AddToCreativeTab.tabMachines; import static miscutil.core.creative.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; import gregtech.api.util.GT_OreDictUnificator; -import miscutil.core.block.ModBlocks; import miscutil.core.creative.AddToCreativeTab; import miscutil.core.item.base.CoreItem; import miscutil.core.item.base.foods.BaseItemFood; import miscutil.core.item.base.foods.BaseItemHotFood; import miscutil.core.item.base.ingots.BaseItemIngot; import miscutil.core.item.base.ingots.BaseItemIngotHot; -import miscutil.core.item.base.itemblock.ItemBlockGtFrameBox; import miscutil.core.item.base.plates.BaseItemPlate; import miscutil.core.item.effects.RarityUncommon; import miscutil.core.item.general.BufferCore; @@ -315,9 +313,7 @@ public final class ModItems { itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); - ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); - - itemPLACEHOLDER_Circuit = new Item().setUnlocalizedName("itemPLACEHOLDER_Circuit").setTextureName(CORE.MODID + ":itemPLACEHOLDER_Circuit"); - GameRegistry.registerItem(itemPLACEHOLDER_Circuit, "itemPLACEHOLDER_Circuit"); + //ItemBlockGtFrameBox = new ItemBlockGtFrameBox(ModBlocks.blockGtFrameSet1); + //GameRegistry.registerItem(ItemBlockGtFrameBox, "itemGtFrameBoxSet1"); } }
\ No newline at end of file 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; + } } |