New cells models (#227)

new cells

.github/workflows/build.yml

@@ -0,0 +1,25 @@
+name: Build mod
+
+on: [ push, pull_request, workflow_dispatch ]
+
+jobs:
+  build:
+    name: Build mod
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'adopt'
+        java-version: '8'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew -Pnet.minecraftforge.gradle.disableUpdateChecker=true build
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: appliedenergistics2
+        path: build/libs

.github/workflows/lock.yml

@@ -1,15 +0,0 @@
-name: 'Lock threads'
-
-on:
-  schedule:
-    - cron: '0 0 * * *'
-
-jobs:
-  lock:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v2
-        with:
-          github-token: ${{ github.token }}
-          issue-lock-inactive-days: '180'
-          pr-lock-inactive-days: '180'

src/main/java/appeng/client/render/model/DriveBakedModel.java

@@ -18,7 +18,6 @@
 
 package appeng.client.render.model;
 
-
 import appeng.block.storage.BlockDrive;
 import appeng.block.storage.DriveSlotState;
 import appeng.block.storage.DriveSlotsState;
@@ -39,7 +38,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-
 public class DriveBakedModel implements IBakedModel {
     private final IBakedModel bakedBase;
     private final Map<DriveSlotState, IBakedModel> bakedCells;
@@ -72,9 +70,10 @@ public class DriveBakedModel implements IBakedModel {
                     Matrix4f transform = new Matrix4f();
                     transform.setIdentity();
 
-                    // Position this drive model copy at the correct slot. The transform is based on the
+                    // Position this drive model copy at the correct slot. The transform is based on
+                    // the
                     // cell-model being in slot 0,0 at the top left of the drive.
-                    float xOffset = -col * 7 / 16.0f;
+                    float xOffset = -col * 8 / 16.0f;
                     float yOffset = -row * 3 / 16.0f;
 
                     transform.setTranslation(new Vector3f(xOffset, yOffset, 0));

src/main/resources/assets/appliedenergistics2/models/block/chest/base.json

@@ -1,122 +1,109 @@
 {
-	"credit": "Made with Blockbench",
-	"textures": {
-		"up": "appliedenergistics2:blocks/chest/top",
-		"down": "appliedenergistics2:blocks/chest/bottom",
-		"north": "appliedenergistics2:blocks/chest/front",
-		"particle": "appliedenergistics2:blocks/chest/side",
-		"east": "appliedenergistics2:blocks/chest/side"
-	},
-	"elements": [
-		{
-			"name": "inside_border_right",
-			"from": [4, 3, 0],
-			"to": [5, 8, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [8, 13, 1]},
-			"faces": {
-				"east": {"uv": [0, 6, 1, 11], "rotation": 180, "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_right",
-			"from": [2, 1, 1],
-			"to": [5, 12, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 3]},
-			"faces": {
-				"east": {"uv": [5, 2, 14, 13], "texture": "#down"}
-			}
-		},
-		{
-			"from": [0, 0, 0],
-			"to": [16, 16, 16],
-			"faces": {
-				"north": {"uv": [0, 0, 16, 16], "texture": "#north"},
-				"east": {"uv": [0, 0, 16, 16], "texture": "#east"},
-				"south": {"uv": [0, 0, 16, 16], "texture": "#east"},
-				"west": {"uv": [0, 0, 16, 16], "texture": "#east"},
-				"up": {"uv": [0, 0, 16, 16], "texture": "#up"},
-				"down": {"uv": [0, 0, 16, 16], "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_back",
-			"from": [5, 4, 7],
-			"to": [11, 7, 10],
-			"rotation": {"angle": 0, "axis": "y", "origin": [19, 11, 8]},
-			"faces": {
-				"north": {"uv": [3, 2, 14, 14], "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_left",
-			"from": [11, 1, 1],
-			"to": [14, 12, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [18, 11, 3]},
-			"faces": {
-				"north": {"uv": [2, 5, 2, 5], "texture": "#down"},
-				"west": {"uv": [5, 2, 14, 13], "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_top",
-			"from": [5, 6, 1],
-			"to": [11, 9, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [15, 16, 3]},
-			"faces": {
-				"north": {"uv": [14, 12, 14, 12], "texture": "#down"},
-				"down": {"uv": [12, 15, 12, 15], "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_bottom",
-			"from": [5, 1, 1],
-			"to": [11, 4, 11],
-			"rotation": {"angle": 0, "axis": "y", "origin": [15, 11, 3]},
-			"faces": {
-				"north": {"uv": [1, 6, 1, 6], "texture": "#down"},
-				"up": {"uv": [6, 1, 6, 1], "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_border_bottom",
-			"from": [4, 0, 0],
-			"to": [12, 3, 9],
-			"rotation": {"angle": 0, "axis": "y", "origin": [15, 10, 1]},
-			"faces": {
-				"up": {"uv": [0, 4, 9, 13], "rotation": 90, "texture": "#missing"}
-			}
-		},
-		{
-			"name": "inside_border_top",
-			"from": [5, 7, 0],
-			"to": [12, 10, 9],
-			"rotation": {"angle": 0, "axis": "y", "origin": [15, 17, 1]},
-			"faces": {
-				"down": {"uv": [0, 4, 9, 13], "rotation": 270, "texture": "#down"}
-			}
-		},
-		{
-			"name": "inside_border_left",
-			"from": [11, 3, 0],
-			"to": [12, 8, 1],
-			"rotation": {"angle": 0, "axis": "y", "origin": [15, 13, 1]},
-			"faces": {
-				"west": {"uv": [0, 8, 1, 13], "texture": "#down"}
-			}
-		}
-	],
-	"groups": [
-		{
-			"name": "chest",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-		},
-		{
-			"name": "cells",
-			"origin": [8, 8, 8],
-			"color": 0,
-			"children": []
-		}
-	]
-}
+  "credit": "Made with Blockbench",
+  "textures": {
+    "4": "appliedenergistics2:blocks/drive_inside",
+    "up": "appliedenergistics2:blocks/chest/top",
+    "down": "appliedenergistics2:blocks/chest/bottom",
+    "north": "appliedenergistics2:blocks/chest/front",
+    "particle": "appliedenergistics2:blocks/chest/side",
+    "east": "appliedenergistics2:blocks/chest/side"
+  },
+  "elements": [
+    {
+      "from": [0, 0, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": { "uv": [0, 0, 16, 16], "texture": "#north" },
+        "east": { "uv": [0, 0, 16, 16], "texture": "#east" },
+        "south": { "uv": [0, 0, 16, 16], "texture": "#east" },
+        "west": { "uv": [0, 0, 16, 16], "texture": "#east" },
+        "up": { "uv": [0, 0, 16, 16], "texture": "#up" },
+        "down": { "uv": [0, 0, 16, 16], "texture": "#down" }
+      }
+    },
+    {
+      "name": "inside_back",
+      "from": [5, 4, 7],
+      "to": [11, 7, 10],
+      "rotation": { "angle": 0, "axis": "y", "origin": [19, 11, 8] },
+      "faces": {
+        "north": { "uv": [4, 1, 16, 14], "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_left",
+      "from": [11, 1, 1],
+      "to": [14, 12, 11],
+      "rotation": { "angle": 0, "axis": "y", "origin": [18, 11, 3] },
+      "faces": {
+        "north": { "uv": [2, 5, 2, 5], "texture": "#4" },
+        "west": { "uv": [5, 1, 14, 12], "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_top",
+      "from": [5, 6, 1],
+      "to": [11, 9, 11],
+      "rotation": { "angle": 0, "axis": "y", "origin": [15, 16, 3] },
+      "faces": {
+        "north": { "uv": [2, 7, 2, 7], "texture": "#4" },
+        "down": { "uv": [6, 4, 6, 4], "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_bottom",
+      "from": [5, 1, 1],
+      "to": [11, 4, 11],
+      "rotation": { "angle": 0, "axis": "y", "origin": [15, 11, 3] },
+      "faces": {
+        "north": { "uv": [2, 7, 2, 7], "texture": "#4" },
+        "up": { "uv": [6, 3, 6, 3], "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_border_bottom",
+      "from": [4, 0, 0],
+      "to": [12, 3, 9],
+      "rotation": { "angle": 0, "axis": "y", "origin": [15, 10, 1] },
+      "faces": {
+        "up": { "uv": [0, 4, 9, 13], "rotation": 90, "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_border_top",
+      "from": [5, 7, 0],
+      "to": [12, 10, 9],
+      "rotation": { "angle": 0, "axis": "y", "origin": [15, 17, 1] },
+      "faces": {
+        "down": { "uv": [0, 4, 9, 13], "rotation": 270, "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_border_left",
+      "from": [11, 3, 0],
+      "to": [12, 8, 1],
+      "rotation": { "angle": 0, "axis": "y", "origin": [15, 13, 1] },
+      "faces": {
+        "west": { "uv": [0, 8, 1, 13], "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_border_right",
+      "from": [4, 3, 0],
+      "to": [5, 8, 1],
+      "rotation": { "angle": 0, "axis": "y", "origin": [8, 13, 1] },
+      "faces": {
+        "east": { "uv": [0, 6, 1, 11], "rotation": 180, "texture": "#4" }
+      }
+    },
+    {
+      "name": "inside_right",
+      "from": [2, 1, 1],
+      "to": [5, 12, 11],
+      "rotation": { "angle": 0, "axis": "y", "origin": [9, 11, 3] },
+      "faces": {
+        "east": { "uv": [5, 2, 14, 13], "texture": "#4" }
+      }
+    }
+  ]
+}

src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_empty.json

@@ -1,4 +1,3 @@
 {
-    "textures": {},
-    "elements": []
+	"credit": "Made with Blockbench"
 }

src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_full.json

@@ -1,37 +1,23 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"front": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-		"state": "appliedenergistics2:blocks/chest/cell_state_full",
-		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+		"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+		"state": "appliedenergistics2:blocks/chest/cell_state_full"
 	},
 	"elements": [
 		{
-			"name": "Cell Backdrop",
 			"from": [5, 4, 0],
 			"to": [11, 6, 1],
-			"shade": false,
 			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
-				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+				"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"},
+				"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"}
 			}
 		},
 		{
-			"name": "Cell Light",
-			"from": [9, 4, 0],
-			"to": [10, 5, 0],
-			"shade": false,
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [6, 11, 7, 12], "texture": "#state"}
-			}
-		},
-		{
-			"name": "Cell Light",
-			"from": [9, 4, 0],
-			"to": [10, 5, 0],
-			"shade": false,
-			"faces": {
-				"north": {"uv": [1, 7, 2, 8], "texture": "#top_front"}
+				"north": {"uv": [0, 0, 16, 16], "texture": "#state"}
 			}
 		}
 	]

src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_offline.json

@@ -1,16 +1,15 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"front": "appliedenergistics2:blocks/chest/cell_state_offline"
+		"state": "appliedenergistics2:blocks/chest/cell_state_offline"
 	},
 	"elements": [
 		{
 			"from": [5, 4, 0],
 			"to": [11, 6, 1],
-			"shade": false,
 			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
-				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+				"north": {"uv": [5, 10, 11, 12], "texture": "#state"},
+				"up": {"uv": [5, 9, 11, 10], "texture": "#state"}
 			}
 		}
 	]

src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_online.json

@@ -1,37 +1,23 @@
 {
-	"ae2_uvl_marker": true,
-	"parent": "block/block",
+	"credit": "Made with Blockbench",
 	"textures": {
-		"front": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-		"state": "appliedenergistics2:blocks/chest/cell_state_online",
-		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+		"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+		"state": "appliedenergistics2:blocks/chest/cell_state_online"
 	},
 	"elements": [
 		{
-			"name": "Cell Backdrop",
 			"from": [5, 4, 0],
 			"to": [11, 6, 1],
-			"shade": false,
 			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
-				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+				"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"},
+				"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"}
 			}
 		},
 		{
-			"name": "Cell Light",
-			"from": [9, 4, 0],
-			"to": [10, 5, 0],
-			"shade": false,
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [6, 11, 7, 12], "texture": "#state"}
-			}
-		},
-		{
-			"name": "Cell Light",
-			"from": [9, 4, 0],
-			"to": [10, 5, 0],
-			"faces": {
-				"north": {"uv": [1, 3, 2, 4], "texture": "#top_front"}
+				"north": {"uv": [0, 0, 16, 16], "texture": "#state"}
 			}
 		}
 	]

src/main/resources/assets/appliedenergistics2/models/block/chest/cell_state_types_full.json

@@ -1,37 +1,23 @@
 {
 	"credit": "Made with Blockbench",
 	"textures": {
-		"front": "appliedenergistics2:blocks/chest/cell_state_backdrop",
-		"state": "appliedenergistics2:blocks/chest/cell_state_types_full",
-		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
+		"backdrop": "appliedenergistics2:blocks/chest/cell_state_backdrop",
+		"state": "appliedenergistics2:blocks/chest/cell_state_types_full"
 	},
 	"elements": [
 		{
-			"name": "Cell Backdrop",
 			"from": [5, 4, 0],
 			"to": [11, 6, 1],
-			"shade": false,
 			"faces": {
-				"north": {"uv": [5, 10, 11, 12], "texture": "#front"},
-				"up": {"uv": [5, 10, 11, 11], "texture": "#front"}
+				"north": {"uv": [5, 10, 11, 12], "texture": "#backdrop"},
+				"up": {"uv": [5, 9, 11, 10], "texture": "#backdrop"}
 			}
 		},
 		{
-			"name": "Cell Light",
-			"from": [9, 4, 0],
-			"to": [10, 5, 0],
-			"shade": false,
+			"from": [0, 0, 0],
+			"to": [16, 16, 16],
 			"faces": {
-				"north": {"uv": [6, 11, 7, 12], "texture": "#state"}
-			}
-		},
-		{
-			"name": "Cell Light",
-			"from": [9, 4, 0],
-			"to": [10, 5, 0],
-			"shade": false,
-			"faces": {
-				"north": {"uv": [1, 5, 2, 6], "texture": "#top_front"}
+				"north": {"uv": [0, 0, 16, 16], "texture": "#state"}
 			}
 		}
 	]

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

@@ -1,284 +1,261 @@
 {
-	"parent": "block/block",
-		"ambientocclusion": false,
-		"textures": {
-		"particle": "appliedenergistics2:blocks/drive_side",
-		"side": "appliedenergistics2:blocks/drive_side",
-		"bottom": "appliedenergistics2:blocks/drive_bottom",
-		"top": "appliedenergistics2:blocks/drive_top",
-		"front": "appliedenergistics2:blocks/drive_front"
-		},
-		"elements": [
-		{
-		"name": "Right Side Panel",
-		"from": [0, 1, 0],
-		"to": [2, 15, 16],
-		"faces": {
-				"north": {
-				"uv": [15, 1, 16, 15],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"east": {
-				"uv": [0, 2, 16, 14],
-				"rotation": 180,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"south": {
-				"uv": [0, 1, 1, 15],
-				"texture": "#side",
-				"cullface": "south"
-				},
-				"west": {
-				"uv": [0, 1, 16, 15],
-				"texture": "#side",
-				"cullface": "west"
-				}
-		}
-		},
-		{
-		"name": "Left Side Panel",
-		"from": [14, 1, 0],
-		"to": [16, 15, 16],
-		"faces": {
-				"north": {
-				"uv": [0, 1, 1, 15],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"east": {
-				"uv": [0, 1, 16, 15],
-				"texture": "#side",
-				"cullface": "east"
-				},
-				"south": {
-				"uv": [15, 1, 16, 15],
-				"texture": "#side",
-				"cullface": "south"
-				},
-				"west": {
-				"uv": [0, 2, 16, 14],
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		},
-		{
-		"name": "Back Panel",
-		"from": [2, 1, 7],
-		"to": [14, 15, 16],
-		"rotation": {
-				"angle": 0,
-				"axis": "y",
-				"origin": [8, 8, 9]
-		},
-		"faces": {
-				"north": {
-				"uv": [13, 2, 14, 13],
-				"texture": "#bottom"
-				},
-				"south": {
-				"uv": [1, 1, 15, 15],
-				"texture": "#side",
-				"cullface": "south"
-				}
-		}
-		},
-		{
-		"name": "Bottom Panel",
-		"from": [0, 0, 0],
-		"to": [16, 1, 16],
-		"faces": {
-				"north": {
-				"uv": [0, 15, 16, 16],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"east": {
-				"uv": [0, 15, 16, 16],
-				"texture": "#side",
-				"cullface": "east"
-				},
-				"south": {
-				"uv": [0, 15, 16, 16],
-				"texture": "#side",
-				"cullface": "south"
-				},
-				"west": {
-				"uv": [0, 15, 16, 16],
-				"texture": "#side",
-				"cullface": "west"
-				},
-				"up": {
-				"uv": [0, 2, 16, 14],
-				"rotation": 90,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"down": {
-				"uv": [0, 0, 16, 16],
-				"texture": "#bottom",
-				"cullface": "down"
-				}
-		}
-		},
-		{
-		"name": "Top Panel",
-		"from": [0, 15, 0],
-		"to": [16, 16, 16],
-		"faces": {
-				"north": {
-				"uv": [0, 0, 16, 1],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"east": {
-				"uv": [0, 0, 16, 1],
-				"texture": "#side",
-				"cullface": "east"
-				},
-				"south": {
-				"uv": [0, 0, 16, 1],
-				"texture": "#side",
-				"cullface": "south"
-				},
-				"west": {
-				"uv": [0, 0, 16, 1],
-				"texture": "#side",
-				"cullface": "west"
-				},
-				"up": {
-				"uv": [0, 0, 16, 16],
-				"texture": "#top",
-				"cullface": "up"
-				},
-				"down": {
-				"uv": [0, 2, 16, 14],
-				"rotation": 270,
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		},
-		{
-		"name": "Front Panel",
-		"from": [7, 1, 1],
-		"to": [9, 15, 7],
-		"faces": {
-				"north": {
-				"uv": [7, 1, 9, 15],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"east": {
-				"uv": [1, 2, 7, 14],
-				"rotation": 180,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"west": {
-				"uv": [1, 2, 7, 14],
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		},
-		{
-		"name": "Separator",
-		"from": [1, 3, 2],
-		"to": [15, 4, 7],
-		"faces": {
-				"north": {
-				"uv": [1, 12, 15, 13],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"up": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 90,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"down": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 270,
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		},
-		{
-		"name": "Separator",
-		"from": [1, 6, 2],
-		"to": [15, 7, 7],
-		"faces": {
-				"north": {
-				"uv": [1, 9, 15, 10],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"up": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 90,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"down": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 270,
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		},
-		{
-		"name": "Separator",
-		"from": [1, 9, 2],
-		"to": [15, 10, 7],
-		"faces": {
-				"north": {
-				"uv": [1, 6, 15, 7],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"up": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 90,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"down": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 270,
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		},
-		{
-		"name": "Separator",
-		"from": [1, 12, 2],
-		"to": [15, 13, 7],
-		"faces": {
-				"north": {
-				"uv": [1, 3, 15, 4],
-				"texture": "#front",
-				"cullface": "north"
-				},
-				"up": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 90,
-				"texture": "#bottom",
-				"cullface": "north"
-				},
-				"down": {
-				"uv": [1, 2, 6, 14],
-				"rotation": 270,
-				"texture": "#bottom",
-				"cullface": "north"
-				}
-		}
-		}
-		]
+  "parent": "block/block",
+  "textures": {
+    "inside": "appliedenergistics2:blocks/drive_inside",
+    "particle": "appliedenergistics2:blocks/drive_side",
+    "side": "appliedenergistics2:blocks/drive_side",
+    "bottom": "appliedenergistics2:blocks/drive_bottom",
+    "top": "appliedenergistics2:blocks/drive_top",
+    "front": "appliedenergistics2:blocks/drive_front"
+  },
+  "elements": [
+    {
+      "name": "Right Side Panel",
+      "from": [0, 1, 0],
+      "to": [1, 15, 16],
+      "faces": {
+        "north": {
+          "uv": [15, 1, 16, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 0, 16, 16],
+          "rotation": 180,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "south": {
+          "uv": [0, 1, 1, 15],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": { "uv": [0, 1, 16, 15], "texture": "#side", "cullface": "west" }
+      }
+    },
+    {
+      "name": "Left Side Panel",
+      "from": [15, 1, 0],
+      "to": [16, 15, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 1, 1, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [15, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Back Panel",
+      "from": [1, 1, 7],
+      "to": [15, 15, 16],
+      "rotation": { "angle": 0, "axis": "y", "origin": [8, 8, 9] },
+      "faces": {
+        "north": { "uv": [15, 1, 16, 15], "texture": "#inside" },
+        "south": {
+          "uv": [1, 1, 15, 15],
+          "texture": "#side",
+          "cullface": "south"
+        }
+      }
+    },
+    {
+      "name": "Bottom Panel",
+      "from": [0, 0, 0],
+      "to": [16, 1, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "west"
+        },
+        "up": {
+          "uv": [0, 0, 16, 16],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#bottom",
+          "cullface": "down"
+        }
+      }
+    },
+    {
+      "name": "Top Panel",
+      "from": [0, 15, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": { "uv": [0, 0, 16, 1], "texture": "#side", "cullface": "east" },
+        "south": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": { "uv": [0, 0, 16, 1], "texture": "#side", "cullface": "west" },
+        "up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up" },
+        "down": {
+          "uv": [0, 0, 16, 16],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Middle Strut",
+      "from": [7, 1, 1],
+      "to": [9, 15, 7],
+      "faces": {
+        "north": {
+          "uv": [7, 1, 9, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [1, 1, 7, 15],
+          "rotation": 180,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "west": {
+          "uv": [1, 1, 7, 15],
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 3, 2],
+      "to": [15, 4, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 12, 15, 13],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 6, 2],
+      "to": [15, 7, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 9, 15, 10],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 9, 2],
+      "to": [15, 10, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 6, 15, 7],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 12, 2],
+      "to": [15, 13, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 3, 15, 4],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    }
+  ]
 }

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

@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"textures": {
 		"front": "appliedenergistics2:blocks/drive_cell_states",
 		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
@@ -7,22 +8,22 @@
 		{
 			"name": "Cell Backdrop",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
 			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 8, 5, 10], "texture": "#front"},
-				"up": {"uv": [0, 8, 5, 9], "texture": "#front"},
-				"down": {"uv": [5, 10, 0, 9], "texture": "#front"}
+				"north": {"uv": [0, 8, 6, 10], "texture": "#front"},
+				"up": {"uv": [0, 8, 6, 9], "texture": "#front"},
+				"down": {"uv": [6, 8, 0, 10], "texture": "#front"}
 			}
 		},
 		{
 			"name": "Cell Light",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
 			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 6, 5, 8], "texture": "#top_front"},
-				"down": {"uv": [5, 8, 0, 7], "texture": "#top_front"}
+				"north": {"uv": [0, 6, 6, 8], "texture": "#top_front"},
+				"down": {"uv": [6, 6, 0, 8], "texture": "#top_front"}
 			}
 		}
 	]

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

@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"ambientocclusion": false,
 	"textures": {
 		"front": "appliedenergistics2:blocks/drive_cell_states"
@@ -7,11 +8,12 @@
 		{
 			"name": "Cell Backdrop",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
+			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 0, 5, 2], "texture": "#front"},
-				"up": {"uv": [0, 0, 5, 1], "texture": "#front"},
-				"down": {"uv": [5, 2, 0, 1], "texture": "#front"}
+				"north": {"uv": [0, 0, 6, 2], "texture": "#front"},
+				"up": {"uv": [0, 0, 6, 1], "texture": "#front"},
+				"down": {"uv": [6, 0, 0, 2], "texture": "#front"}
 			}
 		}
 	]

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

@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"textures": {
 		"front": "appliedenergistics2:blocks/drive_cell_states",
 		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
@@ -7,22 +8,22 @@
 		{
 			"name": "Cell Backdrop",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
 			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 8, 5, 10], "texture": "#front"},
-				"up": {"uv": [0, 8, 5, 9], "texture": "#front"},
-				"down": {"uv": [5, 10, 0, 9], "texture": "#front"}
+				"north": {"uv": [0, 8, 6, 10], "texture": "#front"},
+				"up": {"uv": [0, 8, 6, 9], "texture": "#front"},
+				"down": {"uv": [6, 8, 0, 10], "texture": "#front"}
 			}
 		},
 		{
 			"name": "Cell Light",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
 			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 2, 5, 4], "texture": "#top_front"},
-				"down": {"uv": [5, 4, 0, 3], "texture": "#top_front"}
+				"north": {"uv": [0, 2, 6, 4], "texture": "#top_front"},
+				"down": {"uv": [6, 2, 0, 4], "texture": "#top_front"}
 			}
 		}
 	]

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

@@ -1,4 +1,5 @@
 {
+	"credit": "Made with Blockbench",
 	"textures": {
 		"front": "appliedenergistics2:blocks/drive_cell_states",
 		"top_front": "appliedenergistics2:blocks/drive_cell_states_emissive"
@@ -7,22 +8,22 @@
 		{
 			"name": "Cell Backdrop",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
 			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 8, 5, 10], "texture": "#front"},
-				"up": {"uv": [0, 8, 5, 9], "texture": "#front"},
-				"down": {"uv": [5, 10, 0, 9], "texture": "#front"}
+				"north": {"uv": [0, 8, 6, 10], "texture": "#front"},
+				"up": {"uv": [0, 8, 6, 9], "texture": "#front"},
+				"down": {"uv": [6, 8, 0, 10], "texture": "#front"}
 			}
 		},
 		{
 			"name": "Cell Light",
 			"from": [9, 13, 1],
-			"to": [14, 15, 2],
+			"to": [15, 15, 2],
 			"shade": false,
 			"faces": {
-				"north": {"uv": [0, 4, 5, 6], "texture": "#top_front"},
-				"down": {"uv": [5, 6, 0, 5], "texture": "#top_front"}
+				"north": {"uv": [0, 4, 6, 6], "texture": "#top_front"},
+				"down": {"uv": [6, 4, 0, 6], "texture": "#top_front"}
 			}
 		}
 	]

src/main/resources/assets/appliedenergistics2/models/block/stairs/drive_base.json

@@ -0,0 +1,261 @@
+{
+  "parent": "block/block",
+  "textures": {
+    "inside": "appliedenergistics2:blocks/drive_inside",
+    "particle": "appliedenergistics2:blocks/drive_side",
+    "side": "appliedenergistics2:blocks/drive_side",
+    "bottom": "appliedenergistics2:blocks/drive_bottom",
+    "top": "appliedenergistics2:blocks/drive_top",
+    "front": "appliedenergistics2:blocks/drive_front"
+  },
+  "elements": [
+    {
+      "name": "Right Side Panel",
+      "from": [0, 1, 0],
+      "to": [1, 15, 16],
+      "faces": {
+        "north": {
+          "uv": [15, 1, 16, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 0, 16, 16],
+          "rotation": 180,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "south": {
+          "uv": [0, 1, 1, 15],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": { "uv": [0, 1, 16, 15], "texture": "#side", "cullface": "west" }
+      }
+    },
+    {
+      "name": "Left Side Panel",
+      "from": [15, 1, 0],
+      "to": [16, 15, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 1, 1, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [15, 1, 16, 15],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Back Panel",
+      "from": [1, 1, 7],
+      "to": [15, 15, 16],
+      "rotation": { "angle": 0, "axis": "y", "origin": [8, 8, 9] },
+      "faces": {
+        "north": { "uv": [15, 1, 16, 15], "texture": "#inside" },
+        "south": {
+          "uv": [1, 1, 15, 15],
+          "texture": "#side",
+          "cullface": "south"
+        }
+      }
+    },
+    {
+      "name": "Bottom Panel",
+      "from": [0, 0, 0],
+      "to": [16, 1, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "east"
+        },
+        "south": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": {
+          "uv": [0, 15, 16, 16],
+          "texture": "#side",
+          "cullface": "west"
+        },
+        "up": {
+          "uv": [0, 0, 16, 16],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [0, 0, 16, 16],
+          "texture": "#bottom",
+          "cullface": "down"
+        }
+      }
+    },
+    {
+      "name": "Top Panel",
+      "from": [0, 15, 0],
+      "to": [16, 16, 16],
+      "faces": {
+        "north": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": { "uv": [0, 0, 16, 1], "texture": "#side", "cullface": "east" },
+        "south": {
+          "uv": [0, 0, 16, 1],
+          "texture": "#side",
+          "cullface": "south"
+        },
+        "west": { "uv": [0, 0, 16, 1], "texture": "#side", "cullface": "west" },
+        "up": { "uv": [0, 0, 16, 16], "texture": "#top", "cullface": "up" },
+        "down": {
+          "uv": [0, 0, 16, 16],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Middle Strut",
+      "from": [7, 1, 1],
+      "to": [9, 15, 7],
+      "faces": {
+        "north": {
+          "uv": [7, 1, 9, 15],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "east": {
+          "uv": [1, 1, 7, 15],
+          "rotation": 180,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "west": {
+          "uv": [1, 1, 7, 15],
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 3, 2],
+      "to": [15, 4, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 12, 15, 13],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 6, 2],
+      "to": [15, 7, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 9, 15, 10],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 9, 2],
+      "to": [15, 10, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 6, 15, 7],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    },
+    {
+      "name": "Separator",
+      "from": [1, 12, 2],
+      "to": [15, 13, 7],
+      "faces": {
+        "north": {
+          "uv": [1, 3, 15, 4],
+          "texture": "#front",
+          "cullface": "north"
+        },
+        "up": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 90,
+          "texture": "#inside",
+          "cullface": "north"
+        },
+        "down": {
+          "uv": [2, 1, 7, 15],
+          "rotation": 270,
+          "texture": "#inside",
+          "cullface": "north"
+        }
+      }
+    }
+  ]
+}