diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java
index 60d4766c86..96beb91b2f 100644
--- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java
+++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java
@@ -141,9 +141,9 @@ public class VertexLighterFlat extends QuadGatheringTransformer
                     case POSITION:
                         float[] pos = new float[4];
                         System.arraycopy(position[v], 0, pos, 0, position[v].length);
-                        pos[0] += (blockInfo.getBlockPos().getX() & 0xF);
-                        pos[1] += (blockInfo.getBlockPos().getY() & 0xF);
-                        pos[2] += (blockInfo.getBlockPos().getZ() & 0xF);
+                        pos[0] += blockInfo.getBlockPos().getX();
+                        pos[1] += blockInfo.getBlockPos().getY();
+                        pos[2] += blockInfo.getBlockPos().getZ();
                         parent.put(e, pos);
                         break;
                     case NORMAL: if(normalIndex != -1)
diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/WorldRendererConsumer.java b/src/main/java/net/minecraftforge/client/model/pipeline/WorldRendererConsumer.java
index fdee4c8334..2e9ee09aa2 100644
--- a/src/main/java/net/minecraftforge/client/model/pipeline/WorldRendererConsumer.java
+++ b/src/main/java/net/minecraftforge/client/model/pipeline/WorldRendererConsumer.java
@@ -36,7 +36,7 @@ public class WorldRendererConsumer implements IVertexConsumer
             if(v == 4)
             {
                 renderer.addVertexData(quadData);
-                renderer.checkAndGrow();
+                renderer.putPosition(0, 0, 0);
                 Arrays.fill(quadData, 0);
                 v = 0;
             }
diff --git a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java b/src/test/java/net/minecraftforge/debug/ItemTileDebug.java
index 7c2668c654..cfee7269dd 100644
--- a/src/test/java/net/minecraftforge/debug/ItemTileDebug.java
+++ b/src/test/java/net/minecraftforge/debug/ItemTileDebug.java
@@ -2,11 +2,8 @@ package net.minecraftforge.debug;
 
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.client.resources.model.IBakedModel;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
@@ -16,13 +13,11 @@ import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.event.ModelBakeEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.debug.ModelBakeEventDebug.BakeEventHandler;
-import net.minecraftforge.debug.ModelBakeEventDebug.ClientProxy;
-import net.minecraftforge.debug.ModelBakeEventDebug.CustomModel;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -41,6 +36,9 @@ public class ItemTileDebug
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) { proxy.preInit(event); }
 
+    @EventHandler
+    public void init(FMLInitializationEvent event) { proxy.init(event); }
+
     public static class CommonProxy
     {
         public void preInit(FMLPreInitializationEvent event)
@@ -48,6 +46,8 @@ public class ItemTileDebug
             GameRegistry.registerBlock(TestBlock.instance, TestBlock.name);
             GameRegistry.registerTileEntity(CustomTileEntity.class, MODID.toLowerCase() + ":custom_tile_entity");
         }
+
+        public void init(FMLInitializationEvent event) {}
     }
 
     public static class ClientProxy extends CommonProxy
@@ -58,12 +58,16 @@ public class ItemTileDebug
         public void preInit(FMLPreInitializationEvent event)
         {
             super.preInit(event);
-            ClientRegistry.bindTileEntitySpecialRenderer(CustomTileEntity.class, TestTESR.instance);
             Item item = Item.getItemFromBlock(TestBlock.instance);
             ForgeHooksClient.registerTESRItemStack(item, 0, CustomTileEntity.class);
             ModelLoader.setCustomModelResourceLocation(item, 0, itemLocation);
             MinecraftForge.EVENT_BUS.register(BakeEventHandler.instance);
         }
+
+        @Override
+        public void init(FMLInitializationEvent event) {
+            ClientRegistry.bindTileEntitySpecialRenderer(CustomTileEntity.class, TestTESR.instance);
+        }
     }
 
     public static class BakeEventHandler