Removed the Everything-Gets-Added-To-The-OreDictionary-Feature because it was stupid and clogged up the Ore Dictionary.

src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java

@@ -22,6 +22,7 @@ import ellpeck.actuallyadditions.material.InitItemMaterials;
 import ellpeck.actuallyadditions.misc.DispenserHandlerEmptyBucket;
 import ellpeck.actuallyadditions.misc.DispenserHandlerFertilize;
 import ellpeck.actuallyadditions.network.PacketHandler;
+import ellpeck.actuallyadditions.ore.InitOreDict;
 import ellpeck.actuallyadditions.proxy.IProxy;
 import ellpeck.actuallyadditions.recipe.FuelHandler;
 import ellpeck.actuallyadditions.recipe.HairyBallHandler;
@@ -58,6 +59,7 @@ public class ActuallyAdditions{
     public void init(FMLInitializationEvent event){
         ModUtil.LOGGER.info("Starting Initialization Phase...");
 
+        InitOreDict.init();
         InitAchievements.init();
         GuiHandler.init();
         OreGen.init();

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

@@ -39,8 +39,7 @@ public class BlockBreaker extends BlockContainerBase implements INameableItem{
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -32,8 +32,7 @@ public class BlockCanolaPress extends BlockContainerBase implements INameableIte
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -47,8 +47,7 @@ public class BlockCoalGenerator extends BlockContainerBase implements INameableI
         }
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -98,8 +98,7 @@ public class BlockCoffeeMachine extends BlockContainerBase implements INameableI
         return "blockCoffeeMachine";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -80,8 +80,7 @@ public class BlockColoredLamp extends Block implements INameableItem{
         return this.isOn ? "blockColoredLampOn" : "blockColoredLamp";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -123,8 +123,7 @@ public class BlockCompost extends BlockContainerBase implements INameableItem{
         return "blockCompost";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -36,8 +36,7 @@ public class BlockDropper extends BlockContainerBase implements INameableItem{
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -36,8 +36,7 @@ public class BlockEnergizer extends BlockContainerBase implements INameableItem{
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -32,8 +32,7 @@ public class BlockFeeder extends BlockContainerBase implements INameableItem{
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -32,8 +32,7 @@ public class BlockFermentingBarrel extends BlockContainerBase implements INameab
         this.setStepSound(soundTypeWood);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -30,8 +30,7 @@ public class BlockFishingNet extends BlockContainerBase implements INameableItem
         this.setBlockBounds(0F, 0F, 0F, 1F, 1F/16F, 1F);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -39,8 +39,7 @@ public class BlockFluidCollector extends BlockContainerBase implements INameable
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -62,8 +62,7 @@ public class BlockFluidFlowing extends BlockFluidClassic implements INameableIte
         return this.name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -40,8 +40,7 @@ public class BlockFurnaceDouble extends BlockContainerBase implements INameableI
         this.setTickRandomly(true);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -30,8 +30,7 @@ public class BlockFurnaceSolar extends BlockContainerBase implements INameableIt
         this.setBlockBounds(0F, 0F, 0F, 1F, 3F/16F, 1F);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -44,8 +44,7 @@ public class BlockGeneric extends Block implements INameableItem{
         this.blockIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER + ":" + this.getName());
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -33,8 +33,7 @@ public class BlockGiantChest extends BlockContainerBase implements INameableItem
         this.setStepSound(soundTypeWood);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -30,8 +30,7 @@ public class BlockGreenhouseGlass extends BlockContainerBase implements INameabl
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -93,8 +93,7 @@ public class BlockGrinder extends BlockContainerBase implements INameableItem{
         return true;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -31,8 +31,7 @@ public class BlockHeatCollector extends BlockContainerBase implements INameableI
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -36,8 +36,7 @@ public class BlockInputter extends BlockContainerBase implements INameableItem{
         this.isAdvanced = isAdvanced;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -35,8 +35,7 @@ public class BlockItemRepairer extends BlockContainerBase implements INameableIt
         this.setTickRandomly(true);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -33,8 +33,7 @@ public class BlockLavaFactoryController extends BlockContainerBase implements IN
         this.setStepSound(soundTypeStone);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -61,8 +61,7 @@ public class BlockMisc extends Block implements INameableItem{
         return "blockMisc";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -47,8 +47,7 @@ public class BlockOilGenerator extends BlockContainerBase implements INameableIt
         }
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -32,8 +32,7 @@ public class BlockPhantomBooster extends BlockContainerBase implements INameable
         this.setBlockBounds(3*f, 0F, 3*f, 1-3*f, 1F, 1-3*f);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -51,8 +51,7 @@ public class BlockPhantomface extends BlockContainerBase implements INameableIte
         super.breakBlock(world, x, y, z, block, par6);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -96,8 +96,7 @@ public class BlockPlant extends BlockCrops implements INameableItem{
         return this.name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -76,8 +76,7 @@ public class BlockSlabs extends Block implements INameableItem{
         return this.name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -28,8 +28,7 @@ public class BlockStair extends BlockStairs implements INameableItem{
         return this.name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -70,8 +70,7 @@ public class BlockWildPlant extends BlockBush implements INameableItem{
         return meta >= allWildPlants.length ? null : ((BlockPlant)allWildPlants[meta].wildVersionOf).seedItem;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -94,9 +94,9 @@ public class InitBlocks{
         BlockUtil.register(blockTestifiBucksWhiteSlab, BlockSlabs.TheItemBlock.class);
 
         blockColoredLamp = new BlockColoredLamp(false);
-        BlockUtil.register(blockColoredLamp, BlockColoredLamp.TheItemBlock.class, BlockColoredLamp.allLampTypes);
+        BlockUtil.register(blockColoredLamp, BlockColoredLamp.TheItemBlock.class);
         blockColoredLampOn = new BlockColoredLamp(true);
-        BlockUtil.register(blockColoredLampOn, BlockColoredLamp.TheItemBlock.class, false, BlockColoredLamp.allLampTypes);
+        BlockUtil.register(blockColoredLampOn, BlockColoredLamp.TheItemBlock.class, false);
 
         blockEnergizer = new BlockEnergizer(true);
         BlockUtil.register(blockEnergizer, BlockEnergizer.TheItemBlock.class);
@@ -154,7 +154,7 @@ public class InitBlocks{
         BlockUtil.register(blockCompost, BlockCompost.TheItemBlock.class);
 
         blockMisc = new BlockMisc();
-        BlockUtil.register(blockMisc, BlockMisc.TheItemBlock.class, BlockMisc.allMiscBlocks);
+        BlockUtil.register(blockMisc, BlockMisc.TheItemBlock.class);
 
         blockFeeder = new BlockFeeder();
         BlockUtil.register(blockFeeder, BlockFeeder.TheItemBlock.class);
@@ -214,7 +214,7 @@ public class InitBlocks{
         BlockUtil.register(blockPhantomBooster, BlockPhantomBooster.TheItemBlock.class);
 
         blockWildPlant = new BlockWildPlant();
-        BlockUtil.register(blockWildPlant, BlockWildPlant.TheItemBlock.class, false, BlockWildPlant.allWildPlants);
+        BlockUtil.register(blockWildPlant, BlockWildPlant.TheItemBlock.class, false);
 
         registerFluids();
     }

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

@@ -32,11 +32,6 @@ public enum TheColoredLampColors implements INameableItem{
         return name;
     }
 
-    @Override
-    public String getOredictName(){
-        return "blockColoredLamp" + this.getName();
-    }
-
     public static TheColoredLampColors getColorFromDyeName(String color){
         if(color.substring(0, 3).equals("dye")){
             String actualName = color.substring(3);

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

@@ -5,34 +5,27 @@ import net.minecraft.item.EnumRarity;
 
 public enum TheMiscBlocks implements INameableItem{
 
-    QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.rare, "blockQuartzBlack"),
+    QUARTZ_PILLAR("BlackQuartzPillar", EnumRarity.rare),
-    QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.rare, "blockQuartzBlack"),
+    QUARTZ_CHISELED("BlackQuartzChiseled", EnumRarity.rare),
-    QUARTZ("BlackQuartz", EnumRarity.rare, "blockQuartzBlack"),
+    QUARTZ("BlackQuartz", EnumRarity.rare),
-    ORE_QUARTZ("OreBlackQuartz", EnumRarity.epic, "oreQuartzBlack"),
+    ORE_QUARTZ("OreBlackQuartz", EnumRarity.epic),
-    WOOD_CASING("WoodCasing", EnumRarity.common, "blockCasingWood"),
+    WOOD_CASING("WoodCasing", EnumRarity.common),
-    STONE_CASING("StoneCasing", EnumRarity.uncommon, "blockCasingStone"),
+    STONE_CASING("StoneCasing", EnumRarity.uncommon),
-    CHARCOAL_BLOCK("Charcoal", EnumRarity.common, "blockCharcoal"),
+    CHARCOAL_BLOCK("Charcoal", EnumRarity.common),
-    ENDERPEARL_BLOCK("Enderpearl", EnumRarity.rare, "blockEnderpearl"),
+    ENDERPEARL_BLOCK("Enderpearl", EnumRarity.rare),
-    LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.uncommon, "blockLavaFactoryCase"),
+    LAVA_FACTORY_CASE("LavaFactoryCase", EnumRarity.uncommon),
-    ENDER_CASING("EnderCasing", EnumRarity.epic, "blockEnderCasing");
+    ENDER_CASING("EnderCasing", EnumRarity.epic);
 
     public final String name;
-    public final String oredictName;
     public final EnumRarity rarity;
 
-    TheMiscBlocks(String name, EnumRarity rarity, String oredictName){
+    TheMiscBlocks(String name, EnumRarity rarity){
         this.name = name;
         this.rarity = rarity;
-        this.oredictName = oredictName;
     }
 
     @Override
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

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

@@ -7,20 +7,18 @@ import net.minecraft.item.EnumRarity;
 
 public enum TheWildPlants implements INameableItem{
 
-    CANOLA("Canola", EnumRarity.rare, "blockCanolaWild", InitBlocks.blockCanola),
+    CANOLA("Canola", EnumRarity.rare, InitBlocks.blockCanola),
-    FLAX("Flax", EnumRarity.rare, "blockFlaxWild", InitBlocks.blockFlax),
+    FLAX("Flax", EnumRarity.rare, InitBlocks.blockFlax),
-    RICE("Rice", EnumRarity.rare, "blockRiceWild", InitBlocks.blockRice),
+    RICE("Rice", EnumRarity.rare, InitBlocks.blockRice),
-    COFFEE("Coffee", EnumRarity.rare, "blockCoffeeWild", InitBlocks.blockCoffee);
+    COFFEE("Coffee", EnumRarity.rare, InitBlocks.blockCoffee);
 
     public final String name;
-    public final String oredictName;
     public final EnumRarity rarity;
     public final Block wildVersionOf;
 
-    TheWildPlants(String name, EnumRarity rarity, String oredictName, Block wildVersionOf){
+    TheWildPlants(String name, EnumRarity rarity, Block wildVersionOf){
         this.name = name;
         this.rarity = rarity;
-        this.oredictName = oredictName;
         this.wildVersionOf = wildVersionOf;
     }
 
@@ -28,9 +26,4 @@ public enum TheWildPlants implements INameableItem{
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java

@@ -7,7 +7,6 @@ import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
 import ellpeck.actuallyadditions.config.values.ConfigCrafting;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.Util;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -24,7 +23,7 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCompost),
                     "W W", "W W", "WCW",
                     'W', "plankWood",
-                    'C', TheMiscBlocks.WOOD_CASING.getOredictName()));
+                    'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
 
         //Charcoal Block
         GameRegistry.addRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.CHARCOAL_BLOCK.ordinal()),
@@ -45,8 +44,8 @@ public class BlockCrafting{
         if(ConfigCrafting.ENDER_CASING.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal()),
                     "WSW", "SRS", "WSW",
-                    'W', TheMiscBlocks.ENDERPEARL_BLOCK.getOredictName(),
+                    'W', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal()),
-                    'R', TheMiscBlocks.QUARTZ.getOredictName(),
+                    'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
                     'S', Blocks.obsidian));
 
         //Phantom Booster
@@ -55,44 +54,44 @@ public class BlockCrafting{
                     "RDR", "DCD", "RDR",
                     'R', "dustRedstone",
                     'D', "gemDiamond",
-                    'C', TheMiscBlocks.ENDER_CASING.getOredictName()));
+                    'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
 
         //Coffee Machine
         if(ConfigCrafting.COFFEE_MACHINE.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoffeeMachine),
                     " C ", " S ", "A A",
-                    'C', ((INameableItem)InitItems.itemCoffeeBean).getOredictName(),
+                    'C', InitItems.itemCoffeeBean,
-                    'S', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'S', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
-                    'A', TheMiscItems.COIL.getOredictName()));
+                    'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
 
         //Energizer
         if(ConfigCrafting.ENERGIZER.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnergizer),
                     "I I", "CAC", "I I",
                     'I', "ingotIron",
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
-                    'A', TheMiscBlocks.STONE_CASING.getOredictName()));
+                    'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal())));
 
         //Energizer
         if(ConfigCrafting.ENERVATOR.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockEnervator),
                     " I ", "CAC", " I ",
                     'I', "ingotIron",
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
-                    'A', TheMiscBlocks.STONE_CASING.getOredictName()));
+                    'A', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal())));
 
         //Lava Factory
         if(ConfigCrafting.LAVA_FACTORY.isEnabled()){
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockLavaFactoryController),
                     " C ", "ISI", " L ",
-                    'C', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
-                    'S', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'I', "blockIron",
                     'L', Items.lava_bucket));
 
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 4, TheMiscBlocks.LAVA_FACTORY_CASE.ordinal()),
                     "ICI",
