From d81f15a1540dda46c8540434de2a14cef235418d Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Mon, 2 Nov 2015 23:16:46 +0100 Subject: [PATCH] - Familiar: Added fully upgraded one to CreativeTab --- .../makeo/gadomancy/common/blocks/BlockStoneMachine.java | 2 -- .../gadomancy/common/items/ItemBlockStoneMachine.java | 3 --- .../gadomancy/common/items/baubles/ItemFamiliar.java | 8 ++++++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java index e8bc542..8cfa81c 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -69,8 +69,6 @@ public class BlockStoneMachine extends Block { @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, 0)); - list.add(new ItemStack(item, 1, 15)); - list.add(new ItemStack(item, 1, 11)); } @Override diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java index b94ecd0..025a747 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockStoneMachine.java @@ -1,9 +1,6 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.blocks.BlockStoneMachine; import net.minecraft.block.Block; -import net.minecraft.block.BlockBrewingStand; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java index 8f6ff5e..8bf3b63 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java @@ -41,6 +41,13 @@ public class ItemFamiliar extends Item implements IBauble { ItemStack stack = new ItemStack(item); setAspect(stack, Aspect.MAGIC); list.add(stack); + + stack = new ItemStack(item); + setAspect(stack, Aspect.MAGIC); + for(FamiliarUpgrade upgrade : FamiliarUpgrade.values()) { + addUpgrade(stack, upgrade); + } + list.add(stack); } @Override @@ -165,6 +172,7 @@ public class ItemFamiliar extends Item implements IBauble { public boolean hasUpgrade(ItemStack stack, FamiliarUpgrade upgrade) { if(stack == null || !(stack.getItem() instanceof ItemFamiliar)) return false; + if(upgrade == null) return true; if(!stack.hasTagCompound() || !stack.getTagCompound().hasKey(upgrade.getTag())) return false; return stack.getTagCompound().getBoolean(upgrade.getTag()); }