diff --git a/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java index f07e7a539..145682ea0 100644 --- a/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java +++ b/src/main/java/appeng/debug/EnergyGeneratorTileEntity.java @@ -65,6 +65,9 @@ public class EnergyGeneratorTileEntity extends AEBaseTileEntity implements ITick for (Direction facing : Direction.values()) { final TileEntity te = this.getWorld().getTileEntity(this.getPos().offset(facing)); + if (te == null) { + continue; + } final LazyOptional cap = te.getCapability(CapabilityEnergy.ENERGY, facing.getOpposite()); cap.ifPresent(consumer -> { diff --git a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json index 6ae955650..abd6e0a17 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/drive/drive_base.json @@ -14,10 +14,23 @@ "from": [0, 1, 0], "to": [1, 15, 16], "faces": { - "north": { "uv": [15, 1, 16, 15], "texture": "#front" }, - "east": { "uv": [0, 0, 16, 16], "rotation": 180, "texture": "#inside" }, - "south": { "uv": [0, 1, 1, 15], "texture": "#side" }, - "west": { "uv": [0, 1, 16, 15], "texture": "#side" } + "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" } } }, { @@ -25,10 +38,26 @@ "from": [15, 1, 0], "to": [16, 15, 16], "faces": { - "north": { "uv": [0, 1, 1, 15], "texture": "#front" }, - "east": { "uv": [0, 1, 16, 15], "texture": "#side" }, - "south": { "uv": [15, 1, 16, 15], "texture": "#side" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#inside" } + "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" + } } }, { @@ -38,7 +67,11 @@ "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" } + "south": { + "uv": [1, 1, 15, 15], + "texture": "#side", + "cullface": "south" + } } }, { @@ -46,12 +79,37 @@ "from": [0, 0, 0], "to": [16, 1, 16], "faces": { - "north": { "uv": [0, 15, 16, 16], "texture": "#front" }, - "east": { "uv": [0, 15, 16, 16], "texture": "#side" }, - "south": { "uv": [0, 15, 16, 16], "texture": "#side" }, - "west": { "uv": [0, 15, 16, 16], "texture": "#side" }, - "up": { "uv": [0, 0, 16, 16], "rotation": 90, "texture": "#inside" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#bottom" } + "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" + } } }, { @@ -59,12 +117,25 @@ "from": [0, 15, 0], "to": [16, 16, 16], "faces": { - "north": { "uv": [0, 0, 16, 1], "texture": "#front" }, - "east": { "uv": [0, 0, 16, 1], "texture": "#side" }, - "south": { "uv": [0, 0, 16, 1], "texture": "#side" }, - "west": { "uv": [0, 0, 16, 1], "texture": "#side" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#top" }, - "down": { "uv": [0, 0, 16, 16], "rotation": 270, "texture": "#inside" } + "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" + } } }, { @@ -72,9 +143,22 @@ "from": [7, 1, 1], "to": [9, 15, 7], "faces": { - "north": { "uv": [7, 1, 9, 15], "texture": "#front" }, - "east": { "uv": [1, 1, 7, 15], "rotation": 180, "texture": "#inside" }, - "west": { "uv": [1, 1, 7, 15], "texture": "#inside" } + "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" + } } }, { @@ -82,9 +166,23 @@ "from": [1, 3, 2], "to": [15, 4, 7], "faces": { - "north": { "uv": [1, 12, 15, 13], "texture": "#front" }, - "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" }, - "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" } + "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" + } } }, { @@ -92,9 +190,23 @@ "from": [1, 6, 2], "to": [15, 7, 7], "faces": { - "north": { "uv": [1, 9, 15, 10], "texture": "#front" }, - "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" }, - "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" } + "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" + } } }, { @@ -102,9 +214,23 @@ "from": [1, 9, 2], "to": [15, 10, 7], "faces": { - "north": { "uv": [1, 6, 15, 7], "texture": "#front" }, - "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" }, - "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" } + "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" + } } }, { @@ -112,9 +238,23 @@ "from": [1, 12, 2], "to": [15, 13, 7], "faces": { - "north": { "uv": [1, 3, 15, 4], "texture": "#front" }, - "up": { "uv": [2, 1, 7, 15], "rotation": 90, "texture": "#inside" }, - "down": { "uv": [2, 1, 7, 15], "rotation": 270, "texture": "#inside" } + "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" + } } } ]