From 311ca8866ef528ca378d313589928dc4092348e8 Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Thu, 10 May 2012 00:07:46 -0400
Subject: [PATCH] Fix up build script a bit, all modloader is public, and fix
 tile entity renderer

---
 fml/build.xml                                   | 17 +++++++++++++++++
 fml/client/net/minecraft/src/ModLoader.java     | 14 +++++++-------
 .../minecraft/src/TileEntityRenderer.java.patch |  3 ++-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index 886831da2e..cbd0313427 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -160,6 +160,8 @@
     <zip destfile="${basedir}/target/${jarname}.zip">
       <zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt" prefix="fml" />
       <zipfileset dir="${common.src.dir}" includes="**/*.java" excludes="**/Loader.java" prefix="fml/src/minecraft_server" />
+      <zipfileset dir="${common.src.dir}" includes="**/*.java" excludes="**/Loader.java" prefix="fml/src/minecraft" />
+      <zipfileset dir="${client.src.dir}" includes="**/*.java" prefix="fml/src/minecraft" />
       <zipfileset dir="${server.src.dir}" includes="**/*.java" prefix="fml/src/minecraft_server" />
       <zipfileset dir="${patch.src.dir}" includes="**/*.patch" prefix="fml/patches" />
       <mappedresources>
@@ -177,6 +179,21 @@
         </concat>
         <mergemapper to="fml/src/minecraft_server/cpw/mods/fml/common/Loader.java" />
       </mappedresources>
+        <mappedresources>
+          <concat>
+            <fileset dir="${common.src.dir}" includes="cpw/mods/fml/common/Loader.java" />
+            <filterchain>
+              <replacetokens>
+                <token key="MAJOR" value="${version.major}" />
+                <token key="MINOR" value="${version.minor}" />
+                <token key="REV" value="${version.rev}" />
+                <token key="BUILD" value="${version.build}" />
+                <token key="MCVERSION" value="${version.minecraft}" />
+              </replacetokens>
+            </filterchain>
+          </concat>
+          <mergemapper to="fml/src/minecraft/cpw/mods/fml/common/Loader.java" />
+        </mappedresources>
       <mappedresources>
         <concat>
           <fileset dir="${basedir}/install" includes="README.txt" />
diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java
index 35b425e8be..98fd34c216 100644
--- a/fml/client/net/minecraft/src/ModLoader.java
+++ b/fml/client/net/minecraft/src/ModLoader.java
@@ -500,7 +500,7 @@ public class ModLoader
     }
 
     @Deprecated
-    static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world)
+    public static void populateChunk(IChunkProvider generator, int chunkX, int chunkZ, World world)
     {
     }
 
@@ -523,7 +523,7 @@ public class ModLoader
     }
 
     @Deprecated
-    static void registerAllTextureOverrides(RenderEngine cache)
+    public static void registerAllTextureOverrides(RenderEngine cache)
     {
     }
 
@@ -604,7 +604,7 @@ public class ModLoader
         CommonRegistry.registerTileEntity(tileEntityClass, id);
     }
 
-    static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer)
+    public static void registerTileEntity(Class<? extends TileEntity> tileEntityClass, String id, TileEntitySpecialRenderer renderer)
     {
         ClientRegistry.instance().registerTileEntity(tileEntityClass, id, renderer);
     }
@@ -665,18 +665,18 @@ public class ModLoader
         CommonRegistry.removeSpawn(entityName, spawnList, biomes);
     }
 
-    static boolean renderBlockIsItemFull3D(int modelID)
+    public static boolean renderBlockIsItemFull3D(int modelID)
     {
         //TODO
         return false;
     }
 
-    static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
+    public static void renderInvBlock(RenderBlocks renderer, Block block, int metadata, int modelID)
     {
         //TODO
     }
 
-    static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
+    public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
     {
         //TODO
         return false;
@@ -702,7 +702,7 @@ public class ModLoader
         //TODO
     }
 
-    static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
+    public static void serverLogin(NetClientHandler handler, Packet1Login loginPacket)
     {
         //TODO
     }
diff --git a/fml/patches/minecraft/net/minecraft/src/TileEntityRenderer.java.patch b/fml/patches/minecraft/net/minecraft/src/TileEntityRenderer.java.patch
index e18a73bf95..26be109dda 100644
--- a/fml/patches/minecraft/net/minecraft/src/TileEntityRenderer.java.patch
+++ b/fml/patches/minecraft/net/minecraft/src/TileEntityRenderer.java.patch
@@ -1,11 +1,12 @@
 --- ../src-base/minecraft/net/minecraft/src/TileEntityRenderer.java	0000-00-00 00:00:00.000000000 -0000
 +++ ../src-work/minecraft/net/minecraft/src/TileEntityRenderer.java	0000-00-00 00:00:00.000000000 -0000
-@@ -124,4 +124,8 @@
+@@ -124,4 +124,9 @@
      {
          return this.field_1541_n;
      }
 +    
 +    public static void setTileEntityRenderer(Class<? extends TileEntity> tileEntityClass, TileEntitySpecialRenderer renderer) {
 +        field_1554_a.field_6517_m.put(tileEntityClass,renderer);
++        renderer.func_928_a(field_1554_a);
 +    }
  }