1.7 Update - NO-OP out some registerIcons calls for blocks/items that don't use it.

This commit is contained in:
Vasco Lavos committed 2014-03-29 21:38:13 +00:00
1 parent 96ea48430e
commit 1edc4a0dc3
5 files changed
+30

No files matched your search

@@ -15,6 +15,7 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -48,6 +49,11 @@ public class BlockAltar extends BlockModContainer implements ILexiconable {
random = new Random();
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) {
@@ -14,6 +14,7 @@ package vazkii.botania.common.block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -40,6 +41,11 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable,
setBlockName(LibBlockNames.POOL);
setBlockBounds(0F, 0F, 0F, 1F, 0.5F, 1F);
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public TileEntity createNewTileEntity(World world, int meta) {
@@ -12,6 +12,7 @@
package vazkii.botania.common.block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
@@ -36,6 +37,11 @@ public class BlockPylon extends BlockModContainer implements ILexiconable {
float f = 1F / 16F * 2F;
setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 21F, 1F - f);
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public IIcon getIcon(int par1, int par2) {
@@ -18,6 +18,7 @@ import net.minecraft.block.BlockPistonBase;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -51,6 +52,11 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand
random = new Random();
}
@Override
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) {
int orientation = BlockPistonBase.determineOrientation(par1World, par2, par3, par4, par5EntityLivingBase);
@@ -11,6 +11,7 @@
*/
package vazkii.botania.common.item;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
@@ -22,6 +23,11 @@ public class ItemManaPetal extends Item16Colors implements IFlowerComponent {
public ItemManaPetal() {
super(LibItemNames.MANA_PETAL);
}
@Override
public void registerIcons(IIconRegister par1IconRegister) {
// NO-OP
}
@Override
public boolean hasEffect(ItemStack par1ItemStack, int pass) {