diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java index df1194152..b5c4f7a12 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java @@ -24,7 +24,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -106,33 +105,14 @@ public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlo return this.isPlacer ? "blockPlacer" : "blockBreaker"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java index 57285b5a2..2a120a94a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -74,33 +73,14 @@ public class BlockCanolaPress extends BlockContainerBase implements IActAddItemO return "blockCanolaPress"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java index 3f8425d69..ea7f4af74 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -91,33 +90,14 @@ public class BlockCoalGenerator extends BlockContainerBase implements IActAddIte return "blockCoalGenerator"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java index e40aafaf6..07ed3f308 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java @@ -24,7 +24,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -116,27 +115,8 @@ public class BlockCoffeeMachine extends BlockContainerBase implements IActAddIte return "blockCoffeeMachine"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java index ed9c15c15..90d7931a6 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java @@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors; +import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; @@ -23,7 +24,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -52,6 +52,11 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ return this.isOn ? "blockColoredLampOn" : "blockColoredLamp"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public IIcon getIcon(int side, int meta){ return meta >= allLampTypes.length ? null : textures[meta]; @@ -132,7 +137,7 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ return this.isOn ? 15 : 0; } - public static class TheItemBlock extends ItemBlock{ + public static class TheItemBlock extends ItemBlockBase{ public TheItemBlock(Block block){ super(block); @@ -155,12 +160,13 @@ public class BlockColoredLamp extends Block implements IActAddItemOrBlock{ @Override public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; + EnumRarity rarity = ((IActAddItemOrBlock)this.field_150939_a).getRarity(stack); + return rarity == null ? EnumRarity.common : rarity; } @Override public String getUnlocalizedName(ItemStack stack){ - return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].getName(); + return InitBlocks.blockColoredLamp.getUnlocalizedName()+allLampTypes[stack.getItemDamage()].name; } } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index a6ac7ca14..f30e32a6a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -26,7 +26,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -143,27 +142,8 @@ public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlo return "blockCompost"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java index bd9b40d3d..2b5157e47 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDirectionalBreaker.java @@ -24,7 +24,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -103,33 +102,14 @@ public class BlockDirectionalBreaker extends BlockContainerBase implements IActA return "blockDirectionalBreaker"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java index 12d3da260..508b29c38 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java @@ -24,7 +24,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -103,33 +102,14 @@ public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlo return "blockDropper"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java index 9aa879f2a..d79593005 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java @@ -23,7 +23,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -87,33 +86,14 @@ public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrB return this.isEnergizer ? "blockEnergizer" : "blockEnervator"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index a7e43a7e1..b4a65dc9f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -74,33 +73,14 @@ public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBloc return "blockFeeder"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java index 1807406ce..1d67b3dfc 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -80,27 +79,8 @@ public class BlockFermentingBarrel extends BlockContainerBase implements IActAdd return "blockFermentingBarrel"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java index cad2041e5..f027772b7 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java @@ -15,12 +15,10 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityFishingNet; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -73,27 +71,8 @@ public class BlockFishingNet extends BlockContainerBase implements IActAddItemOr return "blockFishingNet"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java index 70c6c85ae..7459967b5 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java @@ -24,7 +24,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -106,33 +105,14 @@ public class BlockFluidCollector extends BlockContainerBase implements IActAddIt return this.isPlacer ? "blockFluidPlacer" : "blockFluidCollector"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java index 35edf6a1a..46c28cccf 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java @@ -14,11 +14,9 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -67,27 +65,8 @@ public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemO return this.name; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index 2e8781e09..ded6e3c70 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -23,7 +23,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -163,33 +162,14 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IActAddIte return "blockFurnaceDouble"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java index a264aa895..9259da42d 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java @@ -15,13 +15,11 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; -import net.minecraft.block.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.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -87,27 +85,8 @@ public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItem return "blockFurnaceSolar"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java index 16f3b22ad..be67c0426 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java @@ -18,7 +18,6 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -51,27 +50,8 @@ public class BlockGeneric extends Block implements IActAddItemOrBlock{ return this.name; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.common; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index e9612b84a..54775aa24 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -76,35 +75,14 @@ public class BlockGiantChest extends BlockContainerBase implements IActAddItemOr return "blockGiantChest"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } - - } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java index aa2975802..f838d0d6e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java @@ -15,11 +15,9 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityGreenhouseGlass; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Facing; @@ -76,32 +74,14 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddI return "blockGreenhouseGlass"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityGreenhouseGlass(); } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index bc916fd72..456ae658a 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -113,33 +112,14 @@ public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlo return isDouble ? "blockGrinderDouble" : "blockGrinder"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return ((BlockGrinder)this.field_150939_a).isDouble ? EnumRarity.epic : EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java index 93d8611c6..d8d1648ab 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java @@ -15,12 +15,10 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityHeatCollector; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -75,27 +73,8 @@ public class BlockHeatCollector extends BlockContainerBase implements IActAddIte return "blockHeatCollector"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.uncommon; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java index 5e655d352..cd4d65713 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java @@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.ActuallyAdditions; import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.tile.TileEntityInputter; import ellpeck.actuallyadditions.tile.TileEntityInventoryBase; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; @@ -24,7 +25,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -81,6 +81,11 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl return this.isAdvanced ? "blockInputterAdvanced" : "blockInputter"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ if(!world.isRemote){ @@ -93,7 +98,7 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl super.breakBlock(world, x, y, z, block, par6); } - public static class TheItemBlock extends ItemBlock{ + public static class TheItemBlock extends ItemBlockBase{ private long lastSysTime; private int toPick; @@ -129,7 +134,8 @@ public class BlockInputter extends BlockContainerBase implements IActAddItemOrBl @Override public EnumRarity getRarity(ItemStack stack){ - return ((BlockInputter)this.field_150939_a).isAdvanced ? EnumRarity.epic : EnumRarity.rare; + EnumRarity rarity = ((IActAddItemOrBlock)this.field_150939_a).getRarity(stack); + return rarity == null ? EnumRarity.common : rarity; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java index b27ff11ef..51c30c724 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -89,33 +88,14 @@ public class BlockItemRepairer extends BlockContainerBase implements IActAddItem return "blockItemRepairer"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java index 4a936173f..679a1b89f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -86,6 +85,11 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ return "blockLampPowerer"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + private void updateLamp(World world, int x, int y, int z){ if(!world.isRemote){ WorldPos coords = WorldUtil.getCoordsFromSide(ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z)), world, x, y, z, 0); @@ -103,28 +107,4 @@ public class BlockLampPowerer extends Block implements IActAddItemOrBlock{ } } } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java index 7686d24d6..cb24b1041 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLaserRelay.java @@ -15,12 +15,10 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityLaserRelay; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -72,32 +70,13 @@ public class BlockLaserRelay extends BlockContainerBase implements IActAddItemOr return "blockLaserRelay"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public TileEntity createNewTileEntity(World world, int i){ return new TileEntityLaserRelay(); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java index 0a8cccba1..531428eac 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java @@ -16,12 +16,10 @@ import ellpeck.actuallyadditions.tile.TileEntityLavaFactoryController; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.StringUtil; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -81,27 +79,8 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IA return "blockLavaFactoryController"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java index 5357a60d3..b60cbe6c5 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java @@ -20,7 +20,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -75,33 +74,14 @@ public class BlockLeafGenerator extends BlockContainerBase implements IActAddIte return "blockLeafGenerator"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index e8bfe6ec7..8608cf29f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; +import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.proxy.ClientProxy; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; @@ -22,7 +23,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -68,7 +68,7 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconReg){ for(int i = 0; i < textures.length; i++){ - textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscBlocks[i].getName()); + textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscBlocks[i].name); } this.stoneCasingSeasonalTop = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":blockMiscStoneCasingSnowTop"); @@ -80,7 +80,12 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ return "blockMisc"; } - public static class TheItemBlock extends ItemBlock{ + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allMiscBlocks.length ? EnumRarity.common : allMiscBlocks[stack.getItemDamage()].rarity; + } + + public static class TheItemBlock extends ItemBlockBase{ public TheItemBlock(Block block){ super(block); @@ -90,7 +95,7 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscBlocks.length ? " ERROR!" : allMiscBlocks[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscBlocks.length ? " ERROR!" : allMiscBlocks[stack.getItemDamage()].name); } @Override @@ -100,7 +105,8 @@ public class BlockMisc extends Block implements IActAddItemOrBlock{ @Override public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allMiscBlocks.length ? EnumRarity.common : allMiscBlocks[stack.getItemDamage()].rarity; + EnumRarity rarity = ((IActAddItemOrBlock)this.field_150939_a).getRarity(stack); + return rarity == null ? EnumRarity.common : rarity; } } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java index e76a19e8b..3cb4f3c55 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -91,33 +90,14 @@ public class BlockOilGenerator extends BlockContainerBase implements IActAddItem return "blockOilGenerator"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java index a986bb949..5a0a0332e 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -76,33 +75,14 @@ public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrB return "blockOreMagnet"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.rare; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java index c95be4312..6cc4b063f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java @@ -25,7 +25,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; @@ -144,6 +143,11 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo } } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + public enum Type{ FACE, PLACER, @@ -151,28 +155,4 @@ public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlo LIQUIFACE, ENERGYFACE } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java index 7b4218c1c..f9d37a8b7 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java @@ -15,12 +15,10 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityPhantomBooster; import ellpeck.actuallyadditions.util.AssetUtil; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -70,32 +68,13 @@ public class BlockPhantomBooster extends BlockContainerBase implements IActAddIt return "blockPhantomBooster"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public TileEntity createNewTileEntity(World world, int i){ return new TileEntityPhantomBooster(); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java index 808cc0726..37cfd1176 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java @@ -14,12 +14,10 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.ModUtil; -import net.minecraft.block.Block; import net.minecraft.block.BlockCrops; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -92,6 +90,11 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ return this.name; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; + } + @Override public int damageDropped(int meta){ return this.returnMeta; @@ -106,28 +109,4 @@ public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{ public int quantityDropped(int meta, int fortune, Random random){ return meta >= 7 ? random.nextInt(addDropAmount)+minDropAmount : super.quantityDropped(meta, fortune, random); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java index 6817d4da0..7f8de83d2 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockRangedCollector.java @@ -22,7 +22,6 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -71,6 +70,11 @@ public class BlockRangedCollector extends BlockContainerBase implements IActAddI return "blockRangedCollector"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ if(!world.isRemote){ @@ -84,28 +88,4 @@ public class BlockRangedCollector extends BlockContainerBase implements IActAddI } super.breakBlock(world, x, y, z, block, par6); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java index 9082cc59b..f5dca8da0 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java @@ -17,9 +17,7 @@ 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.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; @@ -98,39 +96,8 @@ public class BlockSlabs extends Block implements IActAddItemOrBlock{ return this.name; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } - - @Override - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ){ - if(world.getBlock(x, y, z) == this.field_150939_a && ((side == 1 && world.getBlockMetadata(x, y, z) == 0) || (side == 0 && world.getBlockMetadata(x, y, z) == 1))){ - if(world.setBlock(x, y, z, ((BlockSlabs)this.field_150939_a).fullBlock, 0, 3)){ - world.playSoundEffect(x+0.5F, y+0.5F, z+0.5F, this.field_150939_a.stepSound.getBreakSound(), (this.field_150939_a.stepSound.getVolume()+1.0F)/2.0F, this.field_150939_a.stepSound.getPitch()*0.8F); - stack.stackSize--; - return true; - } - } - return super.onItemUse(stack, player, world, x, y, z, side, hitX, hitY, hitZ); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.common; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java index 705993cab..bbae639d8 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java @@ -24,7 +24,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -131,27 +130,8 @@ public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemO return "blockSmileyCloud"; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.rare; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java index b50094084..00b6d8b92 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java @@ -14,7 +14,6 @@ import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; public class BlockStair extends BlockStairs implements IActAddItemOrBlock{ @@ -32,27 +31,8 @@ public class BlockStair extends BlockStairs implements IActAddItemOrBlock{ return this.name; } - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int meta){ - return meta; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.uncommon; - } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.common; } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java index 93946ab2e..0872cfbc9 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java @@ -24,7 +24,6 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; @@ -144,6 +143,11 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ return "blockTreasureChest"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + private void dropItems(World world, int x, int y, int z){ Random rand = new Random(); for(int i = 0; i < MathHelper.getRandomIntegerInRange(rand, 3, 6); i++){ @@ -166,28 +170,4 @@ public class BlockTreasureChest extends Block implements IActAddItemOrBlock{ itemStack.stackSize = 0; } } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java index 2120a9416..c8e59800f 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java @@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.blocks.metalists.TheWildPlants; +import ellpeck.actuallyadditions.items.ItemBlockBase; import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockBush; @@ -21,7 +22,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; @@ -85,7 +85,12 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ return "blockWild"; } - public static class TheItemBlock extends ItemBlock{ + @Override + public EnumRarity getRarity(ItemStack stack){ + return stack.getItemDamage() >= allWildPlants.length ? EnumRarity.common : allWildPlants[stack.getItemDamage()].rarity; + } + + public static class TheItemBlock extends ItemBlockBase{ public TheItemBlock(Block block){ super(block); @@ -100,7 +105,8 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ @Override public EnumRarity getRarity(ItemStack stack){ - return stack.getItemDamage() >= allWildPlants.length ? EnumRarity.common : allWildPlants[stack.getItemDamage()].rarity; + EnumRarity rarity = ((IActAddItemOrBlock)this.field_150939_a).getRarity(stack); + return rarity == null ? EnumRarity.common : rarity; } @SideOnly(Side.CLIENT) @@ -111,8 +117,7 @@ public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allWildPlants.length ? " ERROR!" : allWildPlants[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allWildPlants.length ? " ERROR!" : allWildPlants[stack.getItemDamage()].name); } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java index 32278784b..b8e5a4feb 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java @@ -26,7 +26,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -118,6 +117,11 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem return "blockXPSolidifier"; } + @Override + public EnumRarity getRarity(ItemStack stack){ + return EnumRarity.epic; + } + @Override public void breakBlock(World world, int x, int y, int z, Block block, int par6){ this.dropInventory(world, x, y, z); @@ -149,28 +153,4 @@ public class BlockXPSolidifier extends BlockContainerBase implements IActAddItem entityItem.motionZ = world.rand.nextGaussian()*factor; world.spawnEntityInWorld(entityItem); } - - public static class TheItemBlock extends ItemBlock{ - - public TheItemBlock(Block block){ - super(block); - this.setHasSubtypes(false); - this.setMaxDamage(0); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - public int getMetadata(int damage){ - return damage; - } - - @Override - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.epic; - } - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java index 5957b6520..dc08c5274 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java @@ -142,9 +142,9 @@ public class InitBlocks{ BlockUtil.register(blockTestifiBucksWhiteSlab); blockColoredLamp = new BlockColoredLamp(false); - BlockUtil.register(blockColoredLamp); + BlockUtil.register(blockColoredLamp, BlockColoredLamp.TheItemBlock.class); blockColoredLampOn = new BlockColoredLamp(true); - BlockUtil.register(blockColoredLampOn); + BlockUtil.register(blockColoredLampOn, BlockColoredLamp.TheItemBlock.class); blockLampPowerer = new BlockLampPowerer(); BlockUtil.register(blockLampPowerer); @@ -207,7 +207,7 @@ public class InitBlocks{ BlockUtil.register(blockCompost); blockMisc = new BlockMisc(); - BlockUtil.register(blockMisc); + BlockUtil.register(blockMisc, BlockMisc.TheItemBlock.class); blockFeeder = new BlockFeeder(); BlockUtil.register(blockFeeder); @@ -225,10 +225,10 @@ public class InitBlocks{ BlockUtil.register(blockFurnaceDouble); blockInputter = new BlockInputter(false); - BlockUtil.register(blockInputter); + BlockUtil.register(blockInputter, BlockInputter.TheItemBlock.class); blockInputterAdvanced = new BlockInputter(true); - BlockUtil.register(blockInputterAdvanced); + BlockUtil.register(blockInputterAdvanced, BlockInputter.TheItemBlock.class); blockFishingNet = new BlockFishingNet(); BlockUtil.register(blockFishingNet); @@ -267,7 +267,7 @@ public class InitBlocks{ BlockUtil.register(blockPhantomBooster); blockWildPlant = new BlockWildPlant(); - BlockUtil.register(blockWildPlant, false); + BlockUtil.register(blockWildPlant, BlockWildPlant.TheItemBlock.class, false); registerFluids(); } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java index 49551e2bf..7d7f05761 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java @@ -10,9 +10,7 @@ package ellpeck.actuallyadditions.blocks.metalists; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; - -public enum TheColoredLampColors implements IActAddItemOrBlock{ +public enum TheColoredLampColors{ WHITE("White"), ORANGE("Orange"), @@ -41,16 +39,11 @@ public enum TheColoredLampColors implements IActAddItemOrBlock{ if(color.substring(0, 3).equals("dye")){ String actualName = color.substring(3); for(int i = 0; i < values().length; i++){ - if(values()[i].getName().equals(actualName)){ + if(values()[i].name.equals(actualName)){ return values()[i]; } } } return null; } - - @Override - public String getName(){ - return name; - } } diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java index be6c7f8ea..1b244afd4 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java @@ -10,10 +10,9 @@ package ellpeck.actuallyadditions.blocks.metalists; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.item.EnumRarity; -public enum TheMiscBlocks implements IActAddItemOrBlock{ +public enum TheMiscBlocks{ QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.rare), QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.rare), @@ -33,9 +32,4 @@ public enum TheMiscBlocks implements IActAddItemOrBlock{ this.name = name; this.rarity = rarity; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java index a41b42287..b8d00b392 100644 --- a/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java @@ -11,11 +11,10 @@ package ellpeck.actuallyadditions.blocks.metalists; import ellpeck.actuallyadditions.blocks.InitBlocks; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; -public enum TheWildPlants implements IActAddItemOrBlock{ +public enum TheWildPlants{ CANOLA("Canola", EnumRarity.rare, InitBlocks.blockCanola), FLAX("Flax", EnumRarity.rare, InitBlocks.blockFlax), @@ -31,9 +30,4 @@ public enum TheWildPlants implements IActAddItemOrBlock{ this.rarity = rarity; this.wildVersionOf = wildVersionOf; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemBlockBase.java b/src/main/java/ellpeck/actuallyadditions/items/ItemBlockBase.java new file mode 100644 index 000000000..42ad445ce --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemBlockBase.java @@ -0,0 +1,42 @@ +/* + * This file ("ItemBlockBase.java") is part of the Actually Additions Mod for Minecraft. + * It is created and owned by Ellpeck and distributed + * under the Actually Additions License to be found at + * http://github.com/Ellpeck/ActuallyAdditions/blob/master/README.md + * View the source code at https://github.com/Ellpeck/ActuallyAdditions + * + * © 2015 Ellpeck + */ + +package ellpeck.actuallyadditions.items; + +import ellpeck.actuallyadditions.util.IActAddItemOrBlock; +import net.minecraft.block.Block; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBlockBase extends ItemBlock{ + + public ItemBlockBase(Block block){ + super(block); + this.setHasSubtypes(false); + this.setMaxDamage(0); + } + + @Override + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName(); + } + + @Override + public int getMetadata(int damage){ + return damage; + } + + @Override + public EnumRarity getRarity(ItemStack stack){ + EnumRarity rarity = ((IActAddItemOrBlock)this.field_150939_a).getRarity(stack); + return rarity == null ? EnumRarity.common : rarity; + } +} diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java b/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java index a769fc155..cb58a1ead 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemChestToCrateUpgrade.java @@ -94,4 +94,5 @@ public class ItemChestToCrateUpgrade extends Item implements IActAddItemOrBlock{ public String getName(){ return "itemChestToCrateUpgrade"; } + } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java index 7731f2d7c..4f0eaf00b 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java @@ -39,7 +39,7 @@ public class ItemDust extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allDusts.length ? " ERROR!" : allDusts[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allDusts.length ? " ERROR!" : allDusts[stack.getItemDamage()].name); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java index 457f3dfe2..f2b4608cf 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java @@ -85,7 +85,7 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allFoods.length ? " ERROR!" : allFoods[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allFoods.length ? " ERROR!" : allFoods[stack.getItemDamage()].name); } @Override @@ -105,7 +105,7 @@ public class ItemFoods extends ItemFood implements IActAddItemOrBlock{ @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ for(int i = 0; i < textures.length; i++){ - textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allFoods[i].getName()); + textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allFoods[i].name); } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java index c2a94e942..0206b62ec 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemJams.java @@ -48,7 +48,7 @@ public class ItemJams extends ItemFood implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allJams.length ? " ERROR!" : allJams[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allJams.length ? " ERROR!" : allJams[stack.getItemDamage()].name); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java index 6216af189..703ec328b 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java @@ -45,7 +45,7 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscItems.length ? " ERROR!" : allMiscItems[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allMiscItems.length ? " ERROR!" : allMiscItems[stack.getItemDamage()].name); } @Override @@ -65,7 +65,7 @@ public class ItemMisc extends Item implements IActAddItemOrBlock{ @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ for(int i = 0; i < textures.length; i++){ - textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscItems[i].getName()); + textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allMiscItems[i].name); } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java index 8fd3ae0ba..f1c93079f 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java @@ -48,7 +48,7 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allRings.length ? " ERROR!" : allRings[stack.getItemDamage()].getName().substring("potion".length())); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allRings.length ? " ERROR!" : allRings[stack.getItemDamage()].name.substring("potion".length())); } @Override @@ -86,7 +86,7 @@ public class ItemPotionRing extends Item implements IActAddItemOrBlock{ public String getItemStackDisplayName(ItemStack stack){ String standardName = StringUtil.localize(this.getUnlocalizedName()+".name"); if(stack.getItemDamage() < allRings.length){ - String effect = StringUtil.localize(allRings[stack.getItemDamage()].getName()); + String effect = StringUtil.localize(allRings[stack.getItemDamage()].name); return standardName+" "+effect; } return standardName; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java index cf6beea09..b5904d646 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java @@ -71,7 +71,7 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ @Override public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName()+(stack.getItemDamage() >= allDrops.length ? " ERROR!" : allDrops[stack.getItemDamage()].getName()); + return this.getUnlocalizedName()+(stack.getItemDamage() >= allDrops.length ? " ERROR!" : allDrops[stack.getItemDamage()].name); } @Override @@ -91,7 +91,7 @@ public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{ @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ for(int i = 0; i < textures.length; i++){ - textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allDrops[i].getName()); + textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getName()+allDrops[i].name); } } diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java index 3a0ccab18..01ff4a5fb 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java @@ -10,11 +10,10 @@ package ellpeck.actuallyadditions.items.metalists; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import ellpeck.actuallyadditions.util.StringUtil; import net.minecraft.item.EnumRarity; -public enum TheDusts implements IActAddItemOrBlock{ +public enum TheDusts{ IRON("Iron", 7826534, EnumRarity.common), GOLD("Gold", 14335744, EnumRarity.uncommon), @@ -35,8 +34,5 @@ public enum TheDusts implements IActAddItemOrBlock{ this.rarity = rarity; } - @Override - public String getName(){ - return this.name; - } + } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java index 19e187278..16e85941e 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java @@ -11,12 +11,11 @@ package ellpeck.actuallyadditions.items.metalists; import ellpeck.actuallyadditions.items.InitItems; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -public enum TheFoods implements IActAddItemOrBlock{ +public enum TheFoods{ CHEESE("Cheese", 1, 0.5F, false, 3, EnumRarity.common), PUMPKIN_STEW("PumpkinStew", 10, 1F, true, 30, EnumRarity.common), @@ -62,9 +61,4 @@ public enum TheFoods implements IActAddItemOrBlock{ FRENCH_FRIES.returnItem = new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()); FISH_N_CHIPS.returnItem = new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()); } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheJams.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheJams.java index e803c1801..e7d239946 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheJams.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheJams.java @@ -10,10 +10,9 @@ package ellpeck.actuallyadditions.items.metalists; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.item.EnumRarity; -public enum TheJams implements IActAddItemOrBlock{ +public enum TheJams{ CU_BA_RA("CuBaRa", 6, 0.1F, EnumRarity.rare, 5, 12, 12595273), GRA_KI_BA("GraKiBa", 6, 0.1F, EnumRarity.rare, 16, 13, 5492820), @@ -39,9 +38,4 @@ public enum TheJams implements IActAddItemOrBlock{ this.secondEffectToGet = secondEffectID; this.color = color; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java index a221e606c..2a99be29b 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java @@ -10,10 +10,9 @@ package ellpeck.actuallyadditions.items.metalists; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.item.EnumRarity; -public enum TheMiscItems implements IActAddItemOrBlock{ +public enum TheMiscItems{ PAPER_CONE("PaperCone", EnumRarity.common), MASHED_FOOD("MashedFood", EnumRarity.uncommon), @@ -39,9 +38,4 @@ public enum TheMiscItems implements IActAddItemOrBlock{ this.name = name; this.rarity = rarity; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java index e067e8061..0a60fd404 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java @@ -10,14 +10,13 @@ package ellpeck.actuallyadditions.items.metalists; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -public enum ThePotionRings implements IActAddItemOrBlock{ +public enum ThePotionRings{ SPEED(Potion.moveSpeed.getName(), 8171462, Potion.moveSpeed.getId(), 0, 1, 10, false, EnumRarity.uncommon, new ItemStack(Items.sugar)), //Slowness @@ -63,9 +62,4 @@ public enum ThePotionRings implements IActAddItemOrBlock{ this.needsWaitBeforeActivating = needsWaitBeforeActivating; this.craftingItem = craftingItem; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java index 0e2db16ef..16f26480a 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java @@ -11,14 +11,13 @@ package ellpeck.actuallyadditions.items.metalists; import ellpeck.actuallyadditions.config.values.ConfigBoolValues; -import ellpeck.actuallyadditions.util.IActAddItemOrBlock; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.item.EnumRarity; -public enum TheSpecialDrops implements IActAddItemOrBlock{ +public enum TheSpecialDrops{ SOLIDIFIED_EXPERIENCE("SolidifiedExperience", 40, 3, EntityCreature.class, EnumRarity.uncommon, ConfigBoolValues.EXPERIENCE_DROP.isEnabled()), BLOOD_FRAGMENT("BloodFragment", 15, 1, EntityCreature.class, EnumRarity.uncommon, ConfigBoolValues.BLOOD_DROP.isEnabled()), @@ -42,9 +41,4 @@ public enum TheSpecialDrops implements IActAddItemOrBlock{ this.dropFrom = dropFrom; this.canDrop = canDrop; } - - @Override - public String getName(){ - return this.name; - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java index 7b098ac12..9e660a51d 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java @@ -12,27 +12,28 @@ package ellpeck.actuallyadditions.util; import cpw.mods.fml.common.registry.GameRegistry; import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.items.ItemBlockBase; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; public class BlockUtil{ - @SuppressWarnings("unchecked") - public static void register(Block block){ - register(block, true); + public static void register(Block block, Class itemBlock){ + register(block, itemBlock, true); + } + + public static void register(Block block){ + register(block, ItemBlockBase.class, true); } - @SuppressWarnings("unchecked") public static void register(Block block, boolean addTab){ + register(block, ItemBlockBase.class, addTab); + } + + public static void register(Block block, Class itemBlock, boolean addTab){ block.setCreativeTab(addTab ? CreativeTab.instance : null); block.setBlockName(createUnlocalizedName(block)); - - for(Class sub : block.getClass().getDeclaredClasses()){ - if(sub.getSuperclass() == ItemBlock.class){ - GameRegistry.registerBlock(block, sub, ((IActAddItemOrBlock)block).getName()); - break; - } - } + GameRegistry.registerBlock(block, itemBlock, ((IActAddItemOrBlock)block).getName()); } public static String createUnlocalizedName(Block block){ diff --git a/src/main/java/ellpeck/actuallyadditions/util/IActAddItemOrBlock.java b/src/main/java/ellpeck/actuallyadditions/util/IActAddItemOrBlock.java index e4544484c..827e96dd1 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/IActAddItemOrBlock.java +++ b/src/main/java/ellpeck/actuallyadditions/util/IActAddItemOrBlock.java @@ -10,6 +10,9 @@ package ellpeck.actuallyadditions.util; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; + /** * The indicator interface for any block or item that is part of ActuallyAdditions */ @@ -17,4 +20,6 @@ public interface IActAddItemOrBlock{ String getName(); + EnumRarity getRarity(ItemStack stack); + }