-                    'C', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'I', "blockIron"));
         }
 
@@ -102,8 +101,8 @@ public class BlockCrafting{
                     "CHC", "CDC", "CRC",
                     'C', "cobblestone",
                     'H', Blocks.hopper,
-                    'R', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
-                    'D', TheMiscItems.CANOLA.getOredictName()));
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
 
         //Fermenting Barrel
         if(ConfigCrafting.FERMENTING_BARREL.isEnabled())
@@ -111,8 +110,8 @@ public class BlockCrafting{
                     "CHC", "CDC", "CRC",
                     'C', "logWood",
                     'H', Blocks.hopper,
-                    'R', TheMiscBlocks.WOOD_CASING.getOredictName(),
+                    'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
-                    'D', TheMiscItems.CANOLA.getOredictName()));
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
 
         //Phantomface
         if(ConfigCrafting.PHANTOMFACE.isEnabled())
@@ -120,63 +119,63 @@ public class BlockCrafting{
                     " C ", "EBE", " S ",
                     'E', Items.ender_eye,
                     'C', Blocks.chest,
-                    'S', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'S', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
-                    'B', TheMiscBlocks.ENDERPEARL_BLOCK.getOredictName()));
+                    'B', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
 
         //Phantom Placer
         if(ConfigCrafting.PHANTOM_PLACER.isEnabled())
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomPlacer),
-                    ((INameableItem)InitBlocks.blockPlacer).getOredictName(),
+                    InitBlocks.blockPlacer,
-                    ((INameableItem)InitBlocks.blockPhantomface).getOredictName()));
+                    InitBlocks.blockPhantomface));
 
         //Phantom Breaker
         if(ConfigCrafting.PHANTOM_BREAKER.isEnabled())
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockPhantomBreaker),
-                    ((INameableItem)InitBlocks.blockBreaker).getOredictName(),
+                    InitBlocks.blockBreaker,
-                    ((INameableItem)InitBlocks.blockPhantomface).getOredictName()));
+                    InitBlocks.blockPhantomface));
 
         //Phantom Energyface
         if(ConfigCrafting.PHANTOM_ENERGYFACE.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomEnergyface),
                     " R ", "RFR", " R ",
                     'R', "dustRedstone",
-                    'F', ((INameableItem)InitBlocks.blockPhantomface).getOredictName()));
+                    'F', InitBlocks.blockPhantomface));
 
         //Phantom Liquiface
         if(ConfigCrafting.PHANTOM_LIQUIFACE.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPhantomLiquiface),
                     "RFR",
                     'R', Items.bucket,
