Fixed bug exposed by EE3.

build.xml

@@ -19,7 +19,7 @@
 
 	<property name="mc.version" value="1.6.2"/>
 	<property name="forge.version" value="9.10.0.828"/>
-	<property name="project.version" value="0.1.0"/>
+	<property name="project.version" value="0.1.2"/>
 
 	<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip"/>
 

common/crazypants/enderio/EnderIO.java

@@ -28,6 +28,7 @@ import crazypants.enderio.conduit.liquid.ItemLiquidConduit;
 import crazypants.enderio.conduit.power.ItemPowerConduit;
 import crazypants.enderio.conduit.redstone.ItemRedstoneConduit;
 import crazypants.enderio.enderface.BlockEnderIO;
+import crazypants.enderio.enderface.EnderfaceRecipes;
 import crazypants.enderio.enderface.ItemEnderface;
 import crazypants.enderio.machine.BlockElectricLight;
 import crazypants.enderio.machine.MachineRecipes;
@@ -48,7 +49,7 @@ import crazypants.enderio.material.ItemIndustrialBinder;
 import crazypants.enderio.material.ItemYetaWrench;
 import crazypants.enderio.material.MaterialRecipes;
 
-@Mod(name = "EnderIO", modid = "EnderIO", version = "0.1.0", dependencies = "required-after:Forge@[7.1,);required-after:FML@[5.0.5,)")
+@Mod(name = "EnderIO", modid = "EnderIO", version = "0.1.2", dependencies = "required-after:Forge@[9.10.0.800,)")
 @NetworkMod(clientSideRequired = true, serverSideRequired = true, channels = { "EnderIO" }, packetHandler = PacketHandler.class)
 public class EnderIO {
 
@@ -152,6 +153,7 @@ public class EnderIO {
     NetworkRegistry.instance().registerGuiHandler(this, guiHandler);
     MinecraftForge.EVENT_BUS.register(this);
 
+    EnderfaceRecipes.addRecipes();
     MaterialRecipes.addRecipes();
     ConduitRecipes.addRecipes();
     MachineRecipes.addRecipes();

common/crazypants/enderio/conduit/liquid/ItemLiquidConduit.java

@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
 public class ItemLiquidConduit extends AbstractItemConduit {
 
   private static ItemConduitSubtype[] subtypes = new ItemConduitSubtype[] {
-    new ItemConduitSubtype(ModObject.itemLiquidConduit.unlocalisedName, ModObject.itemLiquidConduit.name, "enderio:ItemLiquidConduit"),        
+    new ItemConduitSubtype(ModObject.itemLiquidConduit.unlocalisedName, ModObject.itemLiquidConduit.name, "enderio:itemLiquidConduit"),        
   };
   
   public static ItemLiquidConduit create() {

common/crazypants/enderio/enderface/BlockEnderIO.java

@@ -40,9 +40,7 @@ public class BlockEnderIO extends Block implements ITileEntityProvider {
   private void init() {
     LanguageRegistry.addName(this, ModObject.blockEnderIo.name);
     GameRegistry.registerBlock(this, ModObject.blockEnderIo.unlocalisedName);
-    GameRegistry.registerTileEntity(TileEnderIO.class, ModObject.blockEnderIo.unlocalisedName + "TileEntity");
-    GameRegistry.addRecipe(new ItemStack(this), "zxz", "xyx", "zxz", 'x', new ItemStack(Item.eyeOfEnder), 'y', new ItemStack(Block.enderChest), 'z',
-        new ItemStack(Item.diamond));
+    GameRegistry.registerTileEntity(TileEnderIO.class, ModObject.blockEnderIo.unlocalisedName + "TileEntity");    
   }
 
   @Override

common/crazypants/enderio/enderface/EnderfaceRecipes.java

@@ -0,0 +1,17 @@
+package crazypants.enderio.enderface;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.GameRegistry;
+import crazypants.enderio.EnderIO;
+
+public class EnderfaceRecipes {
+  
+  public static void addRecipes() {
+    GameRegistry.addRecipe(new ItemStack(EnderIO.itemEnderface), " x ", "xyx", " x ", 'x', new ItemStack(Item.diamond), 'y', new ItemStack(Item.eyeOfEnder));
+    GameRegistry.addRecipe(new ItemStack(EnderIO.blockEnderIo), "zxz", "xyx", "zxz", 'x', new ItemStack(Item.eyeOfEnder), 'y', new ItemStack(Block.enderChest), 'z',
+        new ItemStack(Item.diamond));
+  }
+
+}

common/crazypants/enderio/enderface/ItemEnderface.java

@@ -38,8 +38,7 @@ public class ItemEnderface extends Item implements IGuiHandler {
   }
 
   protected void init() {
-    LanguageRegistry.addName(this, ModObject.itemEnderface.name);
-    GameRegistry.addRecipe(new ItemStack(this), " x ", "xyx", " x ", 'x', new ItemStack(Item.diamond), 'y', new ItemStack(Item.eyeOfEnder));
+    LanguageRegistry.addName(this, ModObject.itemEnderface.name);    
     GameRegistry.registerItem(this, ModObject.itemEnderface.unlocalisedName);
     EnderIO.guiHandler.registerGuiHandler(GuiHandler.GUI_ID_ENDERFACE, this);
   }

common/crazypants/enderio/machine/MachineRecipes.java

@@ -4,6 +4,7 @@ import static crazypants.enderio.ModObject.*;
 import net.minecraft.block.Block;
 import net.minecraft.item.*;
 import cpw.mods.fml.common.registry.GameRegistry;
+import crazypants.enderio.EnderIO;
 import crazypants.enderio.ModObject;
 import crazypants.enderio.material.Alloy;
 
@@ -20,6 +21,7 @@ public class MachineRecipes {
     ItemStack red = new ItemStack(Item.dyePowder, 1, 1);
     ItemStack green = new ItemStack(Item.dyePowder, 1, 2);
     ItemStack blue = new ItemStack(Item.dyePowder, 1, 4);
+    //System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! MachineRecipes.addRecipes: Adding painter recipe with output for item stack of " + painter.itemID);
     GameRegistry.addShapedRecipe(painter, "bbb", "RGB", "bcb", 'b', industialBinder, 'R', red, 'G', green, 'B', blue, 'c', capacitor);
 
     ItemStack reservoir = new ItemStack(blockReservoir.actualId, 1, 0);

common/crazypants/enderio/machine/painter/BlockPainter.java

@@ -25,13 +25,6 @@ public class BlockPainter extends AbstractMachineBlock<TileEntityPainter> {
     super(ModObject.blockPainter, TileEntityPainter.class);
   }
 
-  @Override
-  protected void init() {
-    super.init();
-    GameRegistry.addRecipe(new ItemStack(this), "bbb", "iri", "bbb", 'i', new ItemStack(Item.ingotIron), 'r', new ItemStack(Item.redstone), 'b', new ItemStack(
-        ModObject.itemIndustrialBinder.id, 1, 0));
-  }
-
   @Override
   public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
     // The server needs the container as it manages the adding and removing of