From 17f5c82fefa31be1477ef70d616b8ae0d17bac3e Mon Sep 17 00:00:00 2001
From: Robert <rseifert.phone@gmail.com>
Date: Mon, 11 Nov 2013 12:23:48 -0500
Subject: [PATCH] Worked on some crafting

---
 src/dark/api/fluid/AdvancedFluidEvent.java | 34 ----------------------
 src/dark/fluid/common/FMRecipeLoader.java  |  5 ++--
 2 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 src/dark/api/fluid/AdvancedFluidEvent.java

diff --git a/src/dark/api/fluid/AdvancedFluidEvent.java b/src/dark/api/fluid/AdvancedFluidEvent.java
deleted file mode 100644
index 7a301cc2..00000000
--- a/src/dark/api/fluid/AdvancedFluidEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package dark.api.fluid;
-
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidEvent;
-import net.minecraftforge.fluids.FluidStack;
-import universalelectricity.core.vector.Vector3;
-
-public class AdvancedFluidEvent extends FluidEvent
-{
-
-    public AdvancedFluidEvent(FluidStack fluid, World world, Vector3 vec)
-    {
-        super(fluid, world, vec.intX(), vec.intY(), vec.intZ());
-    }
-
-    /** Mods should fire this event two different fluids try to merge */
-    public static class FluidMergeEvent extends AdvancedFluidEvent
-    {
-        FluidStack mergeFluid;
-
-        public FluidMergeEvent(FluidStack fluid, FluidStack merge, World world, Vector3 vec)
-        {
-            super(fluid, world, vec);
-            this.mergeFluid = merge;
-        }
-    }
-
-    public static final void fireEvent(AdvancedFluidEvent event)
-    {
-        MinecraftForge.EVENT_BUS.post(event);
-    }
-
-}
diff --git a/src/dark/fluid/common/FMRecipeLoader.java b/src/dark/fluid/common/FMRecipeLoader.java
index c40ff987..0ea2918d 100644
--- a/src/dark/fluid/common/FMRecipeLoader.java
+++ b/src/dark/fluid/common/FMRecipeLoader.java
@@ -3,6 +3,7 @@ package dark.fluid.common;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.ShapelessRecipes;
 import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -48,7 +49,7 @@ public class FMRecipeLoader extends RecipeLoader
         // release valve
         GameRegistry.addRecipe(new ItemStack(blockReleaseValve, 1), new Object[] { "RPR", "PVP", "RPR", 'P', new ItemStack(blockPipe, 1), 'V', new ItemStack(CoreRecipeLoader.itemParts, 1, Parts.Valve.ordinal()), 'R', Item.redstone });
         // sink
-        GameRegistry.addRecipe(new ItemStack(blockSink, 1), new Object[] { "I I", "SIS", "SPS", 'P', new ItemStack(blockPipe, 1), 'I', Item.ingotIron, 'S', Block.stone });
+        //GameRegistry.addRecipe(new ItemStack(blockSink, 1), new Object[] { "I I", "SIS", "SPS", 'P', new ItemStack(blockPipe, 1), 'I', Item.ingotIron, 'S', Block.stone });
     }
 
     public void registerTanks()
@@ -83,7 +84,7 @@ public class FMRecipeLoader extends RecipeLoader
             for (ColorCode color : ColorCode.values())
             {
                 GameRegistry.addRecipe(mat.getStack(color), new Object[] { " X ", "XIX", " X ", 'I', new ItemStack(Item.dyePowder, 1, color.ordinal()), 'X', blockPipe });
-                new RecipeGrid(mat.getStack(), 1, 1).setRowOne(mat.getStack(color)).RegisterRecipe();
+                GameRegistry.addShapelessRecipe(mat.getStack(), new Object[]{mat.getStack(color)});
             }
 
         }