diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index 5c3d2e63d..482ac3d6d 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -28,10 +28,11 @@ public class Item16Colors extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 16; i++) + stacks.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 54228edca..92ddffdc5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -35,10 +35,11 @@ public class ItemAncientWill extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES; i++) + list.add(new ItemStack(this, 1, i)); + } } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index c555c81e0..582beeada 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -43,10 +43,11 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < 2; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 2; i++) + list.add(new ItemStack(this, 1, i)); + } } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 106ef1c80..001f528d8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -38,10 +38,11 @@ public class ItemCorporeaSpark extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < 2; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 2; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index ec0f3dfff..2ea0d6608 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -50,10 +50,11 @@ public class ItemCraftPattern extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index f344ac4a8..17f4c9044 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -59,10 +59,11 @@ public class ItemGrassHorn extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 2cc4986e1..7ee53046d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -69,10 +69,11 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { } @Override - @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull CreativeTabs par2, @Nonnull NonNullList par3) { - for(int i = 0; i < SUBTYPES; i++) - par3.add(new ItemStack(this, 1, i)); + public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 16f3db3c4..d54c4cc27 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -73,11 +73,12 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { super.getSubItems(tab, list); - for(int i = 0; i < 4; i++) - list.add(new ItemStack(this, 1, (i + 1) * 5 - 1)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 4; i++) + list.add(new ItemStack(this, 1, (i + 1) * 5 - 1)); + } } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 0939b5174..649bae0f1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -98,15 +98,16 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - list.add(new ItemStack(this)); - ItemStack creative = new ItemStack(this); - for(String s : BotaniaAPI.knowledgeTypes.keySet()) { - KnowledgeType type = BotaniaAPI.knowledgeTypes.get(s); - unlockKnowledge(creative, type); + if(isInCreativeTab(tab)) { + list.add(new ItemStack(this)); + ItemStack creative = new ItemStack(this); + for(String s : BotaniaAPI.knowledgeTypes.keySet()) { + KnowledgeType type = BotaniaAPI.knowledgeTypes.get(s); + unlockKnowledge(creative, type); + } + list.add(creative); } - list.add(creative); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index 3ed2b269a..836557c6b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -43,21 +43,19 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - // Empty tablet - stacks.add(new ItemStack(this)); + if(isInCreativeTab(tab)) { + stacks.add(new ItemStack(this)); - // Full tablet - ItemStack fullPower = new ItemStack(this); - setMana(fullPower, MAX_MANA); - stacks.add(fullPower); + ItemStack fullPower = new ItemStack(this); + setMana(fullPower, MAX_MANA); + stacks.add(fullPower); - // Creative Tablet - ItemStack creative = new ItemStack(this); - setMana(creative, MAX_MANA); - setStackCreative(creative); - stacks.add(creative); + ItemStack creative = new ItemStack(this); + setMana(creative, MAX_MANA); + setStackCreative(creative); + stacks.add(creative); + } } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index 5f24ed229..719d58816 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -30,10 +30,11 @@ public class ItemSparkUpgrade extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < VARIANTS; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < VARIANTS; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index d9a916e79..a767ad64a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -36,11 +36,12 @@ public class ItemThornChakram extends ItemMod { setHasSubtypes(true); } - @SideOnly(Side.CLIENT) @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < 2; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 2; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index ec731f392..05774b01b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -228,8 +228,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Override public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - for(int i = 0; i < 16; i++) - stacks.add(forColors(i, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 16; i++) + stacks.add(forColors(i, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 94f98a719..d0085005a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -124,10 +124,11 @@ public class ItemVirus extends ItemMod { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 53c141546..ea02abacc 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -109,12 +109,13 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list) { - for(String s : BotaniaAPI.brewMap.keySet()) { - ItemStack stack = new ItemStack(this); - setBrew(stack, s); - list.add(stack); + if(isInCreativeTab(tab)) { + for(String s : BotaniaAPI.brewMap.keySet()) { + ItemStack stack = new ItemStack(this); + setBrew(stack, s); + list.add(stack); + } } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index 84b3ca769..f7de96961 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -43,13 +43,14 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { super.getSubItems(tab, list); - for(String s : BotaniaAPI.brewMap.keySet()) { - ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); - if(!brewStack.isEmpty()) - list.add(brewStack); + if(isInCreativeTab(tab)) { + for(String s : BotaniaAPI.brewMap.keySet()) { + ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); + if(!brewStack.isEmpty()) + list.add(brewStack); + } } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 7e3664106..bea264ca9 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -37,10 +37,11 @@ public class ItemVial extends ItemMod implements IBrewContainer { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list) { - for(int i = 0; i < 2; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 2; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 063de04ff..5a5ba72dd 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -63,10 +63,11 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 6eabc0108..1d663d719 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -57,13 +57,14 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre } @Override - @SideOnly(Side.CLIENT) public void getSubItems(CreativeTabs tab, NonNullList list) { super.getSubItems(tab, list); - for(String s : BotaniaAPI.brewMap.keySet()) { - ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); - if(!brewStack.isEmpty()) - list.add(brewStack); + if(isInCreativeTab(tab)) { + for(String s : BotaniaAPI.brewMap.keySet()) { + ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); + if(!brewStack.isEmpty()) + list.add(brewStack); + } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index c98d4ee1e..c4f5c2594 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -95,10 +95,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = 0; i < SUBTYPES + 1; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES + 1; i++) + list.add(new ItemStack(this, 1, i)); + } } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index 9c7148af3..62742185f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -46,13 +46,14 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - stacks.add(new ItemStack(this)); + if(isInCreativeTab(tab)) { + stacks.add(new ItemStack(this)); - ItemStack full = new ItemStack(this); - setMana(full, getMaxMana(full)); - stacks.add(full); + ItemStack full = new ItemStack(this); + setMana(full, getMaxMana(full)); + stacks.add(full); + } } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 3280ba397..f912a5b00 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -78,12 +78,13 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int mana : CREATIVE_MANA) { - ItemStack stack = new ItemStack(this); - setMana(stack, mana); - list.add(stack); + if(isInCreativeTab(tab)) { + for(int mana : CREATIVE_MANA) { + ItemStack stack = new ItemStack(this); + setMana(stack, mana); + list.add(stack); + } } } @@ -268,7 +269,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { - return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); + return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index 55bf39c1d..37c047011 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -43,10 +43,11 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - list.add(new ItemStack(this, 1, USES)); - list.add(new ItemStack(this)); + if(isInCreativeTab(tab)) { + list.add(new ItemStack(this, 1, USES)); + list.add(new ItemStack(this)); + } } @Override diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 256d0be42..d9d32017f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -146,10 +146,11 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - for(int i = 0; i < SUBTYPES; i++) - stacks.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < SUBTYPES; i++) + stacks.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index e0762501d..c73f5d9d8 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -115,11 +115,12 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - for(int i = 0; i < types; i++) - if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) - stacks.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < types; i++) + if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) + stacks.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 865688408..95fa64433 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -33,10 +33,11 @@ public class ItemQuartz extends ItemMod implements IElvenItem { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList list) { - for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) - list.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) + list.add(new ItemStack(this, 1, i)); + } } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 15c9430f8..695d73251 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -31,10 +31,11 @@ public class ItemRune extends ItemMod implements IFlowerComponent { } @Override - @SideOnly(Side.CLIENT) public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList stacks) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(this, 1, i)); + if(isInCreativeTab(tab)) { + for(int i = 0; i < 16; i++) + stacks.add(new ItemStack(this, 1, i)); + } } @Nonnull