Fix getSubItems

This commit is contained in:
Vincent Lee committed 2017-06-25 09:26:34 -05:00
1 parent c58ae21173
commit 5332cdfad2
27 files changed
+131 -106

No files matched your search

@@ -28,10 +28,11 @@ public class Item16Colors extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -35,10 +35,11 @@ public class ItemAncientWill extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> 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)
@@ -43,10 +43,11 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -38,10 +38,11 @@ public class ItemCorporeaSpark extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -50,10 +50,11 @@ public class ItemCraftPattern extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -59,10 +59,11 @@ public class ItemGrassHorn extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -69,10 +69,11 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs par2, @Nonnull NonNullList<ItemStack> par3) {
for(int i = 0; i < SUBTYPES; i++)
par3.add(new ItemStack(this, 1, i));
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@@ -73,11 +73,12 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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)
@@ -98,15 +98,16 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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)
@@ -43,21 +43,19 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -30,10 +30,11 @@ public class ItemSparkUpgrade extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -36,11 +36,12 @@ public class ItemThornChakram extends ItemMod {
setHasSubtypes(true);
}
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -228,8 +228,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -124,10 +124,11 @@ public class ItemVirus extends ItemMod {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -109,12 +109,13 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> 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);
}
}
}
@@ -43,13 +43,14 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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);
}
}
}
@@ -37,10 +37,11 @@ public class ItemVial extends ItemMod implements IBrewContainer {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> 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
@@ -63,10 +63,11 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -57,13 +57,14 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> 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);
}
}
}
@@ -95,10 +95,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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)
@@ -46,13 +46,14 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -78,12 +78,13 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -43,10 +43,11 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -146,10 +146,11 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -115,11 +115,12 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -33,10 +33,11 @@ public class ItemQuartz extends ItemMod implements IElvenItem {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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
@@ -31,10 +31,11 @@ public class ItemRune extends ItemMod implements IFlowerComponent {
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> 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