From dd8ad567a0f6fe0839d6427ef9ba63a54de33667 Mon Sep 17 00:00:00 2001 From: Ghostipedia Date: Sat, 4 Jul 2026 05:40:36 -0400 Subject: [PATCH 1/3] Wave one, Json Fixes --- .../client/model/quad/StaticFaceBakery.java | 7 +++---- .../gtceu/core/config/GTEarlyConfig.java | 4 +++- .../gtceu/models/block/fire_box_active.json | 4 ++-- .../models/block/machine/large_miner_active.json | 10 +++++----- .../block/machine/part/energy_input_hatch.json | 12 ++++++------ .../machine/part/energy_input_hatch_16a.json | 12 ++++++------ .../machine/part/energy_input_hatch_4a.json | 12 ++++++------ .../machine/part/energy_input_hatch_64a.json | 12 ++++++------ .../block/machine/part/energy_output_hatch.json | 12 ++++++------ .../machine/part/energy_output_hatch_16a.json | 12 ++++++------ .../machine/part/energy_output_hatch_4a.json | 12 ++++++------ .../machine/part/energy_output_hatch_64a.json | 12 ++++++------ .../block/machine/part/laser_source_hatch.json | 12 ++++++------ .../block/machine/part/laser_target_hatch.json | 12 ++++++------ .../block/machine/template/cube_all/sided.json | 8 ++++---- .../machine/template/generator_machine.json | 16 ++++++++-------- .../machine/template/part/hatch_machine.json | 8 ++++---- .../template/part/hatch_machine_color_ring.json | 12 ++++++------ .../template/part/hatch_machine_emissive.json | 12 ++++++------ .../part/hatch_machine_emissive_color_ring.json | 16 ++++++++-------- .../machine/template/part/hpca_part_machine.json | 8 ++++---- .../template/pipeline_endpoint_machine.json | 12 ++++++------ .../block/machine/template/pump_machine.json | 8 ++++---- .../machine/template/rotor_holder/overlay.json | 8 ++++---- .../template/rotor_holder/rotor_idle.json | 4 ++-- .../rotor_holder/rotor_idle_emissive.json | 4 ++-- .../block/machine/template/sided/sided.json | 8 ++++---- .../template/transformer_like_machine.json | 12 ++++++------ .../models/block/overlay/2_layer/front.json | 8 ++++---- .../block/overlay/2_layer/front_emissive.json | 8 ++++---- .../2_layer/front_emissive_color_ring.json | 12 ++++++------ .../block/overlay/2_layer/tinted/front.json | 8 ++++---- .../block/overlay/2_layer/top_emissive.json | 8 ++++---- .../assets/gtceu/models/block/overlay/front.json | 4 ++-- .../gtceu/models/block/overlay/front_all.json | 4 ++-- .../models/block/overlay/front_color_ring.json | 8 ++++---- .../models/block/overlay/front_emissive.json | 4 ++-- .../block/overlay/front_emissive_color_ring.json | 8 ++++---- .../models/block/overlay/only/2_layer/front.json | 8 ++++---- .../overlay/only/2_layer/front_emissive.json | 8 ++++---- .../only/2_layer/front_emissive_color_ring.json | 12 ++++++------ .../gtceu/models/block/overlay/only/front.json | 4 ++-- .../block/overlay/only/front_color_ring.json | 8 ++++---- .../block/overlay/only/front_emissive.json | 4 ++-- .../overlay/only/front_emissive_color_ring.json | 8 ++++---- .../gtceu/models/block/overlay/top_emissive.json | 4 ++-- 46 files changed, 205 insertions(+), 204 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/client/model/quad/StaticFaceBakery.java b/src/main/java/com/gregtechceu/gtceu/client/model/quad/StaticFaceBakery.java index 2d0b774f05d..d1e8da9bfbf 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/model/quad/StaticFaceBakery.java +++ b/src/main/java/com/gregtechceu/gtceu/client/model/quad/StaticFaceBakery.java @@ -25,10 +25,9 @@ public class StaticFaceBakery { public static final AABB BLOCK = new AABB(0, 0, 0, 1, 1, 1); - public static final AABB SLIGHTLY_OVER_BLOCK = BLOCK.inflate(0.001); - public static final AABB OUTPUT_OVERLAY = BLOCK.inflate(0.006); - public static final AABB AUTO_OUTPUT_OVERLAY = BLOCK.inflate(0.008); - public static final AABB COVER_OVERLAY = BLOCK.inflate(0.002); + public static final AABB COVER_OVERLAY = BLOCK.inflate(0.014); + public static final AABB OUTPUT_OVERLAY = BLOCK.inflate(0.018); + public static final AABB AUTO_OUTPUT_OVERLAY = BLOCK.inflate(0.022); private static final int VERTEX_INT_SIZE = 8; private static final float RESCALE_22_5 = 1.0F / (float) Math.cos((float) (Math.PI / 8)) - 1.0F; diff --git a/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java b/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java index 14368a84f3e..26b6e01a429 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java +++ b/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java @@ -41,7 +41,9 @@ private GTEarlyConfig(File file) { // hidden rules for dev-only mixins addHiddenRule("dev", !FMLLoader.isProduction()); - addHiddenRule("dev.datagen", DatagenModLoader.isRunningDataGen()); + + // mixins that target DatagenModLoader (MixinTargetAlreadyLoadedException). + addHiddenRule("dev.datagen", !FMLLoader.isProduction() && DatagenModLoader.isRunningDataGen()); // bind non-empty parents for (Map.Entry entry : this.options.entrySet()) { diff --git a/src/main/resources/assets/gtceu/models/block/fire_box_active.json b/src/main/resources/assets/gtceu/models/block/fire_box_active.json index 5e14d5ec51b..40c8ebefa41 100644 --- a/src/main/resources/assets/gtceu/models/block/fire_box_active.json +++ b/src/main/resources/assets/gtceu/models/block/fire_box_active.json @@ -18,8 +18,8 @@ } }, { - "from": [ -0.001, 0, -0.001 ], - "to": [ 16.001, 16, 16.001 ], + "from": [ -0.032, 0, -0.032 ], + "to": [ 16.032, 16, 16.032 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json b/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json index 20bf925a323..851a44884aa 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json +++ b/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json @@ -17,8 +17,8 @@ } }, { - "from": [ -0.002, -0.002, -0.002 ], - "to": [ 16.002, 16.002, 16.002 ], + "from": [ -0.032, -0.032, -0.032 ], + "to": [ 16.032, 16.032, 16.032 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, @@ -29,8 +29,8 @@ } }, { - "from": [ -0.004, -0.004, -0.004 ], - "to": [ 16.004, 16.004, 16.004 ], + "from": [ -0.064, -0.064, -0.064 ], + "to": [ 16.064, 16.064, 16.064 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -43,7 +43,7 @@ } }, { - "from": [ 0, -0.01, 16 ], + "from": [ 0, -0.096, 16 ], "to": [ 16, -16 , 32 ], "faces": { "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_pipe", "cullface": "down" } diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json index e69b45d0f64..6f93f717f47 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json index 5dc4947f959..add1e57ee83 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json index 3815dd99f90..952ed04e4f4 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json index fd652772cfd..da8b3454a3f 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json index 9e8af376a0a..1097c43f287 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json index 415ccd17b60..525068356c2 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json index e1d81e02ecf..9b0a5d1a520 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json index 7b35a99a72e..04d4420dc26 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json @@ -19,22 +19,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json index f1678db9e1d..ff5ea964b48 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json @@ -21,22 +21,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_source", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json index 05c81b36821..6a6adf8af65 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json @@ -21,22 +21,22 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_target", "cullface": "north" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json b/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json index 2f63525b6b1..66d3b98f19b 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json @@ -27,8 +27,8 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, @@ -39,8 +39,8 @@ } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json index f82877ed7e7..40d11716dcb 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json @@ -18,8 +18,8 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, @@ -30,8 +30,8 @@ } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -44,15 +44,15 @@ } }, { - "from": [ 0, 0, -0.03 ], - "to": [ 16, 16, -0.03 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_energy_io", "cullface": "north" } } }, { - "from": [ 0, 0, -0.04 ], - "to": [ 16, 16, -0.04 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_energy_tint", "cullface": "north", "tintindex": 2 } } diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine.json index 50de23a67c8..f10f3555f94 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine.json @@ -17,15 +17,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "texture": "#overlay_pipe", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_color_ring.json b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_color_ring.json index fef7994890f..286106cc282 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_color_ring.json @@ -17,15 +17,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "texture": "#overlay_pipe", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -33,8 +33,8 @@ } }, { - "from": [ 0, 0, -0.03 ], - "to": [ 16, 16, -0.03 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive.json b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive.json index a45541aeff5..bd260bca886 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive.json @@ -14,15 +14,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "texture": "#overlay_pipe", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -30,8 +30,8 @@ } }, { - "from": [ 0, 0, -0.03 ], - "to": [ 16, 16, -0.03 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive_color_ring.json b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive_color_ring.json index e5f508dfc8d..22595f790d0 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/part/hatch_machine_emissive_color_ring.json @@ -14,15 +14,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "texture": "#overlay_pipe", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -30,8 +30,8 @@ } }, { - "from": [ 0, 0, -0.03 ], - "to": [ 16, 16, -0.03 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -39,8 +39,8 @@ } }, { - "from": [ 0, 0, -0.04 ], - "to": [ 16, 16, -0.04 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json index cee2181f8d1..ebbfec90ec8 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json @@ -14,15 +14,15 @@ } }, { - "from": [ -0.002, -0.002, -0.002 ], - "to": [ 16.002, 16.002, -0.002 ], + "from": [ -0.032, -0.032, -0.032 ], + "to": [ 16.032, 16.032, -0.032 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ -0.004, -0.004, -0.004 ], - "to": [ 16.004, 16.004, -0.004 ], + "from": [ -0.064, -0.064, -0.064 ], + "to": [ 16.064, 16.064, -0.064 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json index ab7e4360e6c..8dfba1e0376 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json @@ -24,16 +24,16 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#pipe", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#pipe", "cullface": "south" } } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_hatch_in", "rotation": 0, "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_hatch_out", "rotation": 0, "cullface": "south" }, @@ -44,8 +44,8 @@ } }, { - "from": [ -0.03, -0.03, -0.03 ], - "to": [ 16.03, 16.03, 16.03 ], + "from": [ -0.160, -0.160, -0.160 ], + "to": [ 16.160, 16.160, 16.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json index dcf82c96231..ae80ff49b2a 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json @@ -25,8 +25,8 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "up": { "uv": [0, 0, 16, 16], "texture": "#screen", "cullface": "up" }, "down": { "uv": [0, 0, 16, 16], "texture": "#hatch", "cullface": "down" }, @@ -36,8 +36,8 @@ } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json index 7a431f58661..9ffbf83bbdb 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json @@ -6,15 +6,15 @@ }, "elements": [ { - "from": [ -16, -16, -0.017 ], - "to": [ 32, 32, -0.016 ], + "from": [ -16, -16, -0.064 ], + "to": [ 32, 32, -0.032 ], "faces": { "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#ring", "cullface": "north" } } }, { - "from": [ -16, -16, -0.019 ], - "to": [ 32, 32, -0.018 ], + "from": [ -16, -16, -0.128 ], + "to": [ 32, 32, -0.096 ], "faces": { "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#base", "cullface": "north" } } diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle.json b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle.json index 86f9240fadb..dad65044022 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle.json @@ -5,8 +5,8 @@ }, "elements": [ { - "from": [ -16, -16, -0.016 ], - "to": [ 32, 32, -0.016 ], + "from": [ -16, -16, -0.032 ], + "to": [ 32, 32, -0.032 ], "faces": { "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#rotor", "cullface": "north", "tintindex": 2 } } diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle_emissive.json b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle_emissive.json index 0bc52b4f0cf..25727816518 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/rotor_idle_emissive.json @@ -2,8 +2,8 @@ "parent": "gtceu:block/machine/template/rotor_holder/rotor_idle", "elements": [ { - "from": [ -16, -16, -0.016 ], - "to": [ 32, 32, -0.016 ], + "from": [ -16, -16, -0.032 ], + "to": [ 32, 32, -0.032 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json b/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json index eb1a45597eb..ca75b648ffa 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json @@ -27,8 +27,8 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, @@ -39,8 +39,8 @@ } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json index b8ed09dbb02..54d86a3708b 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json @@ -28,8 +28,8 @@ } }, { - "from": [ -0.01, -0.01, -0.01 ], - "to": [ 16.01, 16.01, 16.01 ], + "from": [ -0.096, -0.096, -0.096 ], + "to": [ 16.096, 16.096, 16.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_io", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "south" }, @@ -40,8 +40,8 @@ } }, { - "from": [ -0.04, -0.04, -0.04 ], - "to": [ 16.04, 16.04, 16.04 ], + "from": [ -0.160, -0.160, -0.160 ], + "to": [ 16.160, 16.160, 16.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -54,8 +54,8 @@ } }, { - "from": [ -0.02, -0.02, -0.02 ], - "to": [ 16.02, 16.02, 16.02 ], + "from": [ -0.128, -0.128, -0.128 ], + "to": [ 16.128, 16.128, 16.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_tinted", "cullface": "north", "tintindex": 2 }, "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "south", "tintindex": 3 }, diff --git a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front.json b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front.json index 32333528901..7affafee7d6 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front.json @@ -14,15 +14,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_2", "cullface": "north" } } diff --git a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive.json b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive.json index e19743dfd28..1875ed2e6cb 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive.json @@ -14,15 +14,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive_color_ring.json b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive_color_ring.json index 925acf9316b..1a293db0a9d 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/front_emissive_color_ring.json @@ -17,15 +17,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -33,8 +33,8 @@ } }, { - "from": [ 0, 0, -0.03 ], - "to": [ 16, 16, -0.03 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/tinted/front.json b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/tinted/front.json index 7a0289f65d4..645e98cc6cd 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/tinted/front.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/tinted/front.json @@ -14,15 +14,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tinted", "cullface": "north", "tintindex": 2 } } diff --git a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/top_emissive.json b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/top_emissive.json index fe067dbd0e4..19cf24c8402 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/2_layer/top_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/2_layer/top_emissive.json @@ -14,15 +14,15 @@ } }, { - "from": [ 0, 16.01, 0 ], - "to": [ 16, 16.01, 16 ], + "from": [ 0, 16.096, 0 ], + "to": [ 16, 16.096, 16 ], "faces": { "up": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "up" } } }, { - "from": [ 0, 16.02, 0 ], - "to": [ 16, 16.02, 16 ], + "from": [ 0, 16.128, 0 ], + "to": [ 16, 16.128, 16 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/front.json b/src/main/resources/assets/gtceu/models/block/overlay/front.json index 07d8a9cefaa..40ff752ac6a 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/front.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/front.json @@ -14,8 +14,8 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } diff --git a/src/main/resources/assets/gtceu/models/block/overlay/front_all.json b/src/main/resources/assets/gtceu/models/block/overlay/front_all.json index 5f89a979bf0..17f8c1fe11b 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/front_all.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/front_all.json @@ -14,8 +14,8 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } diff --git a/src/main/resources/assets/gtceu/models/block/overlay/front_color_ring.json b/src/main/resources/assets/gtceu/models/block/overlay/front_color_ring.json index 43746637b4a..702295e514b 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/front_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/front_color_ring.json @@ -17,15 +17,15 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/front_emissive.json b/src/main/resources/assets/gtceu/models/block/overlay/front_emissive.json index d6bd5a1b544..23ed404437d 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/front_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/front_emissive.json @@ -14,8 +14,8 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/front_emissive_color_ring.json b/src/main/resources/assets/gtceu/models/block/overlay/front_emissive_color_ring.json index f805c3333c8..a9352449224 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/front_emissive_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/front_emissive_color_ring.json @@ -17,8 +17,8 @@ } }, { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -26,8 +26,8 @@ } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front.json b/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front.json index 6de9477e886..1cfff4fe684 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front.json @@ -2,15 +2,15 @@ "parent": "gtceu:block/overlay/only/front", "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_2", "cullface": "north" } } diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive.json b/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive.json index 2db54f45d21..0a90ac77147 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive.json @@ -2,15 +2,15 @@ "parent": "gtceu:block/overlay/only/front_emissive", "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive_color_ring.json b/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive_color_ring.json index b257eb22385..c1858328bc2 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/2_layer/front_emissive_color_ring.json @@ -5,15 +5,15 @@ }, "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -21,8 +21,8 @@ } }, { - "from": [ 0, 0, -0.03 ], - "to": [ 16, 16, -0.03 ], + "from": [ 0, 0, -0.160 ], + "to": [ 16, 16, -0.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/front.json b/src/main/resources/assets/gtceu/models/block/overlay/only/front.json index e671cebe65b..45cf54a15fe 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/front.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/front.json @@ -2,8 +2,8 @@ "parent": "block/block", "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/front_color_ring.json b/src/main/resources/assets/gtceu/models/block/overlay/only/front_color_ring.json index 0f1225df31f..695562aa2ef 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/front_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/front_color_ring.json @@ -5,15 +5,15 @@ }, "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive.json b/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive.json index 86194ac5907..48dce6b728b 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive.json @@ -2,8 +2,8 @@ "parent": "block/block", "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive_color_ring.json b/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive_color_ring.json index f6d6fe957a2..d739c7efdc4 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive_color_ring.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/only/front_emissive_color_ring.json @@ -5,8 +5,8 @@ }, "elements": [ { - "from": [ 0, 0, -0.01 ], - "to": [ 16, 16, -0.01 ], + "from": [ 0, 0, -0.096 ], + "to": [ 16, 16, -0.096 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { @@ -14,8 +14,8 @@ } }, { - "from": [ 0, 0, -0.02 ], - "to": [ 16, 16, -0.02 ], + "from": [ 0, 0, -0.128 ], + "to": [ 16, 16, -0.128 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { diff --git a/src/main/resources/assets/gtceu/models/block/overlay/top_emissive.json b/src/main/resources/assets/gtceu/models/block/overlay/top_emissive.json index 73a0f32cbe0..7ce3277bc4a 100644 --- a/src/main/resources/assets/gtceu/models/block/overlay/top_emissive.json +++ b/src/main/resources/assets/gtceu/models/block/overlay/top_emissive.json @@ -14,8 +14,8 @@ } }, { - "from": [ 0, 16.01, 0 ], - "to": [ 16, 16.01, 16 ], + "from": [ 0, 16.096, 0 ], + "to": [ 16, 16.096, 16 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, "faces": { From f7b51afe870577c497a1b2975a5f926c7b8871d3 Mon Sep 17 00:00:00 2001 From: Ghostipedia Date: Sat, 4 Jul 2026 05:41:58 -0400 Subject: [PATCH 2/3] Whoops didn't meant to commit that one --- .../java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java b/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java index 26b6e01a429..14368a84f3e 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java +++ b/src/main/java/com/gregtechceu/gtceu/core/config/GTEarlyConfig.java @@ -41,9 +41,7 @@ private GTEarlyConfig(File file) { // hidden rules for dev-only mixins addHiddenRule("dev", !FMLLoader.isProduction()); - - // mixins that target DatagenModLoader (MixinTargetAlreadyLoadedException). - addHiddenRule("dev.datagen", !FMLLoader.isProduction() && DatagenModLoader.isRunningDataGen()); + addHiddenRule("dev.datagen", DatagenModLoader.isRunningDataGen()); // bind non-empty parents for (Map.Entry entry : this.options.entrySet()) { From 3f1ffb6d3f9ad3edc410058fc9b317c1c2122f9d Mon Sep 17 00:00:00 2001 From: Ghostipedia Date: Sat, 4 Jul 2026 16:29:45 -0400 Subject: [PATCH 3/3] Some formatter fixing --- .../gtceu/models/block/fire_box_active.json | 39 ++-- .../block/machine/large_miner_active.json | 124 ++++++++----- .../machine/part/energy_input_hatch.json | 78 ++++---- .../machine/part/energy_input_hatch_16a.json | 78 ++++---- .../machine/part/energy_input_hatch_4a.json | 78 ++++---- .../machine/part/energy_input_hatch_64a.json | 78 ++++---- .../machine/part/energy_output_hatch.json | 78 ++++---- .../machine/part/energy_output_hatch_16a.json | 78 ++++---- .../machine/part/energy_output_hatch_4a.json | 78 ++++---- .../machine/part/energy_output_hatch_64a.json | 78 ++++---- .../machine/part/laser_source_hatch.json | 82 ++++----- .../machine/part/laser_target_hatch.json | 82 ++++----- .../machine/template/cube_all/sided.json | 135 ++++++++------ .../machine/template/generator_machine.json | 144 +++++++++------ .../template/part/hpca_part_machine.json | 60 +++--- .../template/pipeline_endpoint_machine.json | 105 ++++++++--- .../block/machine/template/pump_machine.json | 97 +++++----- .../template/rotor_holder/overlay.json | 36 ++-- .../block/machine/template/sided/sided.json | 133 ++++++++------ .../template/transformer_like_machine.json | 172 +++++++++++------- 20 files changed, 986 insertions(+), 847 deletions(-) diff --git a/src/main/resources/assets/gtceu/models/block/fire_box_active.json b/src/main/resources/assets/gtceu/models/block/fire_box_active.json index 40c8ebefa41..c58310d6a50 100644 --- a/src/main/resources/assets/gtceu/models/block/fire_box_active.json +++ b/src/main/resources/assets/gtceu/models/block/fire_box_active.json @@ -1,32 +1,37 @@ { "parent": "block/block", - "textures": { - "active_side": "gtceu:block/casings/firebox/machine_casing_firebox_bloom", - "particle": "#side" - }, + "textures": { "active_side": "gtceu:block/casings/firebox/machine_casing_firebox_bloom", "particle": "#side" }, "elements": [ { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], + "from": [0, 0, 0], + "to": [16, 16, 16], "faces": { - "up": { "texture": "#top", "cullface": "up" }, - "down": { "texture": "#bottom", "cullface": "down" }, - "north": { "texture": "#side", "cullface": "north" }, - "south": { "texture": "#side", "cullface": "south" }, - "west": { "texture": "#side", "cullface": "west" }, - "east": { "texture": "#side", "cullface": "east" } + "up": { "texture": "#top", "cullface": "up" }, + "down": { "texture": "#bottom", "cullface": "down" }, + "north": { "texture": "#side", "cullface": "north" }, + "south": { "texture": "#side", "cullface": "south" }, + "west": { "texture": "#side", "cullface": "west" }, + "east": { "texture": "#side", "cullface": "east" } } }, { - "from": [ -0.032, 0, -0.032 ], - "to": [ 16.032, 16, 16.032 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, + "from": [-0.032, 0, 0], + "to": [16.032, 16, 16], + "faces": { + "west": { "texture": "#active_side", "cullface": "west", "tintindex": -101 }, + "east": { "texture": "#active_side", "cullface": "east", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.032], + "to": [16, 16, 16.032], "faces": { "north": { "texture": "#active_side", "cullface": "north", "tintindex": -101 }, - "south": { "texture": "#active_side", "cullface": "south", "tintindex": -101 }, - "west": { "texture": "#active_side", "cullface": "west", "tintindex": -101 }, - "east": { "texture": "#active_side", "cullface": "east", "tintindex": -101 } + "south": { "texture": "#active_side", "cullface": "south", "tintindex": -101 } } } ] diff --git a/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json b/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json index 851a44884aa..aa2448c233e 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json +++ b/src/main/resources/assets/gtceu/models/block/machine/large_miner_active.json @@ -1,53 +1,77 @@ { - "parent": "gtceu:block/machine/template/cube_all/sided", - "textures": { - "overlay_pipe": "gtceu:block/overlay/machine/overlay_pipe" + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { "overlay_pipe": "gtceu:block/overlay/machine/overlay_pipe" }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#all", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#all", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#all", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#all", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#all", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#all", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#all", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#all", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#all", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#all", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#all", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#all", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.032, -0.032, -0.032 ], - "to": [ 16.032, 16.032, 16.032 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } - } - }, - { - "from": [ -0.064, -0.064, -0.064 ], - "to": [ 16.064, 16.064, 16.064 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } - } - }, - { - "from": [ 0, -0.096, 16 ], - "to": [ 16, -16 , 32 ], - "faces": { - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_pipe", "cullface": "down" } - } - } - ] + { + "from": [-0.032, 0, 0], + "to": [16.032, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } + } + }, + { + "from": [0, -0.032, 0], + "to": [16, 16.032, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" } + } + }, + { + "from": [0, 0, -0.032], + "to": [16, 16, 16.032], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [-0.064, 0, 0], + "to": [16.064, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, -0.064, 0], + "to": [16, 16.064, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.064], + "to": [16, 16, 16.064], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 } + } + }, + { + "from": [0, -0.096, 0], + "to": [16, 16, 16], + "faces": { "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_pipe", "cullface": "down" } } + } + ] } diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json index 6f93f717f47..d87b46ad7fd 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_1a_in", - "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_in_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_1a_in", + "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_in_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json index add1e57ee83..b7ad3904e84 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_16a.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_16a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_16a_in", - "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_16a_in_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_16a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_16a_in", + "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_16a_in_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json index 952ed04e4f4..50077e621fe 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_4a.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_4a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_4a_in", - "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_4a_in_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_4a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_4a_in", + "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_4a_in_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json index da8b3454a3f..df195b6dc52 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_input_hatch_64a.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_64a_in", - "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json index 1097c43f287..4ef086759cf 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_1a_in", - "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_out_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_1a_in", + "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_out_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json index 525068356c2..8835aa2d57f 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_16a.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_16a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_16a_in", - "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_16a_out_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_16a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_16a_in", + "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_16a_out_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json index 9b0a5d1a520..352915c0be1 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_4a.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_4a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_4a_in", - "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_4a_out_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_4a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_4a_in", + "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_4a_out_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json index 04d4420dc26..eebe34a7b9f 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/energy_output_hatch_64a.json @@ -1,45 +1,39 @@ { - "parent": "gtceu:block/overlay/2_layer/tinted/front", - "textures": { - "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", - "overlay_in": "gtceu:block/overlay/machine/overlay_energy_64a_in", - "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive" + "parent": "gtceu:block/overlay/2_layer/tinted/front", + "textures": { + "overlay_tint": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_in": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_out_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_tint", "cullface": "north", "tintindex": 2 } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json index ff5ea964b48..9bf981bf1ef 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/laser_source_hatch.json @@ -1,47 +1,41 @@ { - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "particle": "#side", - "overlay_laser": "gtceu:block/overlay/machine/overlay_laser_base", - "overlay_laser_source": "gtceu:block/overlay/machine/overlay_laser_source", - "overlay_laser_source_emissive": "gtceu:block/overlay/machine/overlay_laser_source_emissive" + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side", + "overlay_laser": "gtceu:block/overlay/machine/overlay_laser_base", + "overlay_laser_source": "gtceu:block/overlay/machine/overlay_laser_source", + "overlay_laser_source_emissive": "gtceu:block/overlay/machine/overlay_laser_source_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_source", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_source_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser", "cullface": "north" } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_source", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_source_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json b/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json index 6a6adf8af65..d04e8c35283 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json +++ b/src/main/resources/assets/gtceu/models/block/machine/part/laser_target_hatch.json @@ -1,47 +1,41 @@ { - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "particle": "#side", - "overlay_laser": "gtceu:block/overlay/machine/overlay_laser_base", - "overlay_laser_target": "gtceu:block/overlay/machine/overlay_laser_target", - "overlay_laser_target_emissive": "gtceu:block/overlay/machine/overlay_laser_target_emissive" + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "particle": "#side", + "overlay_laser": "gtceu:block/overlay/machine/overlay_laser_base", + "overlay_laser_target": "gtceu:block/overlay/machine/overlay_laser_target", + "overlay_laser_target_emissive": "gtceu:block/overlay/machine/overlay_laser_target_emissive" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_target", "cullface": "north" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_target_emissive", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.096], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser", "cullface": "north" } } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_target", "cullface": "north" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_laser_target_emissive", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json b/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json index 66d3b98f19b..cc34ad171a4 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/cube_all/sided.json @@ -1,56 +1,83 @@ { - "parent": "gtceu:block/cube/tinted/all", - "textures": { - "overlay_front": "gtceu:block/void", - "overlay_back": "gtceu:block/void", - "overlay_top": "gtceu:block/void", - "overlay_bottom": "gtceu:block/void", - "overlay_side": "gtceu:block/void", - - "overlay_front_emissive": "gtceu:block/void", - "overlay_back_emissive": "gtceu:block/void", - "overlay_top_emissive": "gtceu:block/void", - "overlay_bottom_emissive": "gtceu:block/void", - "overlay_side_emissive": "gtceu:block/void" + "parent": "gtceu:block/cube/tinted/all", + "textures": { + "overlay_front": "gtceu:block/void", + "overlay_back": "gtceu:block/void", + "overlay_top": "gtceu:block/void", + "overlay_bottom": "gtceu:block/void", + "overlay_side": "gtceu:block/void", + "overlay_front_emissive": "gtceu:block/void", + "overlay_back_emissive": "gtceu:block/void", + "overlay_top_emissive": "gtceu:block/void", + "overlay_bottom_emissive": "gtceu:block/void", + "overlay_side_emissive": "gtceu:block/void" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#all", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#all", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#all", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#all", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#all", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#all", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#all", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#all", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#all", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#all", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#all", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#all", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } - } - } - ] -} \ No newline at end of file + { + "from": [-0.096, 0, 0], + "to": [16.096, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } + } + }, + { + "from": [0, -0.096, 0], + "to": [16, 16.096, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" } + } + }, + { + "from": [0, 0, -0.096], + "to": [16, 16, 16.096], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [-0.128, 0, 0], + "to": [16.128, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, -0.128, 0], + "to": [16, 16.128, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16.128], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 } + } + } + ] +} diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json index 40d11716dcb..20596722211 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/generator_machine.json @@ -1,61 +1,87 @@ { - "parent": "gtceu:block/machine/template/sided/sided", - "textures": { - "overlay_energy_io": "gtceu:block/overlay/machine/overlay_energy_1a_in", - "overlay_energy_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } - } - }, - { - "from": [ 0, 0, -0.160 ], - "to": [ 16, 16, -0.160 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_energy_io", "cullface": "north" } - } - }, - { - "from": [ 0, 0, -0.160 ], - "to": [ 16, 16, -0.160 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_energy_tint", "cullface": "north", "tintindex": 2 } - } - } - ] + "parent": "gtceu:block/machine/template/sided/sided", + "textures": { + "overlay_energy_io": "gtceu:block/overlay/machine/overlay_energy_1a_in", + "overlay_energy_tint": "gtceu:block/overlay/machine/overlay_energy_1a_tinted" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } + }, + { + "from": [-0.096, 0, 0], + "to": [16.096, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } + } + }, + { + "from": [0, -0.096, 0], + "to": [16, 16.096, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" } + } + }, + { + "from": [0, 0, -0.096], + "to": [16, 16, 16.096], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [-0.128, 0, 0], + "to": [16.128, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, -0.128, 0], + "to": [16, 16.128, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16.128], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 } + } + }, + { + "from": [0, 0, -0.16], + "to": [16, 16, -0.16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_energy_io", "cullface": "north" } } + }, + { + "from": [0, 0, -0.16], + "to": [16, 16, -0.16], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_energy_tint", "cullface": "north", "tintindex": 2 } + } + } + ] } diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json index ebbfec90ec8..a6f11277574 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/part/hpca_part_machine.json @@ -1,33 +1,31 @@ { - "parent": "gtceu:block/overlay/2_layer/front_emissive", - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down" }, - "up": { "texture": "#top", "cullface": "up" }, - "north": { "texture": "#front", "cullface": "north" }, - "south": { "texture": "#back", "cullface": "south" }, - "west": { "texture": "#side", "cullface": "west" }, - "east": { "texture": "#side", "cullface": "east" } - } - }, - { - "from": [ -0.032, -0.032, -0.032 ], - "to": [ 16.032, 16.032, -0.032 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } - } - }, - { - "from": [ -0.064, -0.064, -0.064 ], - "to": [ 16.064, 16.064, -0.064 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_emissive", "cullface": "north", "tintindex": -101 } - } - } - ] + "parent": "gtceu:block/overlay/2_layer/front_emissive", + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down" }, + "up": { "texture": "#top", "cullface": "up" }, + "north": { "texture": "#front", "cullface": "north" }, + "south": { "texture": "#back", "cullface": "south" }, + "west": { "texture": "#side", "cullface": "west" }, + "east": { "texture": "#side", "cullface": "east" } + } + }, + { + "from": [0, 0, -0.032], + "to": [16, 16, -0.032], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#overlay", "cullface": "north" } } + }, + { + "from": [0, 0, -0.064], + "to": [16, 16, -0.064], + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_emissive", "cullface": "north", "tintindex": -101 } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json index 8dfba1e0376..5b7a2b86390 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/pipeline_endpoint_machine.json @@ -5,56 +5,107 @@ "bottom": "gtceu:block/casings/voltage/lv/bottom", "top": "gtceu:block/casings/voltage/lv/top", "side": "gtceu:block/casings/voltage/lv/side", - "pipe": "gtceu:block/overlay/machine/overlay_pipe", "overlay_front_emissive": "gtceu:block/overlay/machine/overlay_pipe_in_emissive", "overlay_back_emissive": "gtceu:block/overlay/machine/overlay_pipe_out_emissive" }, "elements": [ { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], + "from": [0, 0, 0], + "to": [16, 16, 16], "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } } }, { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], + "from": [0, 0, -0.096], + "to": [16, 16, 16.096], "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#pipe", "cullface": "north" }, "south": { "uv": [0, 0, 16, 16], "texture": "#pipe", "cullface": "south" } } }, { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], + "from": [-0.128, 0, 0], + "to": [16.128, 16, 16], "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_hatch_in", "rotation": 0, "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_hatch_out", "rotation": 0, "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 180, "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 0, "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 90, "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 270, "cullface": "east" } + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 90, "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 270, "cullface": "east" } + } + }, + { + "from": [0, -0.128, 0], + "to": [16, 16.128, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 180, "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "rotation": 0, "cullface": "down" } + } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16.128], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_hatch_in", "rotation": 0, "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_hatch_out", "rotation": 0, "cullface": "south" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [-0.16, 0, 0], + "to": [16.16, 16, 16], + "faces": { + "west": { + "uv": [0, 0, 16, 16], + "texture": "#overlay_side_emissive", + "rotation": 90, + "cullface": "west", + "tintindex": -101 + }, + "east": { + "uv": [0, 0, 16, 16], + "texture": "#overlay_side_emissive", + "rotation": 270, + "cullface": "east", + "tintindex": -101 + } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, -0.16, 0], + "to": [16, 16.16, 16], + "faces": { + "up": { + "uv": [0, 0, 16, 16], + "texture": "#overlay_side_emissive", + "rotation": 180, + "cullface": "up", + "tintindex": -101 + }, + "down": { + "uv": [0, 0, 16, 16], + "texture": "#overlay_side_emissive", + "rotation": 0, + "cullface": "down", + "tintindex": -101 + } } }, { - "from": [ -0.160, -0.160, -0.160 ], - "to": [ 16.160, 16.160, 16.160 ], "neoforge_data": { "block_light": 15, "sky_light": 15 }, "shade": false, + "from": [0, 0, -0.16], + "to": [16, 16, 16.16], "faces": { - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "rotation": 180, "cullface": "up", "tintindex": -101 }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "rotation": 0, "cullface": "down", "tintindex": -101 }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "rotation": 90, "cullface": "west", "tintindex": -101 }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "rotation": 270, "cullface": "east", "tintindex": -101 }, - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 } + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 } } } ] diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json index ae80ff49b2a..c12ee547329 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/pump_machine.json @@ -1,48 +1,55 @@ { - "parent": "block/block", - "textures": { - "particle": "#side", - "bottom": "gtceu:block/casings/voltage/lv/bottom", - "top": "gtceu:block/casings/voltage/lv/top", - "side": "gtceu:block/casings/voltage/lv/side", - - "screen": "gtceu:block/overlay/machine/overlay_screen", - "screen_emissive": "gtceu:block/overlay/machine/overlay_screen_emissive", - "hatch": "gtceu:block/overlay/machine/overlay_hatch", - "pump": "gtceu:block/overlay/machine/overlay_adv_pump" + "parent": "block/block", + "textures": { + "particle": "#side", + "bottom": "gtceu:block/casings/voltage/lv/bottom", + "top": "gtceu:block/casings/voltage/lv/top", + "side": "gtceu:block/casings/voltage/lv/side", + "screen": "gtceu:block/overlay/machine/overlay_screen", + "screen_emissive": "gtceu:block/overlay/machine/overlay_screen_emissive", + "hatch": "gtceu:block/overlay/machine/overlay_hatch", + "pump": "gtceu:block/overlay/machine/overlay_adv_pump" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "up": { "uv": [0, 0, 16, 16], "texture": "#screen", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#hatch", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#pump", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#pump", "cullface": "east" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#pump", "cullface": "south" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "up": { "uv": [0, 0, 16, 16], "texture": "#screen_emissive", "cullface": "up", "tintindex": -101 } - } - } - ] + { + "from": [-0.096, 0, 0], + "to": [16.096, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#pump", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#pump", "cullface": "east" } + } + }, + { + "from": [0, -0.096, 0], + "to": [16, 16.096, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#screen", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#hatch", "cullface": "down" } + } + }, + { + "from": [0, 0, 0], + "to": [16, 16, 16.096], + "faces": { "south": { "uv": [0, 0, 16, 16], "texture": "#pump", "cullface": "south" } } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, 0], + "to": [16, 16.128, 16], + "faces": { "up": { "uv": [0, 0, 16, 16], "texture": "#screen_emissive", "cullface": "up", "tintindex": -101 } } + } + ] } diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json index 9ffbf83bbdb..48ad69c4a89 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/rotor_holder/overlay.json @@ -1,23 +1,19 @@ { - "parent": "block/block", - "textures": { - "base": "gtceu:block/multiblock/large_turbine/base_bg", - "ring": "gtceu:block/multiblock/large_turbine/base_ring" + "parent": "block/block", + "textures": { + "base": "gtceu:block/multiblock/large_turbine/base_bg", + "ring": "gtceu:block/multiblock/large_turbine/base_ring" + }, + "elements": [ + { + "from": [0, 0, -0.064], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#ring", "cullface": "north" } } }, - "elements": [ - { - "from": [ -16, -16, -0.064 ], - "to": [ 32, 32, -0.032 ], - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#ring", "cullface": "north" } - } - }, - { - "from": [ -16, -16, -0.128 ], - "to": [ 32, 32, -0.096 ], - "faces": { - "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#base", "cullface": "north" } - } - } - ] + { + "from": [0, 0, -0.128], + "to": [16, 16, 16], + "faces": { "north": { "uv": [0, 0, 16, 16], "texture": "#base", "cullface": "north" } } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json b/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json index ca75b648ffa..806f923a91a 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/sided/sided.json @@ -1,56 +1,83 @@ { - "parent": "gtceu:block/cube/tinted/bottom_top", - "textures": { - "overlay_front": "gtceu:block/void", - "overlay_back": "gtceu:block/void", - "overlay_top": "gtceu:block/void", - "overlay_bottom": "gtceu:block/void", - "overlay_side": "gtceu:block/void", - - "overlay_front_emissive": "gtceu:block/void", - "overlay_back_emissive": "gtceu:block/void", - "overlay_top_emissive": "gtceu:block/void", - "overlay_bottom_emissive": "gtceu:block/void", - "overlay_side_emissive": "gtceu:block/void" + "parent": "gtceu:block/cube/tinted/bottom_top", + "textures": { + "overlay_front": "gtceu:block/void", + "overlay_back": "gtceu:block/void", + "overlay_top": "gtceu:block/void", + "overlay_bottom": "gtceu:block/void", + "overlay_side": "gtceu:block/void", + "overlay_front_emissive": "gtceu:block/void", + "overlay_back_emissive": "gtceu:block/void", + "overlay_top_emissive": "gtceu:block/void", + "overlay_bottom_emissive": "gtceu:block/void", + "overlay_side_emissive": "gtceu:block/void" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } - } - } - ] + { + "from": [-0.096, 0, 0], + "to": [16.096, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side", "cullface": "east" } + } + }, + { + "from": [0, -0.096, 0], + "to": [16, 16.096, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom", "cullface": "down" } + } + }, + { + "from": [0, 0, -0.096], + "to": [16, 16, 16.096], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back", "cullface": "south" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [-0.128, 0, 0], + "to": [16.128, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "west", "tintindex": -101 }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_side_emissive", "cullface": "east", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, -0.128, 0], + "to": [16, 16.128, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_top_emissive", "cullface": "up", "tintindex": -101 }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_bottom_emissive", "cullface": "down", "tintindex": -101 } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.128], + "to": [16, 16, 16.128], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_front_emissive", "cullface": "north", "tintindex": -101 }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_back_emissive", "cullface": "south", "tintindex": -101 } + } + } + ] } diff --git a/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json b/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json index 54d86a3708b..359a977867e 100644 --- a/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json +++ b/src/main/resources/assets/gtceu/models/block/machine/template/transformer_like_machine.json @@ -1,69 +1,107 @@ { - "parent": "gtceu:block/cube/tinted/bottom_top", - "textures": { - "particle": "#side", - - "bottom": "gtceu:block/casings/voltage/lv/bottom", - "top": "gtceu:block/casings/voltage/lv/top", - "side": "gtceu:block/casings/voltage/lv/side", - - "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_1a_in", - "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_in_emissive", - "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_1a_tinted", - "overlay_out_io": "gtceu:block/overlay/machine/overlay_energy_1a_out", - "overlay_out_io_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_out_emissive", - "overlay_out_tinted": "gtceu:block/void" + "parent": "gtceu:block/cube/tinted/bottom_top", + "textures": { + "particle": "#side", + "bottom": "gtceu:block/casings/voltage/lv/bottom", + "top": "gtceu:block/casings/voltage/lv/top", + "side": "gtceu:block/casings/voltage/lv/side", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_1a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_1a_tinted", + "overlay_out_io": "gtceu:block/overlay/machine/overlay_energy_1a_out", + "overlay_out_io_emissive": "gtceu:block/overlay/machine/overlay_energy_1a_out_emissive", + "overlay_out_tinted": "gtceu:block/void" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, + "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, + "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, + "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, + "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, + "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } + } }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 16, 16 ], - "faces": { - "down": { "texture": "#bottom", "cullface": "down", "tintindex": 1 }, - "up": { "texture": "#top", "cullface": "up", "tintindex": 1 }, - "north": { "texture": "#side", "cullface": "north", "tintindex": 1 }, - "south": { "texture": "#side", "cullface": "south", "tintindex": 1 }, - "west": { "texture": "#side", "cullface": "west", "tintindex": 1 }, - "east": { "texture": "#side", "cullface": "east", "tintindex": 1 } - } - }, - { - "from": [ -0.096, -0.096, -0.096 ], - "to": [ 16.096, 16.096, 16.096 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_io", "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "east" } - } - }, - { - "from": [ -0.160, -0.160, -0.160 ], - "to": [ 16.160, 16.160, 16.160 ], - "neoforge_data": { "block_light": 15, "sky_light": 15 }, - "shade": false, - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_io_emissive", "cullface": "north" }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "south" }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "up" }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "down" }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "west" }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "east" } - } - }, - { - "from": [ -0.128, -0.128, -0.128 ], - "to": [ 16.128, 16.128, 16.128 ], - "faces": { - "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_tinted", "cullface": "north", "tintindex": 2 }, - "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "south", "tintindex": 3 }, - "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "up", "tintindex": 3 }, - "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "down", "tintindex": 3 }, - "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "west", "tintindex": 3 }, - "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "east", "tintindex": 3 } - } - } - ] -} \ No newline at end of file + { + "from": [-0.096, 0, 0], + "to": [16.096, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "east" } + } + }, + { + "from": [0, -0.096, 0], + "to": [16, 16.096, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "down" } + } + }, + { + "from": [0, 0, -0.096], + "to": [16, 16, 16.096], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_io", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io", "cullface": "south" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [-0.16, 0, 0], + "to": [16.16, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "west" }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "east" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, -0.16, 0], + "to": [16, 16.16, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "up" }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "down" } + } + }, + { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, + "shade": false, + "from": [0, 0, -0.16], + "to": [16, 16, 16.16], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_io_emissive", "cullface": "north" }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_io_emissive", "cullface": "south" } + } + }, + { + "from": [-0.128, 0, 0], + "to": [16.128, 16, 16], + "faces": { + "west": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "west", "tintindex": 3 }, + "east": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "east", "tintindex": 3 } + } + }, + { + "from": [0, -0.128, 0], + "to": [16, 16.128, 16], + "faces": { + "up": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "up", "tintindex": 3 }, + "down": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "down", "tintindex": 3 } + } + }, + { + "from": [0, 0, -0.128], + "to": [16, 16, 16.128], + "faces": { + "north": { "uv": [0, 0, 16, 16], "texture": "#overlay_in_tinted", "cullface": "north", "tintindex": 2 }, + "south": { "uv": [0, 0, 16, 16], "texture": "#overlay_out_tinted", "cullface": "south", "tintindex": 3 } + } + } + ] +}