From 355da3997e94b665b6c0dc35ac71063c9d92ba94 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 Jan 2017 23:20:32 -0600 Subject: [PATCH] Nonnulllist in recipes and getSubItems --- .../vazkii/botania/common/crafting/recipe/AesirRingRecipe.java | 3 ++- .../botania/common/crafting/recipe/AncientWillRecipe.java | 3 ++- .../common/crafting/recipe/BlackHoleTalismanExtractRecipe.java | 3 ++- .../botania/common/crafting/recipe/CompositeLensRecipe.java | 3 ++- .../botania/common/crafting/recipe/CosmeticAttachRecipe.java | 3 ++- .../botania/common/crafting/recipe/CosmeticRemoveRecipe.java | 3 ++- .../botania/common/crafting/recipe/HelmRevealingRecipe.java | 3 ++- .../vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java | 3 ++- .../botania/common/crafting/recipe/LensDyeingRecipe.java | 3 ++- .../botania/common/crafting/recipe/ManaGunClipRecipe.java | 3 ++- .../botania/common/crafting/recipe/ManaGunLensRecipe.java | 3 ++- .../common/crafting/recipe/ManaGunRemoveLensRecipe.java | 3 ++- .../botania/common/crafting/recipe/PhantomInkRecipe.java | 3 ++- .../common/crafting/recipe/SpecialFloatingFlowerRecipe.java | 3 ++- .../botania/common/crafting/recipe/SpellClothRecipe.java | 3 ++- .../botania/common/crafting/recipe/TerraPickTippingRecipe.java | 3 ++- src/main/java/vazkii/botania/common/item/Item16Colors.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemAncientWill.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemBlackLotus.java | 3 ++- .../java/vazkii/botania/common/item/ItemCorporeaSpark.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemCraftPattern.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemGrassHorn.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemLaputaShard.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemManaTablet.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemThornChakram.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemTwigWand.java | 3 ++- src/main/java/vazkii/botania/common/item/ItemVirus.java | 3 ++- .../java/vazkii/botania/common/item/brew/ItemBrewBase.java | 3 ++- .../java/vazkii/botania/common/item/brew/ItemIncenseStick.java | 3 ++- src/main/java/vazkii/botania/common/item/brew/ItemVial.java | 3 ++- .../common/item/equipment/bauble/ItemBaubleCosmetic.java | 3 ++- .../botania/common/item/equipment/bauble/ItemBloodPendant.java | 3 ++- .../botania/common/item/equipment/bauble/ItemFlightTiara.java | 3 ++- .../botania/common/item/equipment/bauble/ItemManaRing.java | 3 ++- .../common/item/equipment/tool/terrasteel/ItemTerraPick.java | 3 ++- .../common/item/interaction/thaumcraft/ItemManaInkwell.java | 3 ++- src/main/java/vazkii/botania/common/item/lens/ItemLens.java | 3 ++- .../vazkii/botania/common/item/material/ItemManaResource.java | 3 ++- .../java/vazkii/botania/common/item/material/ItemQuartz.java | 3 ++- .../java/vazkii/botania/common/item/material/ItemRune.java | 3 ++- 43 files changed, 86 insertions(+), 43 deletions(-) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index af8d876ae..6aa5bbde8 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; @@ -95,7 +96,7 @@ public class AesirRingRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index 7b8e5224e..2ce0157ff 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IAncientWillContainer; @@ -78,7 +79,7 @@ public class AncientWillRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 7fda8ca86..29133c44b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemBlackHoleTalisman; @@ -71,7 +72,7 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index c7b7ad423..5692ddc5d 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.mana.ICompositableLens; @@ -87,7 +88,7 @@ public class CompositeLensRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index 5d9cc983c..6517a9a2b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; @@ -81,7 +82,7 @@ public class CosmeticAttachRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index bfa000f2f..9319badb4 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; @@ -69,7 +70,7 @@ public class CosmeticRemoveRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 539539f16..d1a83d4f2 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -17,6 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -106,7 +107,7 @@ public class HelmRevealingRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 5d4611664..64a9860fd 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -70,7 +71,7 @@ public class KeepIvyRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index b5cb9453b..b101e0ada 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -18,6 +18,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; @@ -100,7 +101,7 @@ public class LensDyeingRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index a15173940..470253e76 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; @@ -76,7 +77,7 @@ public class ManaGunClipRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 8547457d9..d4f69a68f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.mana.ILens; @@ -84,7 +85,7 @@ public class ManaGunLensRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index 54852cc57..3b47fedc5 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; @@ -68,7 +69,7 @@ public class ManaGunRemoveLensRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 107bb23d0..6ead0a3b0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IPhantomInkable; @@ -71,7 +72,7 @@ public class PhantomInkRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index bab7926d8..04370ea53 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.block.ModBlocks; @@ -72,7 +73,7 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index d1d38a0d3..0a7f04733 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; @@ -76,7 +77,7 @@ public class SpellClothRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index d24d75119..11b53db04 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; @@ -73,7 +74,7 @@ public class TerraPickTippingRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index e732b06cd..335b01a79 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; @@ -31,7 +32,7 @@ public class Item16Colors extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 676c6c003..aff49f054 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,7 +44,7 @@ public class ItemAncientWill extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index a4e5d25c7..42329dc12 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -44,7 +45,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index 7999520e4..19f5b522e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -41,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 194c3ddb6..4dd199de4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -53,7 +54,7 @@ public class ItemCraftPattern extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 93e0cab04..bb60143b8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -33,6 +33,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -61,7 +62,7 @@ public class ItemGrassHorn extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 029f01734..b848805ba 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -71,7 +72,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubItems(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index fb8ea3c24..2e0790c90 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -30,6 +30,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -75,7 +76,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 4c643c8e7..8fa243e4a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -30,6 +30,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -98,7 +99,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index ca13b0fab..22186624b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -46,7 +47,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { // Empty tablet stacks.add(new ItemStack(item, 1)); diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index e53ce853b..a013c0610 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; @@ -33,7 +34,7 @@ public class ItemSparkUpgrade extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index c6d808565..1bc17d3b9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -24,6 +24,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -44,7 +45,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { @SideOnly(Side.CLIENT) @Override - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 83fdf3ae2..6bf892506 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -31,6 +31,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -205,7 +206,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(forColors(i, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 54feb9a14..5225071d1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -31,6 +31,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -112,7 +113,7 @@ public class ItemVirus extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 a1e3ad971..efcc604b0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -29,6 +29,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; @@ -115,7 +116,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); 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 db7d9c0c7..c21fcfab6 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -44,7 +45,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); 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 05d510304..1347811fd 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +41,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } 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 3d5a581f0..bfb2a20d3 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 @@ -14,6 +14,7 @@ import java.util.List; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; @@ -74,7 +75,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 617261cab..37cfed80d 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 @@ -15,6 +15,7 @@ import java.util.List; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; @@ -59,7 +60,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); 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 53825cef3..92723e747 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 @@ -15,6 +15,7 @@ import java.util.List; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; @@ -100,7 +101,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } 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 dc50cd456..a270015d3 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 @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -51,7 +52,7 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { stacks.add(new ItemStack(item, 1, 10000)); } 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 5ba2652e6..4b6c1947e 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 @@ -28,6 +28,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -84,7 +85,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); 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 dfc502eba..378e00fcf 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 @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; @@ -46,7 +47,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } 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 0ced7631b..65d5d81f4 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -23,6 +23,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -157,7 +158,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < SUBTYPES; i++) stacks.add(new ItemStack(item, 1, i)); } 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 57dfa229b..f3939a55f 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -26,6 +26,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -123,7 +124,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) stacks.add(new ItemStack(item, 1, i)); 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 7e18fa428..c400709e5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.recipe.IElvenItem; @@ -36,7 +37,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } 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 17bab8aae..b11eed09a 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IPetalApothecary; @@ -39,7 +40,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); }