Reimplented connected textures with jsons

- Reimplented connected glass textures using jsons. @shartte can't be
done with jsons, huh?

src/main/java/appeng/decorative/solid/BlockQuartzGlass.java

@@ -22,6 +22,8 @@ package appeng.decorative.solid;
 import java.util.EnumSet;
 
 import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
@@ -30,11 +32,18 @@ import net.minecraft.world.IBlockAccess;
 
 import appeng.block.AEBaseBlock;
 import appeng.core.features.AEFeature;
-import appeng.helpers.AEGlassMaterial;
 
 
 public class BlockQuartzGlass extends AEBaseBlock
 {
+
+	public static final PropertyBool[] props = { PropertyBool.create( "down" ), PropertyBool.create( "up" ), PropertyBool.create( "north" ), PropertyBool.create( "south" ), PropertyBool.create( "west" ), PropertyBool.create( "east" ) };
+
+	private static boolean isGlassBlock( IBlockAccess world, BlockPos pos, EnumFacing facing )
+	{
+		return world.getBlockState( pos.offset( facing ) ).getBlock() instanceof BlockQuartzGlass;
+	}
+
 	public BlockQuartzGlass()
 	{
 		super( Material.GLASS );
@@ -43,9 +52,26 @@ public class BlockQuartzGlass extends AEBaseBlock
 		this.setFeature( EnumSet.of( AEFeature.DecorativeQuartzBlocks ) );
 	}
 
-	private static boolean isGlassBlock( IBlockAccess world, BlockPos pos, EnumFacing facing )
+	@Override
+	protected IProperty[] getAEStates()
 	{
-		return world.getBlockState( pos.offset( facing ) ).getBlock() instanceof BlockQuartzGlass;
+		return props;
+	}
+
+	@Override
+	public int getMetaFromState( IBlockState state )
+	{
+		return 0;
+	}
+
+	@Override
+	public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
+	{
+		for( EnumFacing facing : EnumFacing.values() )
+		{
+			state = state.withProperty( props[facing.ordinal()], isGlassBlock( world, pos, facing ) );
+		}
+		return state;
 	}
 
 	@Override
@@ -57,15 +83,7 @@ public class BlockQuartzGlass extends AEBaseBlock
 	@Override
 	public boolean shouldSideBeRendered( final IBlockState state, final IBlockAccess w, final BlockPos pos, final EnumFacing side )
 	{
-		final Material mat = w.getBlockState( pos ).getBlock().getMaterial( state );
-		if( mat == Material.GLASS || mat == AEGlassMaterial.INSTANCE )
-		{
-			if( w.getBlockState( pos ).getBlock().getRenderType( state ) == this.getRenderType( state ) )
-			{
-				return false;
-			}
-		}
-		return super.shouldSideBeRendered( state, w, pos, side );
+		return !isGlassBlock( w, pos, side ) && super.shouldSideBeRendered( state, w, pos, side );
 	}
 
 	@Override

src/main/resources/assets/appliedenergistics2/blockstates/quartz_glass.json

@@ -1,7 +1,31 @@
 {
-    "variants": {
-        "normal": {
-            "model": "appliedenergistics2:quartz"
+    "multipart": [
+        {
+            "apply": [{ "model": "appliedenergistics2:quartz_glass_1" }, { "model": "appliedenergistics2:quartz_glass_2" }, { "model": "appliedenergistics2:quartz_glass_3" }, { "model": "appliedenergistics2:quartz_glass_4" }]
+        },
+        {
+            "when": { "down": "false" },
+            "apply": { "model": "appliedenergistics2:quartz_glass_frame", "x": 90 }
+        },
+        {
+            "when": { "up": "false" },
+            "apply": { "model": "appliedenergistics2:quartz_glass_frame", "x": -90 }
+        },
+        {
+            "when": { "north": "false" },
+            "apply": { "model": "appliedenergistics2:quartz_glass_frame"}
+        },
+        {
+            "when": { "south": "false" },
+            "apply": { "model": "appliedenergistics2:quartz_glass_frame", "y": 180 }
+        },
+        {
+            "when": { "west": "false" },
+            "apply": { "model": "appliedenergistics2:quartz_glass_frame", "y": -90 }
+        },
+        {
+            "when": { "east": "false" },
+            "apply": { "model": "appliedenergistics2:quartz_glass_frame", "y": 90 }
         }
-    }
-}
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/block/quartz_glass.json

@@ -1,6 +0,0 @@
-{
-    "parent": "block/cube_all",
-    "textures": {
-        "all": "appliedenergistics2:blocks/quartz_ore"
-    }
-}

src/main/resources/assets/appliedenergistics2/models/block/quartz_glass_1.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:blocks/quartz_glass_1"
+    }
+}

src/main/resources/assets/appliedenergistics2/models/block/quartz_glass_2.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:blocks/quartz_glass_2"
+    }
+}

src/main/resources/assets/appliedenergistics2/models/block/quartz_glass_3.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:blocks/quartz_glass_3"
+    }
+}

src/main/resources/assets/appliedenergistics2/models/block/quartz_glass_4.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "appliedenergistics2:blocks/quartz_glass_4"
+    }
+}

src/main/resources/assets/appliedenergistics2/models/block/quartz_glass_frame.json

@@ -0,0 +1,18 @@
+{
+    "textures": {
+        "0": "appliedenergistics2:blocks/quartz_glass_frame"
+    },
+    "elements": [
+        {
+            "name": "Frame",
+            "from": [ 0.0, 0.0, 0.0 ], 
+            "to": [ 16.0, 16.0, 1.0 ], 
+            "faces": {
+                "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ], "cullface": "east" },
+                "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 16.0 ], "cullface": "west" },
+                "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ], "cullface": "up" },
+                "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ], "cullface": "down" }
+            }
+        }
+    ]
+}

src/main/resources/assets/appliedenergistics2/models/item/quartz_glass.json

@@ -1,6 +1,6 @@
 {
     "parent": "block/cube_all",
     "textures": {
-        "all": "appliedenergistics2:items/quartz_glass"
+        "all": "appliedenergistics2:blocks/quartz_glass"
     }
 }

src/main/resources/assets/appliedenergistics2/textures/blocks/quartz_glass.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 100
+  }
+}