diff --git a/src/main/resources/assets/thaumicenergistics/models/block/arcane_assembler.json b/src/main/resources/assets/thaumicenergistics/models/block/arcane_assembler.json index 46980a4..ae64328 100644 --- a/src/main/resources/assets/thaumicenergistics/models/block/arcane_assembler.json +++ b/src/main/resources/assets/thaumicenergistics/models/block/arcane_assembler.json @@ -1,8 +1,8 @@ { "format_version": "1.9.0", "credit": "Made with _leng", - "texture_size": [64, 64], "render_type": "cutout", + "texture_size": [64, 64], "textures": { "model": "thaumicenergistics:block/arcane_assembler_fallback", "particle": "ae2:block/molecular_assembler" @@ -139,7 +139,7 @@ "south": {"uv": [6.5, 6.5, 9, 6.75], "texture": "#model"}, "west": {"uv": [6.75, 3, 9.25, 3.25], "texture": "#model"}, "up": {"uv": [3, 4, 5.5, 6.5], "texture": "#model"}, - "down": {"uv": [3, 4, 5.5, 6.5], "texture": "#model"} + "down": {"uv": [3, 4, 5.5, 6.5], "texture": "#model", "cullface": "up"} } } ], diff --git a/src/main/resources/assets/thaumicenergistics/models/item/essentia_export_bus.json b/src/main/resources/assets/thaumicenergistics/models/item/essentia_export_bus.json index 1d3af92..2fc9793 100644 --- a/src/main/resources/assets/thaumicenergistics/models/item/essentia_export_bus.json +++ b/src/main/resources/assets/thaumicenergistics/models/item/essentia_export_bus.json @@ -1,46 +1,3 @@ { - "credit": "Made with Blockbench by Sea_Kerman - ThaumicEnergistics Essentia Export Bus", - "parent": "ae2:item/part_base", - "textures": { - "sides": "ae2:part/export_bus_sides", - "front": "thaumicenergistics:part/essentia_export_bus_face" - }, - "elements": [ - { - "from": [4, 4, 7], - "to": [12, 12, 9], - "faces": { - "north": { "uv": [4, 4, 12, 12], "texture": "#front" }, - "east": { "uv": [0, 4, 2, 12], "rotation": 180, "texture": "#sides" }, - "south": { "uv": [4, 4, 12, 12], "texture": "#sides" }, - "west": { "uv": [14, 4, 16, 12], "rotation": 180, "texture": "#sides" }, - "up": { "uv": [4, 0, 12, 2], "texture": "#sides" }, - "down": { "uv": [4, 14, 12, 16], "texture": "#sides" } - } - }, - { - "from": [5, 5, 9], - "to": [11, 11, 10], - "faces": { - "north": { "uv": [5, 5, 11, 11], "texture": "#front" }, - "east": { "uv": [13, 5, 14, 11], "texture": "#sides" }, - "south": { "uv": [5, 5, 11, 11], "texture": "#sides" }, - "west": { "uv": [2, 5, 3, 11], "texture": "#sides" }, - "up": { "uv": [5, 2, 11, 3], "texture": "#sides" }, - "down": { "uv": [5, 13, 11, 14], "texture": "#sides" } - } - }, - { - "from": [6, 6, 10], - "to": [10, 10, 11], - "faces": { - "north": { "uv": [6, 6, 10, 10], "texture": "#front" }, - "east": { "uv": [3, 6, 4, 10], "texture": "#sides" }, - "south": { "uv": [6, 6, 10, 10], "texture": "#sides" }, - "west": { "uv": [12, 6, 13, 10], "texture": "#sides" }, - "up": { "uv": [6, 12, 10, 13], "texture": "#sides" }, - "down": { "uv": [6, 3, 10, 4], "texture": "#sides" } - } - } - ] + "parent": "thaumicenergistics:parts/essentia_export_bus_base" } \ No newline at end of file diff --git a/src/main/resources/assets/thaumicenergistics/models/parts/essentia_export_bus_base.json b/src/main/resources/assets/thaumicenergistics/models/parts/essentia_export_bus_base.json index 158825c..b50a856 100644 --- a/src/main/resources/assets/thaumicenergistics/models/parts/essentia_export_bus_base.json +++ b/src/main/resources/assets/thaumicenergistics/models/parts/essentia_export_bus_base.json @@ -1,138 +1,94 @@ { - "format_version": "1.21.6", - "credit": "Made with Blockbench by Sea_Kerman", - "textures": { - "sides": "thaumicenergistics:part/export_bus_sides_customized", - "sidesStatus": "ae2:part/monitor_sides_status", - "particle": "ae2:part/monitor_back", - "back": "ae2:part/monitor_back", - "front": "thaumicenergistics:part/essentia_export_bus_face" - }, - "elements": [ - { - "from": [ - 4, - 4, - 2 - ], - "to": [ - 12, - 12, - 4 - ], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [ - 5, - 5, - 1 - ], - "to": [ - 11, - 11, - 2 - ], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [ - 6, - 6, - 0 - ], - "to": [ - 10, - 10, - 1 - ], - "faces": { - "down": { - "texture": "#sides" - }, - "up": { - "texture": "#sides" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sides" - }, - "north": { - "texture": "#front" - }, - "west": { - "texture": "#sides" - } - } - }, - { - "from": [ - 6, - 6, - 4 - ], - "to": [ - 10, - 10, - 5 - ], - "faces": { - "down": { - "texture": "#sidesStatus" - }, - "up": { - "texture": "#sidesStatus" - }, - "south": { - "texture": "#back" - }, - "east": { - "texture": "#sidesStatus" - }, - "west": { - "texture": "#sidesStatus" - } - } - } - ] + "format_version": "1.21.6", + "credit": "Made with Blockbench by Sea_Kerman", + "textures": { + "sides": "thaumicenergistics:part/export_bus_sides_customized", + "sidesStatus": "ae2:part/monitor_sides_status", + "particle": "ae2:part/monitor_back", + "back": "ae2:part/monitor_back", + "front": "thaumicenergistics:part/essentia_export_bus_face" + }, + "elements": [ + { + "from": [4, 4, 2], + "to": [12, 12, 4], + "faces": { + "north": {"uv": [4, 4, 12, 12], "texture": "#front"}, + "east": {"uv": [14, 4, 16, 12], "texture": "#sides"}, + "south": {"uv": [4, 4, 12, 12], "texture": "#back"}, + "west": {"uv": [0, 4, 2, 12], "texture": "#sides"}, + "up": {"uv": [4, 0, 12, 2], "texture": "#sides"}, + "down": {"uv": [4, 14, 12, 16], "texture": "#sides"} + } + }, + { + "from": [5, 5, 1], + "to": [11, 11, 2], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#front"}, + "east": {"uv": [5, 5, 6, 11], "texture": "#front"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#front"}, + "west": {"uv": [10, 5, 11, 11], "texture": "#front"}, + "up": {"uv": [11, 5, 5, 6], "texture": "#front"}, + "down": {"uv": [11, 10, 5, 11], "texture": "#front"} + } + }, + { + "from": [6, 6, 0], + "to": [10, 10, 1], + "faces": { + "north": {"uv": [6, 6, 10, 10], "texture": "#front"}, + "east": {"uv": [6, 6, 7, 10], "texture": "#front"}, + "south": {"uv": [6, 6, 10, 10], "texture": "#front"}, + "west": {"uv": [9, 6, 10, 10], "texture": "#front"}, + "up": {"uv": [10, 6, 6, 7], "texture": "#front"}, + "down": {"uv": [10, 9, 6, 10], "texture": "#front"} + } + }, + { + "from": [6, 6, 4], + "to": [10, 10, 5], + "faces": { + "east": {"uv": [11, 6, 12, 10], "texture": "#sidesStatus"}, + "south": {"uv": [6, 6, 10, 10], "texture": "#back"}, + "west": {"uv": [4, 6, 5, 10], "texture": "#sidesStatus"}, + "up": {"uv": [6, 4, 10, 5], "texture": "#sidesStatus"}, + "down": {"uv": [6, 11, 10, 12], "texture": "#sidesStatus"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, -0.75, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, -0.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 40.75, 0], + "translation": [2.5, 0, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, -135, 0], + "translation": [-2.75, 0, 0], + "scale": [0.775, 0.775, 0.775] + }, + "fixed": { + "translation": [0, 0, 3], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_bottom.png b/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_bottom.png new file mode 100644 index 0000000..a8833ee Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_bottom.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_front.png b/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_front.png new file mode 100644 index 0000000..cc207d4 Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_front.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_top.png b/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_top.png new file mode 100644 index 0000000..8a98ddd Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/distillation_encoder_top.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_back.png b/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_back.png new file mode 100644 index 0000000..6dd10dc Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_back.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_bottom.png b/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_bottom.png new file mode 100644 index 0000000..8408940 Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_bottom.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_side.png b/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_side.png new file mode 100644 index 0000000..706fa0a Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/e_vibration_face_side.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/block/knowledge_inscriber_positive.png b/src/main/resources/assets/thaumicenergistics/textures/block/knowledge_inscriber_positive.png new file mode 100644 index 0000000..51cec43 Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/block/knowledge_inscriber_positive.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/item/essentia_cell_creative.png.mcmeta b/src/main/resources/assets/thaumicenergistics/textures/item/essentia_cell_creative.png.mcmeta new file mode 100644 index 0000000..dc94f45 --- /dev/null +++ b/src/main/resources/assets/thaumicenergistics/textures/item/essentia_cell_creative.png.mcmeta @@ -0,0 +1,9 @@ +{ + "animation": { + "frametime": 3, + "frames": [ + {"index": 0, "time": 20}, + 1, 2, 3, 4, 5, 6 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/thaumicenergistics/textures/item/material_coalescence_core.png.mcmeta b/src/main/resources/assets/thaumicenergistics/textures/item/material_coalescence_core.png.mcmeta new file mode 100644 index 0000000..83b6190 --- /dev/null +++ b/src/main/resources/assets/thaumicenergistics/textures/item/material_coalescence_core.png.mcmeta @@ -0,0 +1,9 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + {"index": 0, "time": 32}, + {"index": 1, "time": 8} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/thaumicenergistics/textures/item/material_diffusion_core.png.mcmeta b/src/main/resources/assets/thaumicenergistics/textures/item/material_diffusion_core.png.mcmeta new file mode 100644 index 0000000..83b6190 --- /dev/null +++ b/src/main/resources/assets/thaumicenergistics/textures/item/material_diffusion_core.png.mcmeta @@ -0,0 +1,9 @@ +{ + "animation": { + "interpolate": true, + "frames": [ + {"index": 0, "time": 32}, + {"index": 1, "time": 8} + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/thaumicenergistics/textures/part/export_bus_sides_customized.png b/src/main/resources/assets/thaumicenergistics/textures/part/export_bus_sides_customized.png new file mode 100644 index 0000000..5e869c9 Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/part/export_bus_sides_customized.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/part/import_bus_sides_customized.png b/src/main/resources/assets/thaumicenergistics/textures/part/import_bus_sides_customized.png new file mode 100644 index 0000000..1194da6 Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/part/import_bus_sides_customized.png differ diff --git a/src/main/resources/assets/thaumicenergistics/textures/part/monitor_back_no_status_customized.png b/src/main/resources/assets/thaumicenergistics/textures/part/monitor_back_no_status_customized.png new file mode 100644 index 0000000..c74b6e1 Binary files /dev/null and b/src/main/resources/assets/thaumicenergistics/textures/part/monitor_back_no_status_customized.png differ