diff --git a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json index e1d57f7eb..183d8ea41 100644 --- a/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json +++ b/src/main/resources/assets/appliedenergistics2/models/block/inscriber.json @@ -1,12 +1,10 @@ { + "credit": "Made with Blockbench", "parent": "block/orientable", "textures": { + "inside": "appliedenergistics2:block/inscriber_internal", "particle": "appliedenergistics2:block/inscriber", - "bottom": "appliedenergistics2:block/inscriber", - "front": "appliedenergistics2:block/inscriber", - "side": "appliedenergistics2:block/inscriber", - "top": "appliedenergistics2:block/inscriber", - "inside": "appliedenergistics2:block/inscriber_inside" + "side": "appliedenergistics2:block/inscriber" }, "elements": [ { @@ -14,26 +12,11 @@ "from": [1, 0, 1], "to": [15, 1, 15], "faces": { - "down": { - "texture": "#side", - "uv": [1, 1, 15, 15] - }, - "east": { - "texture": "#side", - "uv": [1, 0, 15, 1] - }, - "north": { - "texture": "#side", - "uv": [1, 15, 15, 16] - }, - "south": { - "texture": "#side", - "uv": [1, 0, 15, 1] - }, - "west": { - "texture": "#side", - "uv": [1, 0, 15, 1] - } + "north": { "uv": [1, 15, 15, 16], "texture": "#side" }, + "east": { "uv": [1, 0, 15, 1], "texture": "#side" }, + "south": { "uv": [1, 0, 15, 1], "texture": "#side" }, + "west": { "uv": [1, 0, 15, 1], "texture": "#side" }, + "down": { "uv": [1, 1, 15, 15], "texture": "#side" } } }, { @@ -41,26 +24,11 @@ "from": [1, 15, 1], "to": [15, 16, 15], "faces": { - "east": { - "texture": "#side", - "uv": [1, 0, 15, 1] - }, - "north": { - "texture": "#side", - "uv": [1, 15, 15, 16] - }, - "south": { - "texture": "#side", - "uv": [1, 0, 15, 1] - }, - "up": { - "texture": "#side", - "uv": [1, 1, 15, 15] - }, - "west": { - "texture": "#side", - "uv": [1, 15, 15, 16] - } + "north": { "uv": [1, 15, 15, 16], "texture": "#side" }, + "east": { "uv": [1, 0, 15, 1], "texture": "#side" }, + "south": { "uv": [1, 0, 15, 1], "texture": "#side" }, + "west": { "uv": [1, 15, 15, 16], "texture": "#side" }, + "up": { "uv": [1, 1, 15, 15], "texture": "#side" } } }, { @@ -68,30 +36,12 @@ "from": [0, 1, 0], "to": [3, 15, 16], "faces": { - "down": { - "texture": "#side", - "uv": [0, 1, 3, 15] - }, - "east": { - "texture": "#side", - "uv": [0, 1, 16, 15] - }, - "north": { - "texture": "#side", - "uv": [13, 1, 16, 15] - }, - "south": { - "texture": "#side", - "uv": [0, 1, 3, 15] - }, - "up": { - "texture": "#side", - "uv": [0, 0, 3, 6] - }, - "west": { - "texture": "#side", - "uv": [0, 1, 16, 15] - } + "north": { "uv": [13, 1, 16, 15], "texture": "#side" }, + "east": { "uv": [0, 1, 16, 15], "texture": "#inside" }, + "south": { "uv": [0, 1, 3, 15], "texture": "#side" }, + "west": { "uv": [0, 1, 16, 15], "texture": "#side" }, + "up": { "uv": [0, 0, 3, 16], "texture": "#side" }, + "down": { "uv": [0, 0, 3, 16], "texture": "#side" } } }, { @@ -99,30 +49,12 @@ "from": [13, 1, 0], "to": [16, 15, 16], "faces": { - "down": { - "texture": "#side", - "uv": [0, 1, 3, 15] - }, - "east": { - "texture": "#side", - "uv": [0, 1, 16, 15] - }, - "north": { - "texture": "#side", - "uv": [0, 1, 3, 15] - }, - "south": { - "texture": "#side", - "uv": [13, 1, 16, 15] - }, - "up": { - "texture": "#side", - "uv": [13, 1, 16, 15] - }, - "west": { - "texture": "#side", - "uv": [0, 1, 16, 15] - } + "north": { "uv": [0, 1, 3, 15], "texture": "#side" }, + "east": { "uv": [0, 1, 16, 15], "texture": "#side" }, + "south": { "uv": [13, 1, 16, 15], "texture": "#side" }, + "west": { "uv": [0, 1, 16, 15], "texture": "#inside" }, + "up": { "uv": [13, 0, 16, 16], "texture": "#side" }, + "down": { "uv": [0, 0, 3, 16], "rotation": 180, "texture": "#side" } } }, { @@ -130,22 +62,10 @@ "from": [3, 1, 13], "to": [13, 15, 16], "faces": { - "down": { - "texture": "#side", - "uv": [3, 0, 13, 3] - }, - "north": { - "texture": "#side", - "uv": [3, 1, 13, 15] - }, - "south": { - "texture": "#side", - "uv": [3, 1, 13, 15] - }, - "up": { - "texture": "#side", - "uv": [3, 0, 13, 3] - } + "north": { "uv": [3, 1, 13, 15], "texture": "#inside" }, + "south": { "uv": [3, 1, 13, 15], "texture": "#side" }, + "up": { "uv": [3, 0, 13, 3], "rotation": 180, "texture": "#side" }, + "down": { "uv": [3, 13, 13, 16], "rotation": 180, "texture": "#side" } } }, { @@ -153,14 +73,8 @@ "from": [3, 1, 1], "to": [13, 4, 13], "faces": { - "north": { - "texture": "#side", - "uv": [3, 12, 13, 15] - }, - "up": { - "texture": "#side", - "uv": [3, 1, 13, 13] - } + "north": { "uv": [3, 13, 13, 16], "texture": "#side" }, + "up": { "uv": [3, 2, 13, 14], "texture": "#inside" } } }, { @@ -168,14 +82,8 @@ "from": [3, 12, 1], "to": [13, 15, 11], "faces": { - "down": { - "texture": "#side", - "uv": [3, 1, 13, 11] - }, - "north": { - "texture": "#side", - "uv": [3, 1, 13, 4] - } + "north": { "uv": [3, 0, 13, 3], "texture": "#side" }, + "down": { "uv": [3, 3, 13, 13], "texture": "#inside" } } } ] diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png index 07733cf2f..c2bceffff 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png index 9aa4964cd..7806d1e1f 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/chiseled_quartz_block_top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png index 099051105..9a589ed63 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png index 4165f700a..48d32ab63 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png and b/src/main/resources/assets/appliedenergistics2/textures/block/drive/drive_front_flat.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png index 00d0c2549..5c33a38de 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png and b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png index e09d46bc6..46c01a317 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/fluid_interface_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png index 5d04a481b..348307307 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png and b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png index 1b9aa85d6..5eb150fd9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png and b/src/main/resources/assets/appliedenergistics2/textures/block/inscriber_inside.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface.png index c6fe9dd37..0c0df42d7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png index fec1f0079..6066b50b6 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png index e10467475..3c7706808 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png index 8cd5e57f7..40a57d6d9 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_arrow_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png index 722b91d99..6a5bfaa5e 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_alternate_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png b/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png index fc46c7a6c..8a1b946b4 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png and b/src/main/resources/assets/appliedenergistics2/textures/block/interface_on.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png index 0979b24f2..9b15adec3 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_side.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png index d94926772..374b23405 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png and b/src/main/resources/assets/appliedenergistics2/textures/block/quartz_pillar_top.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png index 0c2524e67..d4ea16848 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png index 9a9cfad4c..1dc2dcb33 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png and b/src/main/resources/assets/appliedenergistics2/textures/part/export_bus_sides.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png index 4601fb777..d52aaa2a7 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_export_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png index dc77f6d01..a7d419ad5 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png index 08dc3602c..66f5ab0bb 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png index 20d0b13e0..e6aa6d2e2 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/fluid_storage_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png index a4bf1401a..578f34e57 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/import_bus.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/interface.png b/src/main/resources/assets/appliedenergistics2/textures/part/interface.png index ab23bac9b..f974cdb5c 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/interface.png and b/src/main/resources/assets/appliedenergistics2/textures/part/interface.png differ diff --git a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png index cb32913ae..8c57007d0 100644 Binary files a/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png and b/src/main/resources/assets/appliedenergistics2/textures/part/storage_bus.png differ