Renamed INameableItem to IActAddItemOrBlock just because

src/main/java/ellpeck/actuallyadditions/blocks/BlockBreaker.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityBreaker;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
@@ -31,7 +31,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockBreaker extends BlockContainerBase implements INameableItem{
+public class BlockBreaker extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon frontIcon;
     private IIcon topIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockCanolaPress.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityCanolaPress;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -28,7 +28,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockCanolaPress extends BlockContainerBase implements INameableItem{
+public class BlockCanolaPress extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockCoalGenerator.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityCoalGenerator;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockCoalGenerator extends BlockContainerBase implements INameableItem{
+public class BlockCoalGenerator extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java

@@ -16,7 +16,7 @@ import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -31,7 +31,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-public class BlockCoffeeMachine extends BlockContainerBase implements INameableItem{
+public class BlockCoffeeMachine extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockCoffeeMachine(){
         super(Material.rock);

src/main/java/ellpeck/actuallyadditions/blocks/BlockColoredLamp.java

@@ -13,7 +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.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.block.Block;
@@ -33,7 +33,7 @@ import net.minecraftforge.oredict.OreDictionary;
 import java.util.List;
 import java.util.Random;
 
-public class BlockColoredLamp extends Block implements INameableItem{
+public class BlockColoredLamp extends Block implements IActAddItemOrBlock{
 
     public static TheColoredLampColors[] allLampTypes = TheColoredLampColors.values();
 
@@ -128,7 +128,7 @@ public class BlockColoredLamp extends Block implements INameableItem{
     @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister iconReg){
         for(int i = 0; i < allLampTypes.length; i++){
-            this.textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + ((INameableItem)InitBlocks.blockColoredLamp).getName() + allLampTypes[i].name + (isOn ? "On" : ""));
+            this.textures[i] = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + ((IActAddItemOrBlock)InitBlocks.blockColoredLamp).getName() + allLampTypes[i].name + (isOn ? "On" : ""));
         }
     }
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java

@@ -18,7 +18,7 @@ import ellpeck.actuallyadditions.items.ItemMisc;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
 import ellpeck.actuallyadditions.tile.TileEntityCompost;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -35,7 +35,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public class BlockCompost extends BlockContainerBase implements INameableItem{
+public class BlockCompost extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockCompost(){
         super(Material.wood);

src/main/java/ellpeck/actuallyadditions/blocks/BlockDropper.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityDropper;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
@@ -31,7 +31,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockDropper extends BlockContainerBase implements INameableItem{
+public class BlockDropper extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon frontIcon;
     private IIcon topIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockEnergizer.java

@@ -16,7 +16,7 @@ import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityEnergizer;
 import ellpeck.actuallyadditions.tile.TileEntityEnervator;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -29,7 +29,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockEnergizer extends BlockContainerBase implements INameableItem{
+public class BlockEnergizer extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon sideIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityFeeder;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -28,7 +28,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockFeeder extends BlockContainerBase implements INameableItem{
+public class BlockFeeder extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockFermentingBarrel.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -28,7 +28,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockFermentingBarrel extends BlockContainerBase implements INameableItem{
+public class BlockFermentingBarrel extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon iconTop;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java

@@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityFishingNet;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,7 +26,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockFishingNet extends BlockContainerBase implements INameableItem{
+public class BlockFishingNet extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockFishingNet(){
         super(Material.wood);

src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidCollector.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityFluidCollector;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
@@ -31,7 +31,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockFluidCollector extends BlockContainerBase implements INameableItem{
+public class BlockFluidCollector extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon frontIcon;
     private IIcon topIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockFluidFlowing.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -26,7 +26,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidClassic;
 import net.minecraftforge.fluids.Fluid;
 
-public class BlockFluidFlowing extends BlockFluidClassic implements INameableItem{
+public class BlockFluidFlowing extends BlockFluidClassic implements IActAddItemOrBlock{
 
     private String name;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -33,7 +33,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockFurnaceDouble extends BlockContainerBase implements INameableItem{
+public class BlockFurnaceDouble extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon onIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java

@@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,7 +26,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockFurnaceSolar extends BlockContainerBase implements INameableItem{
+public class BlockFurnaceSolar extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockFurnaceSolar(){
         super(Material.rock);

src/main/java/ellpeck/actuallyadditions/blocks/BlockGeneric.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -22,7 +22,7 @@ import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class BlockGeneric extends Block implements INameableItem{
+public class BlockGeneric extends Block implements IActAddItemOrBlock{
 
     public String name;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityGiantChest;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -28,7 +28,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockGiantChest extends BlockContainerBase implements INameableItem{
+public class BlockGiantChest extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockGreenhouseGlass.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityGreenhouseGlass;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -27,7 +27,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockGreenhouseGlass extends BlockContainerBase implements INameableItem{
+public class BlockGreenhouseGlass extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockGreenhouseGlass(){
         super(Material.rock);

src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityGrinder;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -31,7 +31,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockGrinder extends BlockContainerBase implements INameableItem{
+public class BlockGrinder extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon onIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockHeatCollector.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityHeatCollector;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -25,7 +25,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockHeatCollector extends BlockContainerBase implements INameableItem{
+public class BlockHeatCollector extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockInputter.java

@@ -16,7 +16,7 @@ import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityInputter;
 import ellpeck.actuallyadditions.tile.TileEntityInventoryBase;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.block.Block;
@@ -32,7 +32,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockInputter extends BlockContainerBase implements INameableItem{
+public class BlockInputter extends BlockContainerBase implements IActAddItemOrBlock{
 
     public static final int NAME_FLAVOUR_AMOUNTS = 15;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockItemRepairer.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityItemRepairer;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -29,7 +29,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockItemRepairer extends BlockContainerBase implements INameableItem{
+public class BlockItemRepairer extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockLampPowerer.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.WorldPos;
 import ellpeck.actuallyadditions.util.WorldUtil;
@@ -29,7 +29,7 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockLampPowerer extends Block implements INameableItem{
+public class BlockLampPowerer extends Block implements IActAddItemOrBlock{
 
     private IIcon frontIcon;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockLavaFactoryController.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityLavaFactoryController;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.block.Block;
@@ -28,7 +28,7 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockLavaFactoryController extends BlockContainerBase implements INameableItem{
+public class BlockLavaFactoryController extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockLeafGenerator.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.blocks;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityLeafGenerator;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -29,7 +29,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockLeafGenerator extends BlockContainerBase implements INameableItem{
+public class BlockLeafGenerator extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java

@@ -13,7 +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.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -27,7 +27,7 @@ import net.minecraft.util.IIcon;
 
 import java.util.List;
 
-public class BlockMisc extends Block implements INameableItem{
+public class BlockMisc extends Block implements IActAddItemOrBlock{
 
     public static final TheMiscBlocks[] allMiscBlocks = TheMiscBlocks.values();
     public IIcon[] textures = new IIcon[allMiscBlocks.length];

src/main/java/ellpeck/actuallyadditions/blocks/BlockOilGenerator.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityOilGenerator;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockOilGenerator extends BlockContainerBase implements INameableItem{
+public class BlockOilGenerator extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockOreMagnet.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntityOreMagnet;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -28,7 +28,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockOreMagnet extends BlockContainerBase implements INameableItem{
+public class BlockOreMagnet extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantom.java

@@ -17,7 +17,7 @@ import ellpeck.actuallyadditions.config.values.ConfigIntValues;
 import ellpeck.actuallyadditions.tile.IPhantomTile;
 import ellpeck.actuallyadditions.tile.TileEntityPhantomPlacer;
 import ellpeck.actuallyadditions.tile.TileEntityPhantomface;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.block.Block;
@@ -34,7 +34,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
-public class BlockPhantom extends BlockContainerBase implements INameableItem{
+public class BlockPhantom extends BlockContainerBase implements IActAddItemOrBlock{
 
     public enum Type{
         FACE,

src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java

@@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.TileEntityPhantomBooster;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -26,7 +26,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockPhantomBooster extends BlockContainerBase implements INameableItem{
+public class BlockPhantomBooster extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockPhantomBooster(){
         super(Material.rock);

src/main/java/ellpeck/actuallyadditions/blocks/BlockPlant.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockCrops;
@@ -28,7 +28,7 @@ import net.minecraftforge.common.EnumPlantType;
 
 import java.util.Random;
 
-public class BlockPlant extends BlockCrops implements INameableItem{
+public class BlockPlant extends BlockCrops implements IActAddItemOrBlock{
 
     private IIcon[] textures;
     private String name;

src/main/java/ellpeck/actuallyadditions/blocks/BlockSlabs.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -28,7 +28,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public class BlockSlabs extends Block implements INameableItem{
+public class BlockSlabs extends Block implements IActAddItemOrBlock{
 
     private String name;
     private Block fullBlock;

src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java

@@ -16,7 +16,7 @@ import ellpeck.actuallyadditions.ActuallyAdditions;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
 import ellpeck.actuallyadditions.util.AssetUtil;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -32,7 +32,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockSmileyCloud extends BlockContainerBase implements INameableItem{
+public class BlockSmileyCloud extends BlockContainerBase implements IActAddItemOrBlock{
 
     public BlockSmileyCloud(){
         super(Material.cloth);

src/main/java/ellpeck/actuallyadditions/blocks/BlockStair.java

@@ -10,14 +10,14 @@
 
 package ellpeck.actuallyadditions.blocks;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+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 INameableItem{
+public class BlockStair extends BlockStairs implements IActAddItemOrBlock{
 
     private String name;
 

src/main/java/ellpeck/actuallyadditions/blocks/BlockTreasureChest.java

@@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.achievement.TheAchievements;
 import ellpeck.actuallyadditions.recipe.TreasureChestHandler;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -35,7 +35,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class BlockTreasureChest extends Block implements INameableItem{
+public class BlockTreasureChest extends Block implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon bottomIcon;

src/main/java/ellpeck/actuallyadditions/blocks/BlockWildPlant.java

@@ -13,7 +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.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
 import net.minecraft.block.material.Material;
@@ -30,7 +30,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import java.util.ArrayList;
 import java.util.List;
 
-public class BlockWildPlant extends BlockBush implements INameableItem{
+public class BlockWildPlant extends BlockBush implements IActAddItemOrBlock{
 
     public static final TheWildPlants[] allWildPlants = TheWildPlants.values();
     public IIcon[] textures = new IIcon[allWildPlants.length];

src/main/java/ellpeck/actuallyadditions/blocks/BlockXPSolidifier.java

@@ -17,7 +17,7 @@ import ellpeck.actuallyadditions.inventory.GuiHandler;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
 import ellpeck.actuallyadditions.tile.TileEntityXPSolidifier;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -34,7 +34,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockXPSolidifier extends BlockContainerBase implements INameableItem{
+public class BlockXPSolidifier extends BlockContainerBase implements IActAddItemOrBlock{
 
     private IIcon topIcon;
     private IIcon frontIcon;

src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheColoredLampColors.java

@@ -10,9 +10,9 @@
 
 package ellpeck.actuallyadditions.blocks.metalists;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 
-public enum TheColoredLampColors implements INameableItem{
+public enum TheColoredLampColors implements IActAddItemOrBlock{
 
     WHITE("White"),
     ORANGE("Orange"),

src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java

@@ -10,10 +10,10 @@
 
 package ellpeck.actuallyadditions.blocks.metalists;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.item.EnumRarity;
 
-public enum TheMiscBlocks implements INameableItem{
+public enum TheMiscBlocks implements IActAddItemOrBlock{
 
     QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.rare),
     QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.rare),

src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheWildPlants.java

@@ -11,11 +11,11 @@
 package ellpeck.actuallyadditions.blocks.metalists;
 
 import ellpeck.actuallyadditions.blocks.InitBlocks;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.block.Block;
 import net.minecraft.item.EnumRarity;
 
-public enum TheWildPlants implements INameableItem{
+public enum TheWildPlants implements IActAddItemOrBlock{
 
     CANOLA("Canola", EnumRarity.rare, InitBlocks.blockCanola),
     FLAX("Flax", EnumRarity.rare, InitBlocks.blockFlax),

src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java

@@ -16,7 +16,7 @@ import ellpeck.actuallyadditions.achievement.InitAchievements;
 import ellpeck.actuallyadditions.achievement.TheAchievements;
 import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
 import ellpeck.actuallyadditions.items.InitItems;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.playerdata.PersistentServerData;
 import net.minecraft.block.Block;
 import net.minecraft.entity.item.EntityItem;
@@ -30,7 +30,7 @@ public class CraftEvent{
         checkAchievements(event.crafting, event.player, InitAchievements.CRAFTING_ACH);
 
         if(ConfigBoolValues.GIVE_BOOKLET_ON_FIRST_CRAFT.isEnabled()){
-            if(!event.player.worldObj.isRemote && event.crafting.getItem() != InitItems.itemLexicon && (event.crafting.getItem() instanceof INameableItem || Block.getBlockFromItem(event.crafting.getItem()) instanceof INameableItem)){
+            if(!event.player.worldObj.isRemote && event.crafting.getItem() != InitItems.itemLexicon && (event.crafting.getItem() instanceof IActAddItemOrBlock || Block.getBlockFromItem(event.crafting.getItem()) instanceof IActAddItemOrBlock)){
                 PersistentServerData data = PersistentServerData.get(event.player);
                 if(data != null && !data.bookGottenAlready){
                     data.bookGottenAlready = true;

src/main/java/ellpeck/actuallyadditions/items/ItemArmorAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class ItemArmorAA extends ItemArmor implements INameableItem{
+public class ItemArmorAA extends ItemArmor implements IActAddItemOrBlock{
 
     private String repairItem;
     private String name;

src/main/java/ellpeck/actuallyadditions/items/ItemBattery.java

@@ -12,14 +12,13 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class ItemBattery extends ItemEnergy implements INameableItem{
+public class ItemBattery extends ItemEnergy{
 
     private String name;
 

src/main/java/ellpeck/actuallyadditions/items/ItemBooklet.java

@@ -14,7 +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.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class ItemBooklet extends Item implements INameableItem{
+public class ItemBooklet extends Item implements IActAddItemOrBlock{
 
     public ItemBooklet(){
         this.setMaxStackSize(1);

src/main/java/ellpeck/actuallyadditions/items/ItemBucketAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -22,7 +22,7 @@ import net.minecraft.item.ItemBucket;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class ItemBucketAA extends ItemBucket implements INameableItem{
+public class ItemBucketAA extends ItemBucket implements IActAddItemOrBlock{
 
     private String name;
 

src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ItemUtil;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
@@ -33,7 +33,7 @@ import net.minecraft.world.World;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ItemCoffee extends ItemFood implements INameableItem{
+public class ItemCoffee extends ItemFood implements IActAddItemOrBlock{
 
     public static ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
 

src/main/java/ellpeck/actuallyadditions/items/ItemCoffeeBean.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
@@ -20,7 +20,7 @@ import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class ItemCoffeeBean extends ItemFood implements INameableItem{
+public class ItemCoffeeBean extends ItemFood implements IActAddItemOrBlock{
 
     public ItemCoffeeBean(){
         super(1, 1F, false);

src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java

@@ -14,7 +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.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -24,7 +24,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class ItemCrafterOnAStick extends Item implements INameableItem{
+public class ItemCrafterOnAStick extends Item implements IActAddItemOrBlock{
 
     public ItemCrafterOnAStick(){
         this.setMaxStackSize(1);

src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java

@@ -19,7 +19,6 @@ import ellpeck.actuallyadditions.config.ConfigValues;
 import ellpeck.actuallyadditions.config.values.ConfigFloatValues;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
 import ellpeck.actuallyadditions.inventory.GuiHandler;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.ItemUtil;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.WorldUtil;
@@ -47,7 +46,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 @SuppressWarnings("unchecked")
-public class ItemDrill extends ItemEnergy implements INameableItem{
+public class ItemDrill extends ItemEnergy{
 
     public ItemDrill(){
         super(500000, 5000);

src/main/java/ellpeck/actuallyadditions/items/ItemDrillUpgrade.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,7 +22,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class ItemDrillUpgrade extends Item implements INameableItem{
+public class ItemDrillUpgrade extends Item implements IActAddItemOrBlock{
 
     public enum UpgradeType{
         SPEED,

src/main/java/ellpeck/actuallyadditions/items/ItemDust.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.items.metalists.TheDusts;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -24,7 +24,7 @@ import net.minecraft.util.IIcon;
 
 import java.util.List;
 
-public class ItemDust extends Item implements INameableItem{
+public class ItemDust extends Item implements IActAddItemOrBlock{
 
     public static final TheDusts[] allDusts = TheDusts.values();
 

src/main/java/ellpeck/actuallyadditions/items/ItemEnergy.java

@@ -13,6 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cofh.api.energy.ItemEnergyContainer;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -22,7 +23,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public abstract class ItemEnergy extends ItemEnergyContainer{
+public abstract class ItemEnergy extends ItemEnergyContainer implements IActAddItemOrBlock{
 
     public ItemEnergy(int maxPower, int transfer){
         super(maxPower, transfer);

src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -23,7 +23,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class ItemFertilizer extends Item implements INameableItem{
+public class ItemFertilizer extends Item implements IActAddItemOrBlock{
 
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10){

src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.items.metalists.TheFoods;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public class ItemFoods extends ItemFood implements INameableItem{
+public class ItemFoods extends ItemFood implements IActAddItemOrBlock{
 
     public static final TheFoods[] allFoods = TheFoods.values();
     public IIcon[] textures = new IIcon[allFoods.length];

src/main/java/ellpeck/actuallyadditions/items/ItemGrowthRing.java

@@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.WorldPos;
 import net.minecraft.block.Block;
@@ -33,7 +32,7 @@ import net.minecraftforge.common.IPlantable;
 import java.util.ArrayList;
 import java.util.Random;
 
-public class ItemGrowthRing extends ItemEnergy implements INameableItem{
+public class ItemGrowthRing extends ItemEnergy{
 
     public ItemGrowthRing(){
         super(1000000, 5000);

src/main/java/ellpeck/actuallyadditions/items/ItemHairyBall.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.recipe.HairyBallHandler;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.item.EntityItem;
@@ -27,7 +27,7 @@ import net.minecraft.world.World;
 
 import java.util.Random;
 
-public class ItemHairyBall extends Item implements INameableItem{
+public class ItemHairyBall extends Item implements IActAddItemOrBlock{
 
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){

src/main/java/ellpeck/actuallyadditions/items/ItemJams.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.items.metalists.TheJams;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -30,7 +30,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public class ItemJams extends ItemFood implements INameableItem{
+public class ItemJams extends ItemFood implements IActAddItemOrBlock{
 
     public static final TheJams[] allJams = TheJams.values();
     public IIcon overlayIcon;

src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java

@@ -14,7 +14,7 @@ import com.google.common.collect.Multimap;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.SharedMonsterAttributes;
@@ -24,7 +24,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class ItemKnife extends Item implements INameableItem{
+public class ItemKnife extends Item implements IActAddItemOrBlock{
 
     public ItemKnife(){
         this.setMaxDamage(ConfigIntValues.KNIFE_DAMAGE.getValue());

src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java

@@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.WorldPos;
 import net.minecraft.block.Block;
@@ -33,7 +33,7 @@ import net.minecraft.world.World;
 import java.util.ArrayList;
 import java.util.Collections;
 
-public class ItemLeafBlower extends Item implements INameableItem{
+public class ItemLeafBlower extends Item implements IActAddItemOrBlock{
 
     private final boolean isAdvanced;
 

src/main/java/ellpeck/actuallyadditions/items/ItemMagnetRing.java

@@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -28,7 +27,7 @@ import net.minecraft.world.World;
 
 import java.util.ArrayList;
 
-public class ItemMagnetRing extends ItemEnergy implements INameableItem{
+public class ItemMagnetRing extends ItemEnergy{
 
     public ItemMagnetRing(){
         super(3000000, 5000);

src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -24,7 +24,7 @@ import net.minecraft.util.IIcon;
 
 import java.util.List;
 
-public class ItemMisc extends Item implements INameableItem{
+public class ItemMisc extends Item implements IActAddItemOrBlock{
 
     public static final TheMiscItems[] allMiscItems = TheMiscItems.values();
     public IIcon[] textures = new IIcon[allMiscItems.length];

src/main/java/ellpeck/actuallyadditions/items/ItemPhantomConnector.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.tile.IPhantomTile;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
 import ellpeck.actuallyadditions.util.WorldPos;
@@ -30,7 +30,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
 
-public class ItemPhantomConnector extends Item implements INameableItem{
+public class ItemPhantomConnector extends Item implements IActAddItemOrBlock{
 
     public ItemPhantomConnector(){
         this.setMaxStackSize(1);

src/main/java/ellpeck/actuallyadditions/items/ItemPotionRing.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.items.metalists.ThePotionRings;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -29,7 +29,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public class ItemPotionRing extends Item implements INameableItem{
+public class ItemPotionRing extends Item implements IActAddItemOrBlock{
 
     public static final ThePotionRings[] allRings = ThePotionRings.values();
 

src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,7 +22,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class ItemResonantRice extends Item implements INameableItem{
+public class ItemResonantRice extends Item implements IActAddItemOrBlock{
 
     @Override
     public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){

src/main/java/ellpeck/actuallyadditions/items/ItemSeed.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.blocks.BlockPlant;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-public class ItemSeed extends ItemSeeds implements INameableItem{
+public class ItemSeed extends ItemSeeds implements IActAddItemOrBlock{
 
     public Block plant;
     public String name;

src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java

@@ -13,7 +13,7 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
@@ -27,7 +27,7 @@ import net.minecraft.world.World;
 
 import java.util.List;
 
-public class ItemSpecialDrop extends Item implements INameableItem{
+public class ItemSpecialDrop extends Item implements IActAddItemOrBlock{
 
     public static final int SOLID_XP_AMOUNT = 8;
 

src/main/java/ellpeck/actuallyadditions/items/ItemTeleStaff.java

@@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.ModUtil;
 import ellpeck.actuallyadditions.util.WorldUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -29,7 +28,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class ItemTeleStaff extends ItemEnergy implements INameableItem{
+public class ItemTeleStaff extends ItemEnergy{
 
     public ItemTeleStaff(){
         super(500000, 10000);

src/main/java/ellpeck/actuallyadditions/items/ItemWaterRemovalRing.java

@@ -13,7 +13,6 @@ package ellpeck.actuallyadditions.items;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;
@@ -25,7 +24,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-public class ItemWaterRemovalRing extends ItemEnergy implements INameableItem{
+public class ItemWaterRemovalRing extends ItemEnergy{
 
     public ItemWaterRemovalRing(){
         super(1000000, 5000);

src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -23,7 +23,7 @@ import net.minecraft.util.IIcon;
 
 import java.util.ArrayList;
 
-public class ItemWingsOfTheBats extends Item implements INameableItem{
+public class ItemWingsOfTheBats extends Item implements IActAddItemOrBlock{
 
     /**
      * A List containing all of the Players that can currently fly

src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java

@@ -10,11 +10,11 @@
 
 package ellpeck.actuallyadditions.items.metalists;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.StringUtil;
 import net.minecraft.item.EnumRarity;
 
-public enum TheDusts implements INameableItem{
+public enum TheDusts implements IActAddItemOrBlock{
 
     IRON("Iron", 7826534, EnumRarity.common),
     GOLD("Gold", 14335744, EnumRarity.uncommon),

src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java

@@ -11,12 +11,12 @@
 package ellpeck.actuallyadditions.items.metalists;
 
 import ellpeck.actuallyadditions.items.InitItems;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 
-public enum TheFoods implements INameableItem{
+public enum TheFoods implements IActAddItemOrBlock{
 
     CHEESE("Cheese", 1, 0.5F, false, 3, EnumRarity.common),
     PUMPKIN_STEW("PumpkinStew", 10, 1F, true, 30, EnumRarity.common),

src/main/java/ellpeck/actuallyadditions/items/metalists/TheJams.java

@@ -10,10 +10,10 @@
 
 package ellpeck.actuallyadditions.items.metalists;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.item.EnumRarity;
 
-public enum TheJams implements INameableItem{
+public enum TheJams implements IActAddItemOrBlock{
 
     CU_BA_RA("CuBaRa", 6, 0.1F, EnumRarity.rare, 5, 12, 12595273),
     GRA_KI_BA("GraKiBa", 6, 0.1F, EnumRarity.rare, 16, 13, 5492820),

src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java

@@ -10,10 +10,10 @@
 
 package ellpeck.actuallyadditions.items.metalists;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import net.minecraft.item.EnumRarity;
 
-public enum TheMiscItems implements INameableItem{
+public enum TheMiscItems implements IActAddItemOrBlock{
 
     PAPER_CONE("PaperCone", EnumRarity.common),
     MASHED_FOOD("MashedFood", EnumRarity.uncommon),

src/main/java/ellpeck/actuallyadditions/items/metalists/ThePotionRings.java

@@ -10,14 +10,14 @@
 
 package ellpeck.actuallyadditions.items.metalists;
 
-import ellpeck.actuallyadditions.util.INameableItem;
+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 INameableItem{
+public enum ThePotionRings implements IActAddItemOrBlock{
 
     SPEED(Potion.moveSpeed.getName(), 8171462, Potion.moveSpeed.getId(), 0, 1, 10, false, EnumRarity.uncommon, new ItemStack(Items.sugar)),
     //Slowness

src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java

@@ -11,14 +11,14 @@
 package ellpeck.actuallyadditions.items.metalists;
 
 import ellpeck.actuallyadditions.config.values.ConfigBoolValues;
-import ellpeck.actuallyadditions.util.INameableItem;
+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 INameableItem{
+public enum TheSpecialDrops implements IActAddItemOrBlock{
 
     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()),

src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java

@@ -15,7 +15,7 @@ import cpw.mods.fml.common.eventhandler.Event;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import ellpeck.actuallyadditions.config.ConfigValues;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -35,7 +35,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 @SuppressWarnings("unchecked")
-public class ItemAllToolAA extends ItemTool implements INameableItem{
+public class ItemAllToolAA extends ItemTool implements IActAddItemOrBlock{
 
     private String name;
     private EnumRarity rarity;

src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
@@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class ItemAxeAA extends ItemAxe implements INameableItem{
+public class ItemAxeAA extends ItemAxe implements IActAddItemOrBlock{
 
     private String name;
     private EnumRarity rarity;

src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
@@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class ItemHoeAA extends ItemHoe implements INameableItem{
+public class ItemHoeAA extends ItemHoe implements IActAddItemOrBlock{
 
     private String name;
     private String oredictName;

src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
@@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class ItemPickaxeAA extends ItemPickaxe implements INameableItem{
+public class ItemPickaxeAA extends ItemPickaxe implements IActAddItemOrBlock{
 
     private String name;
     private EnumRarity rarity;

src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
@@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class ItemShovelAA extends ItemSpade implements INameableItem{
+public class ItemShovelAA extends ItemSpade implements IActAddItemOrBlock{
 
     private String name;
     private String oredictName;

src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java

@@ -12,7 +12,7 @@ package ellpeck.actuallyadditions.items.tools;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import ellpeck.actuallyadditions.util.INameableItem;
+import ellpeck.actuallyadditions.util.IActAddItemOrBlock;
 import ellpeck.actuallyadditions.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;
@@ -21,7 +21,7 @@ import net.minecraft.item.ItemSword;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class ItemSwordAA extends ItemSword implements INameableItem{
+public class ItemSwordAA extends ItemSword implements IActAddItemOrBlock{
 
     private String name;
     private String oredictName;

src/main/java/ellpeck/actuallyadditions/util/BlockUtil.java

@@ -18,7 +18,7 @@ import net.minecraft.item.ItemBlock;
 public class BlockUtil{
 
     public static String createUnlocalizedName(Block block){
-        return ModUtil.MOD_ID_LOWER+"."+((INameableItem)block).getName();
+        return ModUtil.MOD_ID_LOWER+"."+((IActAddItemOrBlock)block).getName();
     }
 
     @SuppressWarnings("unchecked")
@@ -28,7 +28,7 @@ public class BlockUtil{
 
         for(Class sub : block.getClass().getDeclaredClasses()){
             if(sub.getSuperclass() == ItemBlock.class){
-                GameRegistry.registerBlock(block, sub, ((INameableItem)block).getName());
+                GameRegistry.registerBlock(block, sub, ((IActAddItemOrBlock)block).getName());
                 break;
             }
         }

src/main/java/ellpeck/actuallyadditions/util/IActAddItemOrBlock.java

@@ -10,7 +10,10 @@
 
 package ellpeck.actuallyadditions.util;
 
-public interface INameableItem{
+/**
+ * The indicator interface for any block or item that is part of ActuallyAdditions
+ */
+public interface IActAddItemOrBlock{
 
     String getName();
 

src/main/java/ellpeck/actuallyadditions/util/ItemUtil.java

@@ -39,11 +39,11 @@ public class ItemUtil{
     public static void register(Item item, boolean addTab){
         item.setCreativeTab(addTab ? CreativeTab.instance : null);
         item.setUnlocalizedName(createUnlocalizedName(item));
-        GameRegistry.registerItem(item, ((INameableItem)item).getName());
+        GameRegistry.registerItem(item, ((IActAddItemOrBlock)item).getName());
     }
 
     public static String createUnlocalizedName(Item item){
-        return ModUtil.MOD_ID_LOWER+"."+((INameableItem)item).getName();
+        return ModUtil.MOD_ID_LOWER+"."+((IActAddItemOrBlock)item).getName();
     }
 
     /**