-                    'F', ((INameableItem)InitBlocks.blockPhantomface).getOredictName()));
+                    'F', InitBlocks.blockPhantomface));
 
         //Liquid Placer
         if(ConfigCrafting.LIQUID_PLACER.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFluidPlacer),
                     "RFR",
                     'R', Items.bucket,
-                    'F', ((INameableItem)InitBlocks.blockPlacer).getOredictName()));
+                    'F', InitBlocks.blockPlacer));
 
         //Liquid Breaker
         if(ConfigCrafting.LIQUID_BREAKER.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFluidCollector),
                     "RFR",
                     'R', Items.bucket,
-                    'F', ((INameableItem)InitBlocks.blockBreaker).getOredictName()));
+                    'F', InitBlocks.blockBreaker));
 
         //Oil Generator
         if(ConfigCrafting.OIL_GENERATOR.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockOilGenerator),
                     "CRC", "CBC", "CRC",
                     'C', "cobblestone",
-                    'R', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
-                    'B', TheMiscItems.CANOLA.getOredictName()));
+                    'B', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CANOLA.ordinal())));
 
         //Coal Generator
         if(ConfigCrafting.COAL_GENERATOR.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockCoalGenerator),
                     "CRC", "CBC", "CRC",
                     'C', "cobblestone",
-                    'R', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'B', new ItemStack(Items.coal, 1, Util.WILDCARD)));
 
         //Enderpearl Block
@@ -184,20 +183,20 @@ public class BlockCrafting{
                 "EE", "EE",
                 'E', Items.ender_pearl));
         GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.ender_pearl, 4),
-                TheMiscBlocks.ENDERPEARL_BLOCK.getOredictName()));
+                new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDERPEARL_BLOCK.ordinal())));
 
         //Stone Casing
         if(ConfigCrafting.STONE_CASING.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     "WSW", "SRS", "WSW",
                     'W', "cobblestone",
-                    'R', TheMiscItems.QUARTZ.getOredictName(),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
                     'S', "stickWood"));
 
         //Quartz Block
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal()),
                 "QQ", "QQ",
-                'Q', TheMiscItems.QUARTZ.getOredictName()));
+                'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
 
         //Fishing Net
         if(ConfigCrafting.FISHING_NET.isEnabled())
@@ -212,8 +211,8 @@ public class BlockCrafting{
                     "DID", "OCO", "DID",
                     'D', "gemDiamond",
                     'I', "ingotIron",
-                    'O', TheMiscItems.COIL.getOredictName(),
+                    'O', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
-                    'C', TheMiscBlocks.STONE_CASING.getOredictName()));
+                    'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
 
         //Solar Panel
         if(ConfigCrafting.SOLAR_PANEL.isEnabled())
@@ -221,8 +220,8 @@ public class BlockCrafting{
                     "IQI", "CDC", "IBI",
                     'D', "blockDiamond",
                     'I', "ingotIron",
-                    'Q', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'B', new ItemStack(Blocks.iron_bars)));
 
         //Heat Collector
@@ -231,33 +230,33 @@ public class BlockCrafting{
                     "BRB", "CDC", "BQB",
                     'D', "gemDiamond",
                     'R', new ItemStack(Items.repeater),
-                    'Q', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'L', new ItemStack(Items.lava_bucket),
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'B', new ItemStack(Blocks.iron_bars)));
 
         //Quartz Pillar
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ_PILLAR.ordinal()),
                 "Q", "Q",
-                'Q', TheMiscItems.QUARTZ.getOredictName()));
+                'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
 
         //Chiseled Quartz
         GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockMisc, 2, TheMiscBlocks.QUARTZ_CHISELED.ordinal()),
                 "Q", "Q",
-                'Q', TheMiscBlocks.QUARTZ.getOredictName()));
+                'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.QUARTZ.ordinal())));
 
         //Inputter
         if(ConfigCrafting.INPUTTER.isEnabled()){
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockInputter),
                     "WWW", "CHC", "WWW",
                     'W', "plankWood",
-                    'C', TheMiscBlocks.WOOD_CASING.getOredictName(),
+                    'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
                     'H', new ItemStack(Blocks.hopper)));
 
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitBlocks.blockInputterAdvanced),
-                    ((INameableItem)InitBlocks.blockInputter).getOredictName(),
+                    InitBlocks.blockInputter,
-                    TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
-                    TheMiscItems.QUARTZ.getOredictName(),
+                    new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
                     "dustRedstone"));
         }
 
@@ -266,8 +265,8 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinder),
                     "CFC", "DQD", "CFC",
                     'C', "cobblestone",
-                    'D', TheMiscItems.COIL.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
-                    'Q', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'Q', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'P', new ItemStack(Blocks.piston),
                     'F', new ItemStack(Items.flint)));
 
@@ -276,9 +275,9 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGrinderDouble),
                     "CDC", "RFR", "CDC",
                     'C', "cobblestone",
-                    'D', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
-                    'R', ((INameableItem)InitBlocks.blockGrinder).getOredictName(),
+                    'R', InitBlocks.blockGrinder,
-                    'F', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'P', new ItemStack(Blocks.piston)));
 
         //Double Furnace
@@ -286,9 +285,9 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFurnaceDouble),
                     "CDC", "RFR", "CDC",
                     'C', "cobblestone",
-                    'D', TheMiscItems.COIL.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'R', new ItemStack(Blocks.furnace),
-                    'F', TheMiscBlocks.STONE_CASING.getOredictName(),
+                    'F', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.STONE_CASING.ordinal()),
                     'P', "ingotBrick"));
 
         //Feeder
@@ -296,16 +295,16 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockFeeder),
                     "WCW", "DHD", "WCW",
                     'W', "plankWood",
-                    'D', TheMiscItems.COIL.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'C', new ItemStack(Items.golden_carrot),
-                    'H', TheMiscBlocks.WOOD_CASING.getOredictName()));
+                    'H', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal())));
 
         //Giant Chest
         if(ConfigCrafting.GIANT_CHEST.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockGiantChest),
                     "CWC", "WDW", "CWC",
                     'C', new ItemStack(Blocks.chest),
-                    'D', TheMiscBlocks.WOOD_CASING.getOredictName(),
+                    'D', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.WOOD_CASING.ordinal()),
                     'W', "plankWood"));
 
         //Greenhouse Glass
@@ -321,7 +320,7 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockPlacer),
                     "CCC", "CRP", "CCC",
                     'C', "cobblestone",
-                    'R', TheMiscItems.COIL.getOredictName(),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'P', Blocks.piston));
 
         //Breaker
@@ -329,7 +328,7 @@ public class BlockCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockBreaker),
                     "CCC", "CRP", "CCC",
                     'C', "cobblestone",
-                    'R', TheMiscItems.COIL.getOredictName(),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'P', Items.iron_pickaxe));
 
         //Dropper
@@ -338,7 +337,7 @@ public class BlockCrafting{
                     "CCC", "CDR", "CCC",
                     'C', "cobblestone",
                     'D', Blocks.dropper,
-                    'R', TheMiscItems.COIL_ADVANCED.getOredictName()));
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
 
         if(ConfigCrafting.LAMPS.isEnabled()){
             for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){
@@ -346,7 +345,7 @@ public class BlockCrafting{
                         "GGG", "DQD", "GGG",
                         'G', "glowstone",
                         'D', "dye"+BlockColoredLamp.allLampTypes[i].name,
-                        'Q', TheMiscItems.QUARTZ.getOredictName()));
+                        'Q', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())));
             }
         }
 

src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java

@@ -5,7 +5,6 @@ import ellpeck.actuallyadditions.config.values.ConfigCrafting;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.items.metalists.TheFoods;
 import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.Util;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -17,7 +16,7 @@ public class FoodCrafting{
 
     public static void init(){
 
-        String knifeStack = ((INameableItem)InitItems.itemKnife).getOredictName();
+        ItemStack knifeStack = new ItemStack(InitItems.itemKnife);
 
         //Rice Bread
         if(ConfigCrafting.RICE_BREAD.isEnabled())
@@ -33,19 +32,19 @@ public class FoodCrafting{
         if(ConfigCrafting.PIZZA.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.PIZZA.ordinal()),
                     "HKH", "MCF", " D ",
-                    'D', TheMiscItems.DOUGH.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()),
                     'M', new ItemStack(Blocks.brown_mushroom),
                     'C', "cropCarrot",
                     'F', new ItemStack(Items.cooked_fished, 1, Util.WILDCARD),
                     'K', knifeStack,
-                    'H', TheFoods.CHEESE.getOredictName()));
+                    'H', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal())));
 
         //Hamburger
         if(ConfigCrafting.HAMBURGER.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.HAMBURGER.ordinal()),
                     "KT ", "CB ", " T ",
