Remove trivial IIcon refs in Item to get a better sense of my progress there

This commit is contained in:
Vincent Lee committed 2015-11-21 23:12:46 -06:00
1 parent 921370b546
commit 3fe15e6b7d
31 files changed
+1 -439

No files matched your search

@@ -12,12 +12,10 @@ package vazkii.botania.common.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
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.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
@@ -30,8 +28,6 @@ public class ItemAncientWill extends ItemMod {
private static final int SUBTYPES = 6;
IIcon[] icons;
public ItemAncientWill() {
setUnlocalizedName(LibItemNames.ANCIENT_WILL);
setHasSubtypes(true);
@@ -47,18 +43,6 @@ public class ItemAncientWill extends ItemMod {
list.add(new ItemStack(item, 1, i));
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[SUBTYPES];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIconFromDamage(int dmg) {
return icons[Math.min(icons.length - 1, dmg)];
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean adv) {
addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), list);
@@ -15,7 +15,6 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -26,9 +25,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.*;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.RecipeSorter.Category;
import vazkii.botania.api.item.IBlockProvider;
@@ -48,8 +45,6 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
private static final String TAG_BLOCK_META = "blockMeta";
private static final String TAG_BLOCK_COUNT = "blockCount";
IIcon enabledIcon;
public ItemBlackHoleTalisman() {
setUnlocalizedName(LibItemNames.BLACK_HOLE_TALISMAN);
setMaxStackSize(1);
@@ -228,19 +223,6 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
setCount(stack, current + count);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
enabledIcon = IconHelper.forItem(par1IconRegister, this, 1);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1) {
return par1 == 1 ? enabledIcon : itemIcon;
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
@@ -14,7 +14,6 @@ import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -27,7 +26,6 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.*;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.core.helper.ItemNBTHelper;
@@ -37,7 +35,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemBottledMana extends ItemMod {
IIcon[] icons;
private static final String TAG_SEED = "randomSeed";
public ItemBottledMana() {
@@ -205,18 +202,6 @@ public class ItemBottledMana extends ItemMod {
par3List.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip"));
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[6];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
@@ -30,8 +30,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemCorporeaSpark extends ItemMod {
public static IIcon invIcon, worldIcon, invIconMaster, worldIconMaster, iconColorStar;
public ItemCorporeaSpark() {
setUnlocalizedName(LibItemNames.CORPOREA_SPARK);
setHasSubtypes(true);
@@ -12,7 +12,6 @@ package vazkii.botania.common.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.block.tile.TileCraftCrate;
@@ -28,8 +26,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemCraftPattern extends ItemMod {
IIcon[] icons;
public ItemCraftPattern() {
setHasSubtypes(true);
setUnlocalizedName(LibItemNames.CRAFT_PATTERN);
@@ -53,18 +49,6 @@ public class ItemCraftPattern extends ItemMod {
list.add(new ItemStack(item, 1, i));
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[TileCraftCrate.PATTERNS.length];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIconFromDamage(int dmg) {
return icons[Math.min(icons.length - 1, dmg)];
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
@@ -22,7 +22,6 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModBlocks;
@@ -18,7 +18,6 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockBush;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -27,7 +26,6 @@ import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.item.IGrassHornExcempt;
import vazkii.botania.api.item.IHornHarvestable;
@@ -40,8 +38,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemGrassHorn extends ItemMod {
private static final int SUBTYPES = 3;
IIcon[] icons;
IIcon vuvuzelaIcon;
public ItemGrassHorn() {
super();
@@ -56,29 +52,11 @@ public class ItemGrassHorn extends ItemMod {
list.add(new ItemStack(item, 1, i));
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[SUBTYPES];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
vuvuzelaIcon = IconHelper.forName(par1IconRegister, "vuvuzela");
}
@Override
public IIcon getIconIndex(ItemStack par1ItemStack) {
return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return getIconIndex(stack);
}
@Override
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
@@ -51,7 +51,6 @@ public class ItemGrassSeeds extends ItemMod {
};
private static final int SUBTYPES = 9;
IIcon[] icons;
public ItemGrassSeeds() {
super();
@@ -66,20 +65,6 @@ public class ItemGrassSeeds extends ItemMod {
par3.add(new ItemStack(par1, 1, i));
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[SUBTYPES];
for(int i = 0; i < SUBTYPES; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName() + stack.getItemDamage();
@@ -10,13 +10,11 @@
*/
package vazkii.botania.common.item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.lib.LibResources;
@@ -29,8 +27,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemManaCookie extends ItemFood {
private IIcon totalBiscuitIcon;
public ItemManaCookie() {
super(0, 0.1F, false);
setPotionEffect(Potion.saturation.id, 1, 0, 1F);
@@ -55,21 +51,9 @@ public class ItemManaCookie extends ItemFood {
return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return getIconIndex(stack);
}
@Override
public IIcon getIconIndex(ItemStack stack) {
return stack.getDisplayName().toLowerCase().equals("totalbiscuit") ? totalBiscuitIcon : super.getIconIndex(stack);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forItem(par1IconRegister, this);
totalBiscuitIcon = IconHelper.forName(par1IconRegister, "totalBiscuit");
}
}
@@ -15,7 +15,6 @@ import java.util.List;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -23,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.oredict.RecipeSorter;
@@ -55,8 +53,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
private static final int CLIP_SLOTS = 6;
private static final int COOLDOWN = 30;
IIcon[] icons;
public ItemManaGun() {
super();
setMaxDamage(COOLDOWN);
@@ -110,32 +106,6 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
return par1ItemStack;
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
int states = 3;
icons = new IIcon[states * 2];
for(int i = 0; i < states; i++) {
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
icons[states + i] = IconHelper.forName(par1IconRegister, "desuGun" + i);
}
}
@Override
public boolean requiresMultipleRenderPasses() {
return true;
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
boolean desu = isSugoiKawaiiDesuNe(stack);
int index = pass;
if(index == 0 && hasClip(stack))
index = 2;
return icons[Math.min(2, index) + (desu ? 3 : 0)];
}
// ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN
// ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN
// ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN
@@ -12,7 +12,6 @@ package vazkii.botania.common.item;
import java.awt.Color;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@@ -21,7 +20,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.mana.IManaItem;
import vazkii.botania.api.mana.IManaPool;
@@ -34,8 +32,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundItem, IManaTooltipDisplay {
IIcon[] icons;
private static final String TAG_MANA = "mana";
private static final String TAG_MANA_BACKLOG = "manaBacklog";
@@ -66,18 +62,6 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte
return 1000 - (int) (mana / TilePool.MAX_MANA * 1000);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[2];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return icons[Math.min(1, pass)];
}
@Override
public boolean isFull3D() {
return true;
@@ -13,13 +13,11 @@ package vazkii.botania.common.item;
import java.awt.Color;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
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.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import vazkii.botania.api.mana.ICreativeManaProvider;
@@ -31,8 +29,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaProvider, IManaTooltipDisplay {
IIcon[] icons;
private static final int MAX_MANA = 500000;
private static final String TAG_MANA = "mana";
@@ -73,18 +69,6 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP
return 1000 - (int) (mana / MAX_MANA * 1000);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[2];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return icons[Math.min(1, pass)];
}
@Override
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
if(isStackCreative(par1ItemStack))
@@ -13,7 +13,6 @@ package vazkii.botania.common.item;
import java.awt.Color;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@@ -26,7 +25,6 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
@@ -37,8 +35,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemSignalFlare extends ItemMod {
IIcon[] icons;
private static final String TAG_COLOR = "color";
public ItemSignalFlare() {
@@ -91,18 +87,6 @@ public class ItemSignalFlare extends ItemMod {
par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[2];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return icons[Math.min(1, pass)];
}
@Override
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par2 == 0)
@@ -10,7 +10,6 @@
*/
package vazkii.botania.common.item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
@@ -18,7 +17,6 @@ import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.mana.spark.ISparkAttachable;
@@ -30,8 +28,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemSpark extends ItemMod implements ICraftAchievement {
public static IIcon invIcon, worldIcon;
public ItemSpark() {
setUnlocalizedName(LibItemNames.SPARK);
}
@@ -56,17 +52,6 @@ public class ItemSpark extends ItemMod implements ICraftAchievement {
return false;
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
invIcon = IconHelper.forItem(par1IconRegister, this, 0);
worldIcon = IconHelper.forItem(par1IconRegister, this, 1);
}
@Override
public IIcon getIconFromDamage(int p_77617_1_) {
return invIcon;
}
@Override
public Achievement getAchievementOnCraft(ItemStack stack, EntityPlayer player, IInventory matrix) {
return ModAchievements.sparkCraft;
@@ -12,11 +12,9 @@ package vazkii.botania.common.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.lib.LibItemNames;
@@ -24,29 +22,11 @@ public class ItemSparkUpgrade extends ItemMod {
private static final int VARIANTS = 4;
public static IIcon[] worldIcons;
IIcon[] invIcons;
public ItemSparkUpgrade() {
setUnlocalizedName(LibItemNames.SPARK_UPGRADE);
setHasSubtypes(true);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
worldIcons = new IIcon[VARIANTS];
invIcons = new IIcon[VARIANTS];
for(int i = 0; i < VARIANTS; i++) {
worldIcons[i] = IconHelper.forItem(par1IconRegister, this, "L" + i);
invIcons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
}
@Override
public IIcon getIconFromDamage(int meta) {
return invIcons[Math.min(invIcons.length - 1, meta)];
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < VARIANTS; i++)
@@ -36,29 +36,11 @@ public class ItemSpawnerMover extends ItemMod {
public static final String TAG_SPAWNER = "spawner";
private static final String TAG_PLACE_DELAY = "placeDelay";
IIcon iconNormal, iconSpawner;
public ItemSpawnerMover() {
setUnlocalizedName(LibItemNames.SPAWNER_MOVER);
setMaxStackSize(1);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
iconNormal = IconHelper.forItem(par1IconRegister, this, 0);
iconSpawner = IconHelper.forItem(par1IconRegister, this, 1);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return getIconIndex(stack);
}
@Override
public IIcon getIconIndex(ItemStack par1ItemStack) {
return hasData(par1ItemStack) ? iconSpawner : iconNormal;
}
public static NBTTagCompound getSpawnerTag(ItemStack stack) {
NBTTagCompound tag = stack.getTagCompound();
if(tag != null) {
@@ -12,11 +12,9 @@ package vazkii.botania.common.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
@@ -26,8 +24,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemTemperanceStone extends ItemMod {
IIcon enabledIcon;
public ItemTemperanceStone() {
setUnlocalizedName(LibItemNames.TEMPERANCE_STONE);
setMaxStackSize(1);
@@ -43,19 +39,6 @@ public class ItemTemperanceStone extends ItemMod {
return par1ItemStack;
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
enabledIcon = IconHelper.forItem(par1IconRegister, this, 1);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1) {
return par1 == 1 ? enabledIcon : itemIcon;
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
@@ -11,14 +11,12 @@
package vazkii.botania.common.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.achievement.ICraftAchievement;
@@ -28,8 +26,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemThornChakram extends ItemMod implements ICraftAchievement {
IIcon iconFire;
public ItemThornChakram() {
setUnlocalizedName(LibItemNames.THORN_CHAKRAM);
setMaxStackSize(6);
@@ -42,17 +38,6 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement {
list.add(new ItemStack(item, 1, i));
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
iconFire = IconHelper.forItem(par1IconRegister, this, 1);
}
@Override
public IIcon getIconFromDamage(int dmg) {
return dmg == 0 ? itemIcon : iconFire;
}
@Override
public String getUnlocalizedName(ItemStack stack) {
return super.getUnlocalizedName() + stack.getItemDamage();
@@ -49,8 +49,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
IIcon[] icons;
private static final String TAG_COLOR1 = "color1";
private static final String TAG_COLOR2 = "color2";
private static final String TAG_BOUND_TILE_X = "boundTileX";
@@ -198,21 +196,6 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
return true;
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[4];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
if(pass == 3 && !getBindMode(stack))
pass = 0;
return icons[Math.min(icons.length - 1, pass)];
}
@Override
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
if(par2 == 0 || par2 == 3)
@@ -12,7 +12,6 @@ package vazkii.botania.common.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
@@ -25,7 +24,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IIcon;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import vazkii.botania.client.core.helper.IconHelper;
@@ -38,8 +36,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemVirus extends ItemMod {
IIcon[] icons;
private static final int SUBTYPES = 2;
public ItemVirus() {
@@ -90,12 +86,6 @@ public class ItemVirus extends ItemMod {
list.add(new ItemStack(item, 1, i));
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
@@ -105,12 +95,4 @@ public class ItemVirus extends ItemMod {
return super.getUnlocalizedName(par1ItemStack);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[SUBTYPES];
for(int i = 0; i < SUBTYPES; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
}
@@ -46,8 +46,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
int drinkSpeed;
ItemStack baseItem;
IIcon[] icons;
public ItemBrewBase(String name, String texName, int swigs, int drinkSpeed, ItemStack baseItem) {
this.name = name;
this.texName = texName;
@@ -116,20 +114,6 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
}
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forName(par1IconRegister, texName + "0");
icons = new IIcon[swigs];
for(int i = 0; i < swigs; i++)
icons[i] = IconHelper.forName(par1IconRegister, texName + "1_" + i);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return pass == 0 ? itemIcon : icons[Math.max(0, Math.min(icons.length - 1, swigs - getSwigsLeft(stack)))];
}
@Override
public int getColorFromItemStack(ItemStack stack, int pass) {
if(pass == 0)
@@ -36,8 +36,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
private static final String TAG_BREW_KEY = "brewKey";
public static final int TIME_MULTIPLIER = 60;
IIcon[] icons;
public ItemIncenseStick() {
setUnlocalizedName(LibItemNames.INCENSE_STICK);
setMaxStackSize(1);
@@ -53,18 +51,6 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
}
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[2];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return icons[pass];
}
@Override
public int getColorFromItemStack(ItemStack stack, int pass) {
if(pass == 0)
@@ -24,8 +24,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemVial extends ItemMod implements IBrewContainer {
public static IIcon flaskIcon, vialIcon;
public ItemVial() {
this(LibItemNames.VIAL);
}
@@ -35,17 +33,6 @@ public class ItemVial extends ItemMod implements IBrewContainer {
setUnlocalizedName(name);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
vialIcon = IconHelper.forName(par1IconRegister, LibItemNames.VIAL + "0");
flaskIcon = IconHelper.forName(par1IconRegister, LibItemNames.FLASK + "0");
}
@Override
public IIcon getIconFromDamage(int i) {
return i == 0 ? vialIcon : flaskIcon;
}
@Override
public void getSubItems(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < 2; i++)
@@ -14,7 +14,6 @@ import java.util.List;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -74,12 +73,6 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forItem(par1IconRegister, this);
}
@Override
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) {
if(source.isUnblockable())
@@ -44,7 +44,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer {
private static final String TAG_ANCIENT_WILL = "AncientWill";
static IIcon willIcon;
public ItemTerrasteelHelm() {
this(LibItemNames.TERRASTEEL_HELM);
@@ -135,10 +135,6 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp
private static final String TAG_COLOR = "color";
private static final String TAG_COMPOSITE_LENS = "compositeLens";
public static IIcon iconGlass;
IIcon[] ringIcons;
public ItemLens() {
super();
setUnlocalizedName(LibItemNames.LENS);
@@ -171,11 +167,6 @@ public class ItemLens extends ItemMod implements ILensControl, ITinyPlanetExcemp
return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass;
}
@Override
public IIcon getIconFromDamage(int par1) {
return getIconFromDamageForRenderPass(par1, 0);
}
@Override
public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF;
@@ -46,7 +46,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement {
final int types = 23;
IIcon[] icons;
// begin dank_memes
public IIcon tailIcon = null;
@@ -155,12 +154,6 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())];
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public boolean canFit(ItemStack stack, IInventory apothecary) {
int meta = stack.getItemDamage();
@@ -12,11 +12,9 @@ package vazkii.botania.common.item.material;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -26,7 +24,6 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemQuartz extends ItemMod implements IElvenItem {
private static final int SUBTYPES = 7;
IIcon[] icons;
public ItemQuartz() {
setUnlocalizedName(LibItemNames.QUARTZ);
@@ -39,18 +36,6 @@ public class ItemQuartz extends ItemMod implements IElvenItem {
list.add(new ItemStack(item, 1, i));
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[SUBTYPES];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
@@ -12,7 +12,6 @@ package vazkii.botania.common.item.material;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -20,7 +19,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.Achievement;
import net.minecraft.util.IIcon;
import vazkii.botania.api.recipe.IFlowerComponent;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.common.achievement.IPickupAchievement;
@@ -30,26 +28,12 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchievement {
IIcon[] icons;
public ItemRune() {
super();
setHasSubtypes(true);
setUnlocalizedName(LibItemNames.RUNE);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
icons = new IIcon[16];
for(int i = 0; i < icons.length; i++)
icons[i] = IconHelper.forItem(par1IconRegister, this, i);
}
@Override
public IIcon getIconFromDamage(int par1) {
return icons[Math.min(icons.length - 1, par1)];
}
@Override
public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
for(int i = 0; i < 16; i++)
@@ -10,11 +10,9 @@
*/
package vazkii.botania.common.item.relic;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
@@ -27,8 +25,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem {
public static IIcon dasBootIcon;
public ItemInfiniteFruit() {
super(LibItemNames.INFINITE_FRUIT);
}
@@ -64,14 +60,6 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem {
}
}
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
itemIcon = IconHelper.forItem(par1IconRegister, this);
dasBootIcon = IconHelper.forName(par1IconRegister, "dasBoot");
}
@Override
public IIcon getIconIndex(ItemStack par1ItemStack) {
return isBoot(par1ItemStack) ? dasBootIcon : super.getIconIndex(par1ItemStack);
@@ -12,7 +12,6 @@ package vazkii.botania.common.item.rod;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
@@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import vazkii.botania.api.item.IAvatarTile;
@@ -47,8 +45,6 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi
private static final String TAG_FLYING = "flying";
IIcon iconIdle, iconFlying;
public ItemTornadoRod() {
setMaxDamage(MAX_DAMAGE);
setUnlocalizedName(LibItemNames.TORNADO_ROD);
@@ -113,14 +109,9 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi
return isFlying(par1ItemStack) ? iconFlying : iconIdle;
}
@Override
public IIcon getIcon(ItemStack stack, int pass) {
return getIconIndex(stack);
}
@Override
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
return EnumAction.bow;
return EnumAction.BOW;
}
@Override