From 639062693fc7c68ce56b959961c776f338c88297 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Tue, 30 Jun 2015 01:58:33 +0200
Subject: [PATCH] -Fixed some Oredict stuff

---
 src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java | 2 ++
 .../ellpeck/actuallyadditions/crafting/GrinderCrafting.java    | 1 +
 .../java/ellpeck/actuallyadditions/crafting/ItemCrafting.java  | 3 ++-
 .../java/ellpeck/actuallyadditions/items/ItemResonantRice.java | 2 +-
 .../actuallyadditions/recipe/GrinderRecipeAutoRegistry.java    | 2 +-
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
index 7f2e1e7c5..ce04e4379 100644
--- a/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
+++ b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java
@@ -91,8 +91,10 @@ public class ActuallyAdditions{
 
     @EventHandler
     public void serverStarting(FMLServerStartingEvent event){
+
         BlockDispenser.dispenseBehaviorRegistry.putObject(InitItems.itemBucketCanolaOil, new DispenserHandlerEmptyBucket());
         BlockDispenser.dispenseBehaviorRegistry.putObject(InitItems.itemBucketOil, new DispenserHandlerEmptyBucket());
         BlockDispenser.dispenseBehaviorRegistry.putObject(InitItems.itemFertilizer, new DispenserHandlerFertilize());
+
     }
 }
diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java
index 938af8d54..e5c2cb6ee 100644
--- a/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java
+++ b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java
@@ -15,6 +15,7 @@ public class GrinderCrafting{
 
     public static void init(){
         Util.logInfo("Initializing Crusher Recipes...");
+        GrinderRecipeManualRegistry.recipes.clear();
 
         GrinderRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 10));
         GrinderRecipeManualRegistry.registerRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(InitItems.itemDust, 12, TheDusts.LAPIS.ordinal()));
diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java
index 076feb3d5..681c79474 100644
--- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java
+++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java
@@ -15,6 +15,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.IPlantable;
+import net.minecraftforge.oredict.OreDictionary;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 
@@ -192,7 +193,7 @@ public class ItemCrafting{
         }
 
         //Resonant Rice
-        if(ConfigCrafting.RESONANT_RICE.isEnabled())
+        if(ConfigCrafting.RESONANT_RICE.isEnabled() && !OreDictionary.getOres("nuggetEnderium", false).isEmpty())
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(InitItems.itemResonantRice),
                     TheFoods.RICE.getOredictName(), "nuggetEnderium", Items.gunpowder));
 
diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java
index b1f1eff50..d9f56474f 100644
--- a/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java
+++ b/src/main/java/ellpeck/actuallyadditions/items/ItemResonantRice.java
@@ -36,7 +36,7 @@ public class ItemResonantRice extends Item implements INameableItem{
     @SideOnly(Side.CLIENT)
     public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) {
         ItemUtil.addInformation(this, list, 1, "");
-        if(KeyUtil.isShiftPressed() && OreDictionary.getOres("nuggetEnderium", false).size() <= 0) list.add(StringUtil.RED + StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".itemResonantRice.uncraftable.desc"));
+        if(KeyUtil.isShiftPressed() && OreDictionary.getOres("nuggetEnderium", false).isEmpty()) list.add(StringUtil.RED + StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".itemResonantRice.uncraftable.desc"));
     }
 
     @Override
diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeAutoRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeAutoRegistry.java
index d0415530f..0736f6a23 100644
--- a/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeAutoRegistry.java
+++ b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeAutoRegistry.java
@@ -27,7 +27,7 @@ public class GrinderRecipeAutoRegistry{
     public static void registerFinally(){
         String[] names = OreDictionary.getOreNames();
         for(String inputName : names){
-
+            
             if(!exceptions.contains(inputName)){
                 int resultAmount = 1;
                 String inputNameWithoutPrefix = null;