-                    'T', TheFoods.TOAST.getOredictName(),
+                    'T', new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()),
-                    'C', TheFoods.CHEESE.getOredictName(),
+                    'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()),
                     'K', knifeStack,
                     'B', new ItemStack(Items.cooked_beef)));
 
@@ -53,7 +52,7 @@ public class FoodCrafting{
         if(ConfigCrafting.BIG_COOKIE.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.BIG_COOKIE.ordinal()),
                     "DCD", "CDC", "DCD",
-                    'D', TheMiscItems.DOUGH.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()),
                     'C', new ItemStack(Items.dye, 1, 3)));
 
         //Sub Sandwich
@@ -61,9 +60,9 @@ public class FoodCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.SUBMARINE_SANDWICH.ordinal()),
                     "KCP", "FB ", "PCP",
                     'P', new ItemStack(Items.paper),
-                    'C', TheFoods.CHEESE.getOredictName(),
+                    'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()),
                     'F', new ItemStack(Items.cooked_fished, 1, Util.WILDCARD),
-                    'B', TheFoods.BAGUETTE.getOredictName(),
+                    'B', new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()),
                     'K', knifeStack));
 
         //French Fry
@@ -76,16 +75,16 @@ public class FoodCrafting{
         if(ConfigCrafting.FRENCH_FRIES.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRIES.ordinal()),
                     "FFF", " P ",
-                    'P', TheMiscItems.PAPER_CONE.getOredictName(),
+                    'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()),
-                    'F', TheFoods.FRENCH_FRY.getOredictName()));
+                    'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal())));
 
         //Fish N Chips
         if(ConfigCrafting.FISH_N_CHIPS.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.FISH_N_CHIPS.ordinal()),
                     "FIF", " P ",
                     'I', new ItemStack(Items.cooked_fished, 1, Util.WILDCARD),
-                    'P', TheMiscItems.PAPER_CONE.getOredictName(),
+                    'P', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()),
-                    'F', TheFoods.FRENCH_FRY.getOredictName()));
+                    'F', new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal())));
 
         //Cheese
         if(ConfigCrafting.CHEESE.isEnabled())
@@ -108,7 +107,7 @@ public class FoodCrafting{
         if(ConfigCrafting.SPAGHETTI.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.SPAGHETTI.ordinal()),
                     "NNN", " B ",
-                    'N', TheFoods.NOODLE.getOredictName(),
+                    'N', new ItemStack(InitItems.itemFoods, 1, TheFoods.NOODLE.ordinal()),
                     'B', new ItemStack(Items.bowl)));
 
         //Noodle
@@ -129,7 +128,7 @@ public class FoodCrafting{
                     "MMM", "CCC", "EDS",
                     'M', new ItemStack(Items.milk_bucket),
                     'E', new ItemStack(Items.egg),
-                    'D', TheMiscItems.DOUGH.getOredictName(),
+                    'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()),
                     'S', new ItemStack(Items.sugar),
                     'C', new ItemStack(Items.dye, 1, 3)));
 

src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java

@@ -6,7 +6,6 @@ import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
 import ellpeck.actuallyadditions.config.values.ConfigCrafting;
 import ellpeck.actuallyadditions.items.InitItems;
 import ellpeck.actuallyadditions.items.metalists.*;
-import ellpeck.actuallyadditions.util.INameableItem;
 import ellpeck.actuallyadditions.util.Util;
 import net.minecraft.block.IGrowable;
 import net.minecraft.init.Blocks;
@@ -27,14 +26,14 @@ public class ItemCrafting{
         if(ConfigCrafting.RICE_GADGETS.isEnabled()){
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Items.paper, 3),
                     "RRR",
-                    'R', TheFoods.RICE.getOredictName()));
+                    'R', new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal())));
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 4, TheMiscItems.RICE_SLIME.ordinal()),
                     " R ", "RBR", " R ",
-                    'R', TheMiscItems.RICE_DOUGH.getOredictName(),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RICE_DOUGH.ordinal()),
                     'B', Items.water_bucket));
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 4, TheMiscItems.RICE_SLIME.ordinal()),
                     " R ", "RBR", " R ",
-                    'R', TheMiscItems.RICE_DOUGH.getOredictName(),
+                    'R', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.RICE_DOUGH.ordinal()),
                     'B', new ItemStack(Items.potionitem)));
         }
 
@@ -45,14 +44,14 @@ public class ItemCrafting{
                     'F', new ItemStack(Items.flint),
                     'I', "ingotIron",
                     'P', new ItemStack(Blocks.piston),
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
 
         //Drill
         if(ConfigCrafting.DRILL.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrill),
                     "DDD", "CRC", "III",
                     'D', "gemDiamond",
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName(),
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     'R', "dustRedstone",
                     'I', "blockIron"));
 
@@ -89,7 +88,7 @@ public class ItemCrafting{
                     "ISI", "SRS", "ISI",
                     'I', Blocks.glowstone,
                     'S', Items.redstone,
-                    'R', TheMiscBlocks.ENDER_CASING.getOredictName()));
+                    'R', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ENDER_CASING.ordinal())));
         }
 
         //Drill Size
@@ -98,13 +97,13 @@ public class ItemCrafting{
                     "DID", "ICI", "DID",
                     'I', "ingotIron",
                     'D', "gemDiamond",
-                    'C', TheMiscItems.COIL.getOredictName()));
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal())));
 
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemDrillUpgradeFiveByFive),
                     "DID", "ICI", "DID",
                     'I', "ingotIron",
                     'D', "gemDiamond",
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
         }
 
         //Drill Silk Touch
@@ -113,7 +112,7 @@ public class ItemCrafting{
                     "DSD", "SCS", "DSD",
                     'D', "gemEmerald",
                     'S', "gemDiamond",
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
 
         //Drill Placing
         if(ConfigCrafting.DRILL_PLACING.isEnabled())
@@ -121,7 +120,7 @@ public class ItemCrafting{
                     "CEC", "RAR", "CEC",
                     'C', "cobblestone",
                     'E', Items.ender_pearl,
-                    'A', TheMiscItems.COIL.getOredictName(),
+                    'A', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'R', "ingotIron"));
 
         //Battery
@@ -130,7 +129,7 @@ public class ItemCrafting{
                     " R ", "ICI", "III",
                     'R', "dustRedstone",
                     'I', "ingotIron",
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
 
         //Quartz
         if(ConfigCrafting.QUARTZ.isEnabled())
@@ -142,7 +141,7 @@ public class ItemCrafting{
         if(ConfigCrafting.COIL.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     " R ", "RIR", " R ",
-                    'I', TheMiscItems.QUARTZ.getOredictName(),
+                    'I', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
                     'R', "dustRedstone"));
 
         //Cup
@@ -150,18 +149,18 @@ public class ItemCrafting{
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal()),
                     "S S", "SCS", "SSS",
                     'S', "stone",
-                    'C', ((INameableItem)InitItems.itemCoffeeBean).getOredictName()));
+                    'C', InitItems.itemCoffeeBean));
 
         //Resonant Rice
         if(ConfigCrafting.RESONANT_RICE.isEnabled() && !OreDictionary.getOres("nuggetEnderium", false).isEmpty())
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemResonantRice),
-                    TheFoods.RICE.getOredictName(), "nuggetEnderium", Items.gunpowder));
+                    new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), "nuggetEnderium", Items.gunpowder));
 
         //Advanced Coil
         if(ConfigCrafting.ADV_COIL.isEnabled())
             GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal()),
                     " G ", "GCG", " G ",
-                    'C', TheMiscItems.COIL.getOredictName(),
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()),
                     'G', "ingotGold"));
 
         //Ender Pearl
