From eb6f7832b8c32e77c84e1549e4892d0b0c41fdfb Mon Sep 17 00:00:00 2001
From: Krapht <kraphteu@gmail.com>
Date: Fri, 22 Mar 2013 21:52:35 +0100
Subject: [PATCH] Update forge to 604 Revert Sengir's build.xml Fix Icon
 registration in Core to use the Item atlas

---
 build.xml                             | 4 ++--
 buildcraft_resources/build.xml        | 4 ++--
 common/buildcraft/BuildCraftCore.java | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 979dfd11..5a8807b3 100644
--- a/build.xml
+++ b/build.xml
@@ -18,8 +18,8 @@
 	<property name="mcpsrc.dir" value="${mcp.dir}/src"/>
 
 	<property name="mc.version" value="1.5.1"/>
-	<property name="forge.version" value="7.7.0.600"/>
-	<property name="project.version" value="3.5a"/>
+	<property name="forge.version" value="7.7.0.604"/>
+	<property name="project.version" value="3.4.3"/>
 
 	<property name="forge.name" value="minecraftforge-src-${mc.version}-${forge.version}.zip"/>
 
diff --git a/buildcraft_resources/build.xml b/buildcraft_resources/build.xml
index 1ed2985f..65fad00c 100644
--- a/buildcraft_resources/build.xml
+++ b/buildcraft_resources/build.xml
@@ -16,8 +16,8 @@
     <property name="clientsrc.dir"       value="${mcp.dir}/src/minecraft"/>
           
 	<property name="mc.version"			 value="1.4.7"/>
-    <property name="forge.version"		 value="7.7.0.600"/>
-    <property name="bc.version"          value="3.5a"/>
+    <property name="forge.version"		 value="6.6.0.507"/>
+    <property name="bc.version"          value="3.4.4fc"/>
     <property name="bc.version.full"     value="${bc.version}"/>
     
     <echo message="Starting build for ${bc.version.full}"/>
diff --git a/common/buildcraft/BuildCraftCore.java b/common/buildcraft/BuildCraftCore.java
index 363ed1a9..562eb79f 100644
--- a/common/buildcraft/BuildCraftCore.java
+++ b/common/buildcraft/BuildCraftCore.java
@@ -14,6 +14,7 @@ import java.util.logging.Logger;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFluid;
+import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandHandler;
 import net.minecraft.entity.EntityList;
 import net.minecraft.item.Item;
@@ -320,11 +321,11 @@ public class BuildCraftCore {
 	@ForgeSubscribe
 	@SideOnly(Side.CLIENT)
 	public void textureHook(TextureStitchEvent.Pre event){
-		//if ("items".equals(event.map.field_94253_b)){
+		if (event.map == Minecraft.getMinecraft().renderEngine.textureMapItems) {
+		//if (event.map.textureType == 1) { 'TODO Replace above
 			iconProvider = new CoreIconProvider();
 			iconProvider.registerIcons(event.map);
-		//}
-		//TODO: this needs un-privating in TextureMap
+		}
 	}
 
 	public void loadRecipes() {