Update BlockRender API to be more flexible.

Author: Fox2Code

loader/src/main/java/com/fox2code/foxloader/client/BlockRender.java

@@ -23,6 +23,7 @@
  */
 package com.fox2code.foxloader.client;
 
+import net.minecraft.client.renderer.world.RenderBlocks;
 import net.minecraft.common.block.Block;
 import net.minecraft.common.world.BlockAccess;
 
@@ -34,7 +35,7 @@ public BlockRender(boolean renderItemIn3D) {
         this.renderItemIn3D = renderItemIn3D;
     }
 
-    public abstract boolean renderBlock(BlockAccess blockAccess, Block block, int x, int y, int z);
+    public abstract boolean renderBlock(RenderBlocks renderBlocks, BlockAccess blockAccess, Block block, int x, int y, int z);
 
     public final int getAssignedID() {
         return this.assignedID;

loader/src/main/java/com/fox2code/foxloader/client/BlockRenderManager.java

@@ -23,6 +23,7 @@
  */
 package com.fox2code.foxloader.client;
 
+import net.minecraft.client.renderer.world.RenderBlocks;
 import net.minecraft.common.block.Block;
 import net.minecraft.common.world.BlockAccess;
 
@@ -53,12 +54,12 @@ public static void registerBlockRender(BlockRender blockRender) {
     }
 
     public static final class Internal {
-        public static boolean renderBlockByType(BlockAccess blockAccess, Block block, int x, int y, int z, int renderType) {
+        public static boolean renderBlockByType(RenderBlocks renderBlocks, BlockAccess blockAccess, Block block, int x, int y, int z, int renderType) {
             if (renderType < FL_INITIAL_ID || renderType > FL_MAX_ID) {
                 return false;
             }
             BlockRender blockRender = blockRenders[renderType - FL_INITIAL_ID];
-            return blockRender != null && blockRender.renderBlock(blockAccess, block, x, y, z);
+            return blockRender != null && blockRender.renderBlock(renderBlocks, blockAccess, block, x, y, z);
         }
 
         public static boolean renderItemIn3D(int renderType) {

patching/src/main/java/com/fox2code/foxloader/patching/game/RenderPatch.java

@@ -75,6 +75,7 @@ private static void patchRenderBlocks(ClassNode classNode) {
         FieldNode blockAccess = TransformerUtils.getField(classNode, "blockAccess");
         InsnList renderBlockByRenderTypeFLX = new InsnList();
         renderBlockByRenderTypeFLX.add(new VarInsnNode(ALOAD, 0));
+        renderBlockByRenderTypeFLX.add(new VarInsnNode(ALOAD, 0));
         renderBlockByRenderTypeFLX.add(new FieldInsnNode(GETFIELD,
                 RenderBlocks, blockAccess.name, blockAccess.desc));
         renderBlockByRenderTypeFLX.add(new VarInsnNode(ALOAD, 1));
@@ -84,7 +85,7 @@ private static void patchRenderBlocks(ClassNode classNode) {
         renderBlockByRenderTypeFLX.add(new VarInsnNode(ILOAD, 5));
         renderBlockByRenderTypeFLX.add(new MethodInsnNode(INVOKESTATIC,
                 BlockRenderManager$Internal, "renderBlockByType",
-                "(L" + BlockAccess + ";L" + Block + ";IIII)Z"));
+                "(L" + RenderBlocks + ";L" + BlockAccess + ";L" + Block + ";IIII)Z"));
         renderBlockByRenderTypeFLX.add(new InsnNode(IRETURN));
         insertDefaultSwitchCodeTail(renderBlockByRenderType, renderBlockByRenderTypeFLX);
     }