@@ -181,7 +180,7 @@ public class ItemCrafting{
                     'F', new ItemStack(Items.flint),
                     'D', "gemDiamond",
                     'P', new ItemStack(Blocks.piston),
-                    'C', TheMiscItems.COIL_ADVANCED.getOredictName()));
+                    'C', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL_ADVANCED.ordinal())));
 
         //Phantom Connector
         if(ConfigCrafting.PHANTOM_CONNECTOR.isEnabled())
@@ -198,8 +197,8 @@ public class ItemCrafting{
         //Knife
         if(ConfigCrafting.KNIFE.isEnabled())
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemKnife),
-                    TheMiscItems.KNIFE_BLADE.getOredictName(),
+                    new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()),
-                    TheMiscItems.KNIFE_HANDLE.getOredictName()));
+                    new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal())));
 
         //Crafter on a Stick
         if(ConfigCrafting.STICK_CRAFTER.isEnabled())

src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java

@@ -22,7 +22,7 @@ public class MiscCrafting{
         //Rice Dough
         if(ConfigCrafting.RICE_DOUGH.isEnabled())
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.RICE_DOUGH.ordinal()),
-                    TheFoods.RICE.getOredictName(), TheFoods.RICE.getOredictName()));
+                    new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal())));
 
         //Paper Cone
         if(ConfigCrafting.PAPER_CONE.isEnabled())

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

