Fix block breaking not rendering. Ready for alpha release.

Author: darkevilmac

project.gradle

@@ -5,7 +5,7 @@ ext {
     projectName = 'architecturecraft'
 
     useElytraVersionFormat = true
-    version = '1'
+    version = '2'
 
     concreteVersion = '0.3.2-SNAPSHOT'
     concreteModules = ['all']

src/main/java/com/elytradev/architecture/client/render/model/VertexBakedModel.java

@@ -30,6 +30,7 @@
 import com.elytradev.architecture.client.render.target.RenderTargetBaked;
 import com.elytradev.architecture.common.block.BlockArchitecture;
 import com.elytradev.architecture.common.helpers.Trans3;
+import com.elytradev.architecture.common.helpers.Utils;
 import com.google.common.collect.Lists;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -38,6 +39,7 @@
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.init.Blocks;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
@@ -137,7 +139,7 @@ public boolean isBuiltInRenderer() {
     public TextureAtlasSprite getParticleTexture() {
         // no blockstate param
         // TODO: Override default stuff in BlockArchitecture.
-        return null;
+        return Utils.getSpriteForBlockState(Blocks.PLANKS.getDefaultState());
     }
 
     @Override

src/main/java/com/elytradev/architecture/client/render/shape/ShapeRenderDispatch.java

@@ -65,6 +65,8 @@ public void renderShape(IBlockAccess world, BlockPos pos, RenderTargetBase targe
     }
 
     protected boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) {
+        if (layer == null)
+            return true;
         return state != null && state.getBlock().canRenderInLayer(state, layer);
     }
 
@@ -116,6 +118,8 @@ public void renderBlock(IBlockAccess world, BlockPos pos, IBlockState state, Ren
         if (TileShape.get(world, pos) != null) {
             TileShape te = TileShape.get(world, pos);
             Trans3 t2 = t.t(te.localToGlobalRotation());
+            renderPrimary = canRenderInLayer(te.baseBlockState, layer);
+            renderSecondary = canRenderInLayer(te.secondaryBlockState, layer);
             renderShapeTE(TileShape.get(world, pos), target, t2, renderPrimary, renderSecondary);
         }
     }

src/main/java/com/elytradev/architecture/client/render/target/RenderTargetBaked.java

@@ -24,8 +24,10 @@
 
 package com.elytradev.architecture.client.render.target;
 
+import com.elytradev.architecture.client.render.texture.TextureBase;
 import com.elytradev.architecture.common.ArchitectureMod;
 import com.elytradev.architecture.common.helpers.Vector3;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.*;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
@@ -154,7 +156,23 @@ public void endFace() {
             ++n;
         }
         prescrambleVertexColors(data);
-        quads.add(new BakedQuad(data, 0, EnumFacing.UP, null)); //FIXME I don't think there should be a null here    }
+        quads.add(new BakedQuad(data, 0, EnumFacing.UP, getActiveTexture())); //FIXME I don't think there should be a null here    }
+    }
+
+    private TextureAtlasSprite getActiveTexture() {
+        // Use missingno as a fallback
+        TextureAtlasSprite activeTexture = Minecraft.getMinecraft().getTextureMapBlocks().getMissingSprite();
+        if (texture instanceof TextureBase.Sprite) {
+            TextureBase.Sprite sprite = (TextureBase.Sprite) texture;
+            activeTexture = sprite.icon;
+        } else if (texture instanceof TextureBase.Proxy) {
+            TextureBase.Proxy proxySprite = (TextureBase.Proxy) texture;
+            if (proxySprite.base instanceof TextureBase.Sprite) {
+                activeTexture = ((TextureBase.Sprite) proxySprite.base).icon;
+            }
+        }
+
+        return activeTexture;
     }
 
     protected void dumpVertexData(int[] data, int n) {