@@ -121,13 +121,13 @@ public class InitItems{
         ItemUtil.register(itemResonantRice);
 
         itemMisc = new ItemMisc();
-        ItemUtil.register(itemMisc, ItemMisc.allMiscItems);
+        ItemUtil.register(itemMisc);
 
         itemFoods = new ItemFoods();
-        ItemUtil.register(itemFoods, ItemFoods.allFoods);
+        ItemUtil.register(itemFoods);
 
         itemJams = new ItemJams();
-        ItemUtil.register(itemJams, ItemJams.allJams);
+        ItemUtil.register(itemJams);
 
         itemKnife = new ItemKnife();
         ItemUtil.register(itemKnife);
@@ -136,10 +136,10 @@ public class InitItems{
         ItemUtil.register(itemCrafterOnAStick);
 
         itemDust = new ItemDust();
-        ItemUtil.register(itemDust, ItemDust.allDusts);
+        ItemUtil.register(itemDust);
 
         itemSpecialDrop = new ItemSpecialDrop();
-        ItemUtil.register(itemSpecialDrop, ItemSpecialDrop.allDrops);
+        ItemUtil.register(itemSpecialDrop);
 
         itemLeafBlower = new ItemLeafBlower(false);
         ItemUtil.register(itemLeafBlower);

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

@@ -85,8 +85,7 @@ public class ItemBattery extends ItemEnergyContainer implements INameableItem{
         return "itemBattery";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -53,8 +53,7 @@ public class ItemBucketAA extends ItemBucket implements INameableItem{
         return this.name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 }

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

@@ -174,8 +174,7 @@ public class ItemCoffee extends ItemFood implements INameableItem{
         return EnumAction.drink;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -21,8 +21,7 @@ public class ItemCoffeeBean extends ItemFood implements INameableItem{
         this.setMaxDamage(0);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "cropCoffeeBeans";
     }
 

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

@@ -57,8 +57,7 @@ public class ItemCrafterOnAStick extends Item implements INameableItem{
         return "itemCrafterOnAStick";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 }

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

@@ -318,8 +318,7 @@ public class ItemDrill extends ItemEnergyContainer implements INameableItem{
         return "itemDrill";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -81,8 +81,7 @@ public class ItemDrillUpgrade extends Item implements INameableItem{
         return this.unlocalizedName;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -29,8 +29,7 @@ public class ItemDust extends Item implements INameableItem{
         return "itemDust";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -55,8 +55,7 @@ public class ItemFertilizer extends Item implements INameableItem{
         return "itemFertilizer";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 }

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

@@ -30,8 +30,7 @@ public class ItemFoods extends ItemFood implements INameableItem{
         TheFoods.setReturnItems();
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -68,8 +68,7 @@ public class ItemHairyBall extends Item implements INameableItem{
         return "itemHairyBall";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 }

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

@@ -34,8 +34,7 @@ public class ItemJams extends ItemFood implements INameableItem{
         this.setMaxDamage(0);
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -38,8 +38,7 @@ public class ItemKnife extends Item implements INameableItem{
         return false;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -48,8 +48,7 @@ public class ItemLeafBlower extends Item implements INameableItem{
         }
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -30,8 +30,7 @@ public class ItemMisc extends Item implements INameableItem{
         return "itemMisc";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -172,8 +172,7 @@ public class ItemPhantomConnector extends Item implements INameableItem{
         return "itemPhantomConnector";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -32,8 +32,7 @@ public class ItemPotionRing extends Item implements INameableItem{
         this.isAdvanced = isAdvanced;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 

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

@@ -55,8 +55,7 @@ public class ItemResonantRice extends Item implements INameableItem{
         return "itemResonantRice";
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.getName();
     }
 }

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

@@ -72,8 +72,7 @@ public class ItemSeed extends ItemSeeds implements INameableItem{
         return this.name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.oredictName;
     }
 }

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

@@ -56,8 +56,7 @@ public class ItemSpecialDrop extends Item implements INameableItem{
         return stack.getItemDamage() >= allDrops.length ? EnumRarity.common : allDrops[stack.getItemDamage()].rarity;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return "";
     }
 

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

@@ -6,34 +6,27 @@ import net.minecraft.item.EnumRarity;
 
 public enum TheDusts implements INameableItem{
 
-    IRON("Iron", 7826534, EnumRarity.common, "dustIron"),
+    IRON("Iron", 7826534, EnumRarity.common),
-    GOLD("Gold", 14335744, EnumRarity.uncommon, "dustGold"),
+    GOLD("Gold", 14335744, EnumRarity.uncommon),
-    DIAMOND("Diamond", 292003, EnumRarity.rare, "dustDiamond"),
+    DIAMOND("Diamond", 292003, EnumRarity.rare),
-    EMERALD("Emerald", 4319527, EnumRarity.epic, "dustEmerald"),
+    EMERALD("Emerald", 4319527, EnumRarity.epic),
-    LAPIS("Lapis", 1849791, EnumRarity.uncommon, "dustLapis"),
+    LAPIS("Lapis", 1849791, EnumRarity.uncommon),
-    QUARTZ("Quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.uncommon, "dustQuartz"),
+    QUARTZ("Quartz", StringUtil.DECIMAL_COLOR_WHITE, EnumRarity.uncommon),
-    COAL("Coal", 0, EnumRarity.uncommon, "dustCoal"),
+    COAL("Coal", 0, EnumRarity.uncommon),
-    QUARTZ_BLACK("QuartzBlack", 18, EnumRarity.rare, "dustQuartzBlack");
+    QUARTZ_BLACK("QuartzBlack", 18, EnumRarity.rare);
 
     public final String name;
-    public final String oredictName;
     public final int color;
     public final EnumRarity rarity;
 
-    TheDusts(String name, int color, EnumRarity rarity, String oredictName){
+    TheDusts(String name, int color, EnumRarity rarity){
         this.name = name;
         this.color = color;
         this.rarity = rarity;
-        this.oredictName = oredictName;
     }
 
     @Override
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

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

@@ -8,24 +8,24 @@ import net.minecraft.item.ItemStack;
 
 public enum TheFoods implements INameableItem{
 
-    CHEESE("Cheese", 1, 0.5F, false, 3, EnumRarity.common, "foodCheese"),
+    CHEESE("Cheese", 1, 0.5F, false, 3, EnumRarity.common),
-    PUMPKIN_STEW("PumpkinStew", 10, 1F, true, 30, EnumRarity.common, "foodPumpkinStew"),
+    PUMPKIN_STEW("PumpkinStew", 10, 1F, true, 30, EnumRarity.common),
-    CARROT_JUICE("CarrotJuice", 6, 0.6F, true, 20, EnumRarity.common, "foodCarrotJuice"),
+    CARROT_JUICE("CarrotJuice", 6, 0.6F, true, 20, EnumRarity.common),
-    FISH_N_CHIPS("FishNChips", 20, 5F, false, 40, EnumRarity.uncommon, "foodFishNChips"),
+    FISH_N_CHIPS("FishNChips", 20, 5F, false, 40, EnumRarity.uncommon),
-    FRENCH_FRIES("FrenchFries", 16, 4F, false, 32, EnumRarity.common, "foodFrenchFries"),
+    FRENCH_FRIES("FrenchFries", 16, 4F, false, 32, EnumRarity.common),
-    FRENCH_FRY("FrenchFry", 3, 0.5F, false, 3, EnumRarity.common, "foodFrenchFry"),
+    FRENCH_FRY("FrenchFry", 3, 0.5F, false, 3, EnumRarity.common),
-    SPAGHETTI("Spaghetti", 18, 3F, false, 38, EnumRarity.common, "foodSpaghetti"),
+    SPAGHETTI("Spaghetti", 18, 3F, false, 38, EnumRarity.common),
-    NOODLE("Noodle", 1, 0.5F, false, 3, EnumRarity.common, "foodNoodle"),
+    NOODLE("Noodle", 1, 0.5F, false, 3, EnumRarity.common),
-    CHOCOLATE_CAKE("ChocolateCake", 16, 2F, false, 45, EnumRarity.uncommon, "foodChocolateCake"),
+    CHOCOLATE_CAKE("ChocolateCake", 16, 2F, false, 45, EnumRarity.uncommon),
-    CHOCOLATE("Chocolate", 5, 1F, false, 15, EnumRarity.common, "foodChocolate"),
+    CHOCOLATE("Chocolate", 5, 1F, false, 15, EnumRarity.common),
-    TOAST("Toast", 3, 0.4F, false, 25, EnumRarity.common, "foodToast"),
+    TOAST("Toast", 3, 0.4F, false, 25, EnumRarity.common),
-    SUBMARINE_SANDWICH("SubmarineSandwich", 10, 8F, false, 40, EnumRarity.uncommon, "foodSubmarineSandwich"),
+    SUBMARINE_SANDWICH("SubmarineSandwich", 10, 8F, false, 40, EnumRarity.uncommon),
-    BIG_COOKIE("BigCookie", 6, 1F, false, 20, EnumRarity.uncommon, "foodBigCookie"),
+    BIG_COOKIE("BigCookie", 6, 1F, false, 20, EnumRarity.uncommon),
-    HAMBURGER("Hamburger", 14, 6F, false, 40, EnumRarity.common, "foodHamburger"),
+    HAMBURGER("Hamburger", 14, 6F, false, 40, EnumRarity.common),
-    PIZZA("Pizza", 20, 10F, false, 45, EnumRarity.uncommon, "foodPizza"),
+    PIZZA("Pizza", 20, 10F, false, 45, EnumRarity.uncommon),
-    BAGUETTE("Baguette", 7, 2F, false, 25, EnumRarity.common, "foodBaguette"),
+    BAGUETTE("Baguette", 7, 2F, false, 25, EnumRarity.common),
-    RICE("Rice", 2, 1F, false, 10, EnumRarity.uncommon, "cropRice"),
+    RICE("Rice", 2, 1F, false, 10, EnumRarity.uncommon),
-    RICE_BREAD("RiceBread", 8, 3F, false, 25, EnumRarity.uncommon, "foodRiceBread");
+    RICE_BREAD("RiceBread", 8, 3F, false, 25, EnumRarity.uncommon);
 
     public static void setReturnItems(){
         SPAGHETTI.returnItem = new ItemStack(Items.bowl);
@@ -36,7 +36,6 @@ public enum TheFoods implements INameableItem{
     }
 
     public final String name;
-    public final String oredictName;
     public final int healAmount;
     public final float saturation;
     public final boolean getsDrunken;
@@ -44,23 +43,17 @@ public enum TheFoods implements INameableItem{
     public ItemStack returnItem;
     public final EnumRarity rarity;
 
-    TheFoods(String name, int healAmount, float saturation, boolean getsDrunken, int useDuration, EnumRarity rarity, String oredictName){
+    TheFoods(String name, int healAmount, float saturation, boolean getsDrunken, int useDuration, EnumRarity rarity){
         this.name = name;
         this.getsDrunken = getsDrunken;
         this.healAmount = healAmount;
         this.saturation = saturation;
         this.useDuration = useDuration;
         this.rarity = rarity;
-        this.oredictName = oredictName;
     }
 
     @Override
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

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

@@ -5,15 +5,14 @@ import net.minecraft.item.EnumRarity;
 
 public enum TheJams implements INameableItem{
 
-    CU_BA_RA("CuBaRa", 4, 2F, EnumRarity.rare, "jamCuBaRa", 5, 12, 12595273),
+    CU_BA_RA("CuBaRa", 4, 2F, EnumRarity.rare, 5, 12, 12595273),
-    GRA_KI_BA("GraKiBa", 4, 2F, EnumRarity.rare, "jamGraKiBa", 16, 13, 5492820),
+    GRA_KI_BA("GraKiBa", 4, 2F, EnumRarity.rare, 16, 13, 5492820),
-    PL_AP_LE("PlApLe", 4, 2F, EnumRarity.rare, "jamPlApLe", 15, 3, 13226009),
+    PL_AP_LE("PlApLe", 4, 2F, EnumRarity.rare, 15, 3, 13226009),
-    CH_AP_CI("ChApCi", 4, 2F, EnumRarity.rare, "jamChApCi", 10, 1, 13189222),
+    CH_AP_CI("ChApCi", 4, 2F, EnumRarity.rare, 10, 1, 13189222),
-    HO_ME_KI("HoMeKi", 4, 2F, EnumRarity.rare, "jamHoMeKi", 10, 14, 2031360),
+    HO_ME_KI("HoMeKi", 4, 2F, EnumRarity.rare, 10, 14, 2031360),
-    PI_CO("PiCo", 4, 2F, EnumRarity.rare, "jamPiCo", 9, 1, 16056203);
+    PI_CO("PiCo", 4, 2F, EnumRarity.rare, 9, 1, 16056203);
 
     public final String name;
-    public final String oredictName;
     public final int healAmount;
     public final float saturation;
     public final EnumRarity rarity;
@@ -21,12 +20,11 @@ public enum TheJams implements INameableItem{
     public final int secondEffectToGet;
     public final int color;
 
-    TheJams(String name, int healAmount, float saturation, EnumRarity rarity, String oredictName, int firstEffectID, int secondEffectID, int color){
+    TheJams(String name, int healAmount, float saturation, EnumRarity rarity, int firstEffectID, int secondEffectID, int color){
         this.name = name;
         this.healAmount = healAmount;
         this.saturation = saturation;
         this.rarity = rarity;
-        this.oredictName = oredictName;
         this.firstEffectToGet = firstEffectID;
         this.secondEffectToGet = secondEffectID;
         this.color = color;
@@ -36,9 +34,4 @@ public enum TheJams implements INameableItem{
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

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

@@ -5,39 +5,32 @@ import net.minecraft.item.EnumRarity;
 
 public enum TheMiscItems implements INameableItem{
 
-    PAPER_CONE("PaperCone", EnumRarity.common, "itemPaperCone"),
+    PAPER_CONE("PaperCone", EnumRarity.common),
-    MASHED_FOOD("MashedFood", EnumRarity.uncommon, "itemMashedFood"),
+    MASHED_FOOD("MashedFood", EnumRarity.uncommon),
-    KNIFE_BLADE("KnifeBlade", EnumRarity.common, "itemKnifeBlade"),
+    KNIFE_BLADE("KnifeBlade", EnumRarity.common),
-    KNIFE_HANDLE("KnifeHandle", EnumRarity.common, "itemKnifeHandle"),
+    KNIFE_HANDLE("KnifeHandle", EnumRarity.common),
-    DOUGH("Dough", EnumRarity.common, "itemDough"),
+    DOUGH("Dough", EnumRarity.common),
-    QUARTZ("BlackQuartz", EnumRarity.epic, "gemQuartzBlack"),
+    QUARTZ("BlackQuartz", EnumRarity.epic),
-    RING("Ring", EnumRarity.uncommon, "itemRing"),
+    RING("Ring", EnumRarity.uncommon),
-    COIL("Coil", EnumRarity.common, "itemCoilBasic"),
+    COIL("Coil", EnumRarity.common),
-    COIL_ADVANCED("CoilAdvanced", EnumRarity.uncommon, "itemCoilAdvanced"),
+    COIL_ADVANCED("CoilAdvanced", EnumRarity.uncommon),
-    RICE_DOUGH("RiceDough", EnumRarity.uncommon, "itemRiceDough"),
+    RICE_DOUGH("RiceDough", EnumRarity.uncommon),
-    TINY_COAL("TinyCoal", EnumRarity.common, "itemTinyCoal"),
+    TINY_COAL("TinyCoal", EnumRarity.common),
-    TINY_CHAR("TinyCharcoal", EnumRarity.common, "itemTinyChar"),
+    TINY_CHAR("TinyCharcoal", EnumRarity.common),
-    RICE_SLIME("RiceSlime", EnumRarity.uncommon, "slimeball"),
+    RICE_SLIME("RiceSlime", EnumRarity.uncommon),
-    CANOLA("Canola", EnumRarity.uncommon, "cropCanola"),
+    CANOLA("Canola", EnumRarity.uncommon),
-    CUP("Cup", EnumRarity.uncommon, "itemCup");
+    CUP("Cup", EnumRarity.uncommon);
 
     public final String name;
-    public final String oredictName;
     public final EnumRarity rarity;
 
-    TheMiscItems(String name, EnumRarity rarity, String oredictName){
+    TheMiscItems(String name, EnumRarity rarity){
         this.name = name;
         this.rarity = rarity;
-        this.oredictName = oredictName;
     }
 
     @Override
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

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

@@ -58,9 +58,4 @@ public enum ThePotionRings implements INameableItem{
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return "";
-    }
 }

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

@@ -10,38 +10,31 @@ import net.minecraft.item.EnumRarity;
 
 public enum TheSpecialDrops implements INameableItem{
 
-    SOLIDIFIED_EXPERIENCE("SolidifiedExperience", 40, 3, EntityCreature.class, EnumRarity.uncommon, ConfigBoolValues.EXPERIENCE_DROP.isEnabled(), "itemSolidifiedExperience"),
+    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(), "itemBloodFragment"),
+    BLOOD_FRAGMENT("BloodFragment", 15, 1, EntityCreature.class, EnumRarity.uncommon, ConfigBoolValues.BLOOD_DROP.isEnabled()),
-    HEART_PART("HeartPart", 5, 1, EntityCreature.class, EnumRarity.rare, ConfigBoolValues.HEART_DROP.isEnabled(), "itemHeartPart"),
+    HEART_PART("HeartPart", 5, 1, EntityCreature.class, EnumRarity.rare, ConfigBoolValues.HEART_DROP.isEnabled()),
-    UNKNOWN_SUBSTANCE("UnknownSubstance", 3, 1, EntitySkeleton.class, EnumRarity.epic, ConfigBoolValues.SUBSTANCE_DROP.isEnabled(), "itemUnknownSubstance"),
+    UNKNOWN_SUBSTANCE("UnknownSubstance", 3, 1, EntitySkeleton.class, EnumRarity.epic, ConfigBoolValues.SUBSTANCE_DROP.isEnabled()),
-    PEARL_SHARD("PearlShard", 30, 3, EntityEnderman.class, EnumRarity.epic, ConfigBoolValues.PEARL_SHARD_DROP.isEnabled(), "nuggetEnderpearl"),
+    PEARL_SHARD("PearlShard", 30, 3, EntityEnderman.class, EnumRarity.epic, ConfigBoolValues.PEARL_SHARD_DROP.isEnabled()),
-    EMERALD_SHARD("EmeraldShard", 30, 3, EntityCreeper.class, EnumRarity.rare, ConfigBoolValues.EMERALD_SHARD_CROP.isEnabled(), "nuggetEmerald");
+    EMERALD_SHARD("EmeraldShard", 30, 3, EntityCreeper.class, EnumRarity.rare, ConfigBoolValues.EMERALD_SHARD_CROP.isEnabled());
 
     public final String name;
-    public final String oredictName;
     public final int chance;
     public final int maxAmount;
     public final Class<? extends EntityCreature> dropFrom;
     public final boolean canDrop;
     public final EnumRarity rarity;
 
-    TheSpecialDrops(String name, int chance, int maxAmount, Class<? extends EntityCreature> dropFrom, EnumRarity rarity, boolean canDrop, String oredictName){
+    TheSpecialDrops(String name, int chance, int maxAmount, Class<? extends EntityCreature> dropFrom, EnumRarity rarity, boolean canDrop){
         this.name = name;
         this.chance = chance;
         this.rarity = rarity;
         this.maxAmount = maxAmount;
         this.dropFrom = dropFrom;
         this.canDrop = canDrop;
-        this.oredictName = oredictName;
     }
 
     @Override
     public String getName(){
         return this.name;
     }
-
-    @Override
-    public String getOredictName(){
-        return this.oredictName;
-    }
 }

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

@@ -127,8 +127,7 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{
         return name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return oredictName;
     }
 

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

@@ -68,8 +68,7 @@ public class ItemAxeAA extends ItemAxe implements INameableItem{
         return name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return oredictName;
     }
 }

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

@@ -68,8 +68,7 @@ public class ItemHoeAA extends ItemHoe implements INameableItem{
         return name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return this.oredictName;
     }
 }

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

@@ -68,8 +68,7 @@ public class ItemPickaxeAA extends ItemPickaxe implements INameableItem{
         return name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return oredictName;
     }
 }

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

@@ -68,8 +68,7 @@ public class ItemShovelAA extends ItemSpade implements INameableItem{
         return name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return oredictName;
     }
 }

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

@@ -68,8 +68,7 @@ public class ItemSwordAA extends ItemSword implements INameableItem{
         return name;
     }
 
-    @Override
+    private String getOredictName(){
-    public String getOredictName(){
         return oredictName;
     }
 }

src/main/java/ellpeck/actuallyadditions/network/sync/PacketSyncerToClient.java

@@ -69,6 +69,8 @@ public class PacketSyncerToClient implements IMessage{
     }
 
     public static void sendPacket(TileEntity tile){
-        PacketHandler.theNetwork.sendToAllAround(new PacketSyncerToClient(tile, ((IPacketSyncerToClient)tile).getValues()), new NetworkRegistry.TargetPoint(tile.getWorldObj().provider.dimensionId, tile.xCoord, tile.yCoord, tile.zCoord, 64));
+        if(tile instanceof IPacketSyncerToClient){
+            PacketHandler.theNetwork.sendToAllAround(new PacketSyncerToClient(tile, ((IPacketSyncerToClient)tile).getValues()), new NetworkRegistry.TargetPoint(tile.getWorldObj().provider.dimensionId, tile.xCoord, tile.yCoord, tile.zCoord, 64));
+        }
     }
 }

src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java

@@ -0,0 +1,71 @@
+package ellpeck.actuallyadditions.ore;
+
+import ellpeck.actuallyadditions.blocks.InitBlocks;
+import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
+import ellpeck.actuallyadditions.items.InitItems;
+import ellpeck.actuallyadditions.items.metalists.TheDusts;
+import ellpeck.actuallyadditions.items.metalists.TheFoods;
+import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
+import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
+import ellpeck.actuallyadditions.util.ModUtil;
+import net.minecraft.block.Block;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+public class InitOreDict{
+
+    public static void init(){
+        ModUtil.LOGGER.info("Initializing OreDictionary Entries...");
+
+        addOre(InitItems.itemDust, TheDusts.IRON.ordinal(), "dustIron");
+        addOre(InitItems.itemDust, TheDusts.GOLD.ordinal(), "dustGold");
+        addOre(InitItems.itemDust, TheDusts.DIAMOND.ordinal(), "dustDiamond");
+        addOre(InitItems.itemDust, TheDusts.EMERALD.ordinal(), "dustEmerald");
+        addOre(InitItems.itemDust, TheDusts.LAPIS.ordinal(), "dustLapis");
+        addOre(InitItems.itemDust, TheDusts.QUARTZ.ordinal(), "dustQuartz");
+        addOre(InitItems.itemDust, TheDusts.COAL.ordinal(), "dustCoal");
+        addOre(InitItems.itemDust, TheDusts.QUARTZ_BLACK.ordinal(), "dustQuartzBlack");
+
+        addOre(InitBlocks.blockMisc, TheMiscBlocks.ORE_QUARTZ.ordinal(), "oreQuartzBlack");
+
+        addOre(InitItems.itemCanolaSeed, "seedCanola");
+        addOre(InitItems.itemMisc, TheMiscItems.CANOLA.ordinal(), "cropCanola");
+
+        addOre(InitItems.itemRiceSeed, "seedRice");
+        addOre(InitItems.itemFoods, TheFoods.RICE.ordinal(), "cropRice");
+
+        addOre(InitItems.itemFlaxSeed, "seedFlax");
+        addOre(Items.string, "cropFlax");
+
+        addOre(InitItems.itemCoffeeSeed, "seedCoffee");
+        addOre(InitItems.itemCoffeeBean, "cropCoffee");
+
+        addOre(InitItems.itemMisc, TheMiscItems.RICE_SLIME.ordinal(), "slimeball");
+        addOre(InitBlocks.blockMisc, TheMiscBlocks.CHARCOAL_BLOCK.ordinal(), "blockCharcoal");
+
+        addOre(InitItems.itemSpecialDrop, TheSpecialDrops.EMERALD_SHARD.ordinal(), "nuggetEmerald");
+        addOre(InitItems.itemSpecialDrop, TheSpecialDrops.PEARL_SHARD.ordinal(), "nuggetEnderpearl");
+    }
+
+    private static void addOre(ItemStack stack, String name){
+        OreDictionary.registerOre(name, stack);
+    }
+
+    private static void addOre(Item item, int meta, String name){
+        addOre(new ItemStack(item, 1, meta), name);
+    }
+
+    private static void addOre(Item item, String name){
+        addOre(item, 0, name);
+    }
+
+    private static void addOre(Block block, int meta, String name){
+        addOre(new ItemStack(block, 1, meta), name);
+    }
+
+    private static void addOre(Block block, String name){
+        addOre(block, 0, name);
+    }
+}

src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java

@@ -68,6 +68,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
 
     public int slotToPutStart;
     private int lastPutStart;
+
     public int slotToPutEnd;
     private int lastPutEnd;
 
@@ -78,6 +79,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
 
     public int slotToPullStart;
     private int lastPullStart;
+
     public int slotToPullEnd;
     private int lastPullEnd;
 
@@ -87,6 +89,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
 
     public boolean isPullWhitelist = true;
     private boolean lastPullWhite;
+
     public boolean isPutWhitelist = true;
     private boolean lastPutWhite;
 

src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java

@@ -33,19 +33,19 @@ public class UpdateChecker{
         if(doneChecking && event.phase == TickEvent.Phase.END && Minecraft.getMinecraft().thePlayer != null && !notified){
             EntityPlayer player = Minecraft.getMinecraft().thePlayer;
             if(checkFailed){
-                player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal("info." + ModUtil.MOD_ID_LOWER + ".sendUpdate.failed.desc")));
+                player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal("info." + ModUtil.MOD_ID_LOWER + ".update.failed.desc")));
             }
             else if(onlineVersion.length() > 0){
                 int update = Integer.parseInt(onlineVersion.replace("-", "").replace(".", ""));
                 int client = Integer.parseInt(ModUtil.VERSION.replace("-", "").replace(".", ""));
 
                 if(update > client){
-                    String notice1 = "info." + ModUtil.MOD_ID_LOWER + ".sendUpdate.generic.desc";
+                    String notice1 = "info." + ModUtil.MOD_ID_LOWER + ".update.generic.desc";
-                    String notice2 = "info." + ModUtil.MOD_ID_LOWER + ".sendUpdate.versionComp.desc";
+                    String notice2 = "info." + ModUtil.MOD_ID_LOWER + ".update.versionComp.desc";
-                    String notice3 = "info." + ModUtil.MOD_ID_LOWER + ".sendUpdate.changelog.desc";
+                    String notice3 = "info." + ModUtil.MOD_ID_LOWER + ".update.changelog.desc";
-                    String notice4 = "info." + ModUtil.MOD_ID_LOWER + ".sendUpdate.download.desc";
+                    String notice4 = "info." + ModUtil.MOD_ID_LOWER + ".update.download.desc";
                     player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal(notice1)));
-                    player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocalFormatted(notice2, ModUtil.VERSION, this.onlineVersion)));
+                    player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocalFormatted(notice2, ModUtil.VERSION, onlineVersion)));
                     player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocalFormatted(notice3, changelog)));
                     player.addChatComponentMessage(IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocalFormatted(notice4, "http://minecraft.curseforge.com/mc-mods/228404-actually-additions/files")));
                 }
@@ -67,12 +67,12 @@ public class UpdateChecker{
         public void run(){
             ModUtil.LOGGER.info("Starting Update Check...");
             try{
-                URL newestURL = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/sendUpdate/newestVersion.txt");
+                URL newestURL = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/update/newestVersion.txt");
                 BufferedReader newestReader = new BufferedReader(new InputStreamReader(newestURL.openStream()));
                 onlineVersion = newestReader.readLine();
                 newestReader.close();
 
-                URL changeURL = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/sendUpdate/changelog.txt");
+                URL changeURL = new URL("https://raw.githubusercontent.com/Ellpeck/ActuallyAdditions/master/update/changelog.txt");
                 BufferedReader changeReader = new BufferedReader(new InputStreamReader(changeURL.openStream()));
                 changelog = changeReader.readLine();
                 changeReader.close();

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

@@ -4,9 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import ellpeck.actuallyadditions.creative.CreativeTab;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
-import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -43,31 +41,15 @@ public class BlockUtil{
 
     public static final ArrayList<Block> wailaRegisterList = new ArrayList<Block>();
 
-    public static void register(Block block, Class<? extends ItemBlock> itemBlock, boolean addTab, Enum[] list){
+    public static void register(Block block, Class<? extends ItemBlock> itemBlock, boolean addTab){
         block.setCreativeTab(addTab ? CreativeTab.instance : null);
         block.setBlockName(createUnlocalizedName(block));
         GameRegistry.registerBlock(block, itemBlock, ((INameableItem)block).getName());
-        if(list != null){
-            for(Enum current : list){
-                if(!((INameableItem)current).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)current).getOredictName(), new ItemStack(block, 1, current.ordinal()));
-            }
-        }
-        else{
-            if(!((INameableItem)block).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)block).getOredictName(), new ItemStack(block, 1, Util.WILDCARD));
-        }
 
         wailaRegisterList.add(block);
     }
 
-    public static void register(Block block, Class<? extends ItemBlock> itemBlock, Enum[] list){
-        register(block, itemBlock, true, list);
-    }
-
     public static void register(Block block, Class<? extends ItemBlock> itemBlock){
         register(block, itemBlock, true);
     }
-
-    public static void register(Block block, Class<? extends ItemBlock> itemBlock, boolean addTab){
-        register(block, itemBlock, addTab, null);
-    }
 }

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

@@ -4,6 +4,4 @@ public interface INameableItem{
 
     String getName();
 
-    String getOredictName();
-
 }

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

@@ -3,9 +3,7 @@ package ellpeck.actuallyadditions.util;
 import cpw.mods.fml.common.registry.GameRegistry;
 import ellpeck.actuallyadditions.creative.CreativeTab;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
-import net.minecraftforge.oredict.OreDictionary;
 
 import java.util.List;
 
@@ -32,25 +30,9 @@ public class ItemUtil{
     }
 
     public static void register(Item item, boolean addTab){
-        register(item, addTab, null);
-    }
-
-    public static void register(Item item, Enum[] list){
-        register(item, true, list);
-    }
-
-    public static void register(Item item, boolean addTab, Enum[] list){
         item.setCreativeTab(addTab ? CreativeTab.instance : null);
         item.setUnlocalizedName(createUnlocalizedName(item));
         GameRegistry.registerItem(item, ((INameableItem)item).getName());
-        if(list != null){
-            for(Enum current : list){
-                if(!((INameableItem)current).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)current).getOredictName(), new ItemStack(item, 1, current.ordinal()));
-            }
-        }
-        else{
-            if(!((INameableItem)item).getOredictName().isEmpty()) OreDictionary.registerOre(((INameableItem)item).getOredictName(), new ItemStack(item, 1, Util.WILDCARD));
-        }
     }
 
     public static String createUnlocalizedName(Item item){