From 4a3a88e9d8e4381fd7bdc66d3c2bd5746f8b4fe5 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Fri, 24 Nov 2023 16:29:16 +0100 Subject: [PATCH] final touches --- .../2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 | 11 +- .../9047e4e94996e73e9dfde3738763637fb609e07e | 4 +- .../blockstates/blast_furnace_output.json | 16 +- .../assets/createindustry/lang/en_us.json | 6 + .../models/block/blast_furnace_output.json | 6 - .../models/item/blast_furnace_output.json | 2 +- .../models/item/engine_base.json | 2 +- .../item/fireproof_brick_reinforcement.json | 5 +- .../diesel/DieselEngineBlockEntity.java | 87 ++++++--- .../engines/intake/AirIntakeBlockEntity.java | 2 +- .../small/AbstractEngineTileEntity.java | 4 +- .../machines/exhaust/ExhaustBlockEntity.java | 5 +- .../BlastFurnaceOutputBlockEntity.java | 61 +++++-- .../blast_furnace/MoltenMetalBlockEntity.java | 2 +- .../createindustry/registry/TFMGBlocks.java | 5 +- .../createindustry/registry/TFMGItems.java | 2 +- .../registry/TFMGSoundEvents.java | 12 +- .../createindustry/registry/TFMGSounds.java | 4 - .../lang/default/interface.json | 5 +- .../block_horizontal_closed.json | 6 +- .../block_horizontal_open.json | 6 +- .../block_vertical_closed.json | 6 +- .../block_vertical_open.json | 6 +- .../block/aluminum_fluid_valve/item.json | 6 +- .../block/aluminum_fluid_valve/pointer.json | 4 +- .../block/aluminum_mechanical_pump/block.json | 6 +- .../block/aluminum_mechanical_pump/item.json | 6 +- .../aluminum_smart_fluid_pipe/block.json | 6 +- .../block/aluminum_smart_fluid_pipe/item.json | 6 +- .../blast_furnace_output.json | 22 +++ .../block/blast_furnace_output/block.json | 23 +++ .../block/blast_furnace_output/item.json | 23 +++ .../block/brass_fluid_tank/block_bottom.json | 74 -------- .../brass_fluid_tank/block_bottom_window.json | 154 ---------------- .../block_bottom_window_ne.json | 73 -------- .../block_bottom_window_nw.json | 73 -------- .../block_bottom_window_se.json | 73 -------- .../block_bottom_window_sw.json | 73 -------- .../block/brass_fluid_tank/block_middle.json | 57 ------ .../brass_fluid_tank/block_middle_window.json | 138 -------------- .../block_middle_window_ne.json | 57 ------ .../block_middle_window_nw.json | 57 ------ .../block_middle_window_se.json | 57 ------ .../block_middle_window_sw.json | 57 ------ .../block/brass_fluid_tank/block_single.json | 127 ------------- .../brass_fluid_tank/block_single_window.json | 168 ------------------ .../block_single_window_ne.json | 104 ----------- .../block_single_window_nw.json | 104 ----------- .../block_single_window_se.json | 104 ----------- .../block_single_window_sw.json | 104 ----------- .../block/brass_fluid_tank/block_top.json | 71 -------- .../brass_fluid_tank/block_top_window.json | 154 ---------------- .../brass_fluid_tank/block_top_window_ne.json | 77 -------- .../brass_fluid_tank/block_top_window_nw.json | 77 -------- .../brass_fluid_tank/block_top_window_se.json | 77 -------- .../brass_fluid_tank/block_top_window_sw.json | 77 -------- .../block_horizontal_closed.json | 6 +- .../block_horizontal_open.json | 6 +- .../block_vertical_closed.json | 6 +- .../block_vertical_open.json | 6 +- .../models/block/brass_fluid_valve/item.json | 6 +- .../block/brass_fluid_valve/pointer.json | 4 +- .../block/brass_mechanical_pump/block.json | 6 +- .../block/brass_mechanical_pump/item.json | 6 +- .../block/brass_smart_fluid_pipe/block.json | 6 +- .../block/brass_smart_fluid_pipe/item.json | 6 +- .../cast_iron_fluid_tank/block_bottom.json | 74 -------- .../block_bottom_window.json | 154 ---------------- .../block_bottom_window_ne.json | 73 -------- .../block_bottom_window_nw.json | 73 -------- .../block_bottom_window_se.json | 73 -------- .../block_bottom_window_sw.json | 73 -------- .../cast_iron_fluid_tank/block_middle.json | 57 ------ .../block_middle_window.json | 138 -------------- .../block_middle_window_ne.json | 57 ------ .../block_middle_window_nw.json | 57 ------ .../block_middle_window_se.json | 57 ------ .../block_middle_window_sw.json | 57 ------ .../cast_iron_fluid_tank/block_single.json | 127 ------------- .../block_single_window.json | 168 ------------------ .../block_single_window_ne.json | 104 ----------- .../block_single_window_nw.json | 104 ----------- .../block_single_window_se.json | 104 ----------- .../block_single_window_sw.json | 104 ----------- .../block/cast_iron_fluid_tank/block_top.json | 71 -------- .../block_top_window.json | 154 ---------------- .../block_top_window_ne.json | 77 -------- .../block_top_window_nw.json | 77 -------- .../block_top_window_se.json | 77 -------- .../block_top_window_sw.json | 77 -------- .../block_horizontal_closed.json | 6 +- .../block_horizontal_open.json | 6 +- .../block_vertical_closed.json | 6 +- .../block_vertical_open.json | 6 +- .../block/cast_iron_fluid_valve/item.json | 6 +- .../block/cast_iron_fluid_valve/pointer.json | 4 +- .../cast_iron_mechanical_pump/block.json | 6 +- .../block/cast_iron_mechanical_pump/item.json | 6 +- .../cast_iron_smart_fluid_pipe/block.json | 6 +- .../cast_iron_smart_fluid_pipe/item.json | 6 +- .../models/block/casting_spout/item.json | 9 +- .../block_open.json | 4 +- .../copper_encased_brass_pipe/block_open.json | 4 +- .../block_open.json | 4 +- .../block_open.json | 4 +- .../models/block/gasoline_engine/block.json | 2 +- .../models/block/gasoline_engine/item.json | 2 +- .../models/block/lpg_engine/block.json | 101 +++++------ .../models/block/lpg_engine/item.json | 116 ++++++------ .../models/block/lpg_engine_back/block.json | 112 ++++++------ .../models/block/lpg_engine_back/item.json | 114 ++++++------ .../block_horizontal_closed.json | 6 +- .../block_horizontal_open.json | 6 +- .../block_vertical_closed.json | 6 +- .../block_vertical_open.json | 6 +- .../block/plastic_fluid_valve/item.json | 6 +- .../block/plastic_fluid_valve/pointer.json | 4 +- .../block/plastic_mechanical_pump/block.json | 6 +- .../block/plastic_mechanical_pump/item.json | 6 +- .../block/plastic_smart_fluid_pipe/block.json | 6 +- .../block/plastic_smart_fluid_pipe/item.json | 6 +- .../block_horizontal_closed.json | 6 +- .../block_horizontal_open.json | 6 +- .../block_vertical_closed.json | 6 +- .../block_vertical_open.json | 6 +- .../models/block/steel_fluid_valve/item.json | 6 +- .../block/steel_fluid_valve/pointer.json | 4 +- .../block/steel_smart_fluid_pipe/block.json | 6 +- .../block/steel_smart_fluid_pipe/item.json | 6 +- .../models/block/turbine_engine/block.json | 48 ++--- .../models/block/turbine_engine/item.json | 62 +++---- .../block/turbine_engine_back/block.json | 104 +++++------ .../block/turbine_engine_back/item.json | 104 +++++------ .../models/item/unfinished_engine.json | 80 ++++++--- .../assets/createindustry/sounds.json | 12 +- .../createindustry/sounds/diesel_engine.ogg | Bin 6817 -> 7130 bytes .../sounds/{diesel_engine_.ogg => engine.ogg} | Bin 6817 -> 6817 bytes .../textures/block/aluminum_pipes.png | Bin 538 -> 565 bytes .../textures/block/aluminum_smart_pipe_1.png | Bin 223 -> 295 bytes .../textures/block/aluminum_smart_pipe_2.png | Bin 263 -> 300 bytes .../textures/block/blast_furnace_output.png | Bin 273 -> 274 bytes .../textures/block/blast_furnace_slot_lit.png | Bin 183 -> 0 bytes .../textures/block/brass_pipes.png | Bin 560 -> 581 bytes ...cast_iron_distillation_controller_side.png | Bin 267 -> 250 bytes .../cast_iron_distillation_controller_top.png | Bin 239 -> 235 bytes .../textures/block/cast_iron_pipes.png | Bin 532 -> 560 bytes .../block/copper_encased_aluminum_pipe.png | Bin 673 -> 673 bytes .../block/copper_encased_brass_pipe.png | Bin 673 -> 673 bytes .../block/copper_encased_cast_iron_pipe.png | Bin 673 -> 673 bytes .../block/copper_encased_plastic_pipe.png | Bin 673 -> 674 bytes .../block/distillation_controller.png | Bin 449 -> 244 bytes .../block/distillation_controller_front.png | Bin 476 -> 269 bytes .../block/distillation_controller_top.png | Bin 475 -> 245 bytes .../block/distillation_tower_output.png | Bin 505 -> 253 bytes .../textures/block/distiller_side.png | Bin 212 -> 198 bytes .../textures/block/engines/lpg.png | Bin 0 -> 1583 bytes .../textures/block/engines/turbine.png | Bin 0 -> 2504 bytes .../createindustry/textures/block/exhaust.png | Bin 773 -> 385 bytes .../createindustry/textures/block/img.png | Bin 493 -> 0 bytes .../textures/block/molten_metal.png.mcmeta | 5 + .../textures/block/plastic_pipes.png | Bin 897 -> 579 bytes .../textures/block/pumpjack_hammer_holder.png | Bin 19028 -> 0 bytes .../block/steel_distillation_controller.png | Bin 19028 -> 0 bytes .../block/steel_distillation_output.png | Bin 19028 -> 0 bytes .../textures/item/engine_base.png | Bin 0 -> 1316 bytes .../textures/item/molten_slag_bucket.png | Bin 19028 -> 233 bytes .../textures/item/molten_steel_bucket.png | Bin 19028 -> 230 bytes 167 files changed, 824 insertions(+), 5024 deletions(-) delete mode 100644 src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json delete mode 100644 src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java create mode 100644 src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json create mode 100644 src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json create mode 100644 src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json delete mode 100644 src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json rename src/main/resources/assets/createindustry/sounds/{diesel_engine_.ogg => engine.ogg} (97%) delete mode 100644 src/main/resources/assets/createindustry/textures/block/blast_furnace_slot_lit.png create mode 100644 src/main/resources/assets/createindustry/textures/block/engines/lpg.png create mode 100644 src/main/resources/assets/createindustry/textures/block/engines/turbine.png delete mode 100644 src/main/resources/assets/createindustry/textures/block/img.png create mode 100644 src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta delete mode 100644 src/main/resources/assets/createindustry/textures/block/pumpjack_hammer_holder.png delete mode 100644 src/main/resources/assets/createindustry/textures/block/steel_distillation_controller.png delete mode 100644 src/main/resources/assets/createindustry/textures/block/steel_distillation_output.png create mode 100644 src/main/resources/assets/createindustry/textures/item/engine_base.png diff --git a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 index 1482a952..d09b6d30 100644 --- a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 +++ b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 @@ -1,4 +1,4 @@ -// 1.19.2 2023-11-20T19:08:09.5245416 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2023-11-24T16:01:59.4253252 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 50db526af77cf0ead08cadfd3f7daa8b84a40312 assets/createindustry/blockstates/air_intake.json 429437419b2ec98bd716e7ba15583b84da7488d5 assets/createindustry/blockstates/aluminum_bars.json 9e2417e479011e42ebf00685068e6b6f515f0b11 assets/createindustry/blockstates/aluminum_block.json @@ -17,7 +17,7 @@ e464e2a4f734edddc561ed16c6ef59cff24f7c48 assets/createindustry/blockstates/aspha 35f7a107bbc2bbfad56a162600e61ea7cdda7b46 assets/createindustry/blockstates/black_concrete_slab.json 93a81066656b7dd0e3ddfa5c0acef85773691cbe assets/createindustry/blockstates/black_concrete_stairs.json e7be4ba03250473eed90673c18fa8ff499df4b2e assets/createindustry/blockstates/black_concrete_wall.json -28a19ed8b175249688bc50ae3a35112d8abd512d assets/createindustry/blockstates/blast_furnace_output.json +9444760b497a6f7a8b01dbbb9ef3c6d1c4cce578 assets/createindustry/blockstates/blast_furnace_output.json f844fd0e8d4d18f36fc3cf4e8872f1427f273101 assets/createindustry/blockstates/blue_concrete.json c45124689815c652aae0f78c9be6eb6e28d4d5d4 assets/createindustry/blockstates/blue_concrete_slab.json b1cbcdfd1c4d9db7fb6a8d11ab91ffa9e877178a assets/createindustry/blockstates/blue_concrete_stairs.json @@ -259,7 +259,6 @@ b1cb25fd75ba3214259057a2dcf15a1e53d172a7 assets/createindustry/models/block/blac 2874710cce75d9843bfda790d33450fa9d3c8633 assets/createindustry/models/block/black_concrete_wall_post.json 91f43a357e0bc0eab574dcd1dbc99cce0c95a1a6 assets/createindustry/models/block/black_concrete_wall_side.json 6d174eda9847bedac4bf8b5cd8e8fa1a60dee253 assets/createindustry/models/block/black_concrete_wall_side_tall.json -8d715dbacd408caf5dbb2b9e7a4ae33375791bbf assets/createindustry/models/block/blast_furnace_output.json f63e93efe0f94a2ac0305a22da0bd789be4e54b0 assets/createindustry/models/block/blue_concrete.json 67fd5155f2c2023090effe05a3dc74fc9246d581 assets/createindustry/models/block/blue_concrete_bottom.json 0bd92cb7c5640afb38fb39bc39b5cf6fdc83c51f assets/createindustry/models/block/blue_concrete_stairs.json @@ -643,7 +642,7 @@ d781586c69140d00c4698d434426725148e53127 assets/createindustry/models/item/black 9cf294ab7912a46233883d3e8118cfa2171d3676 assets/createindustry/models/item/black_concrete_stairs.json 28865a2b9212f1bcc4a65a32002623bc186da9b1 assets/createindustry/models/item/black_concrete_wall.json bffbc5ebd39352eaca157e47c44cf3a7d43a29dc assets/createindustry/models/item/blasting_mixture.json -fc1b51136dffe2202bca9af77b0888e91a0b6232 assets/createindustry/models/item/blast_furnace_output.json +eb79e25c93a3d2251496fddc141e749d2ace2b01 assets/createindustry/models/item/blast_furnace_output.json c7e6bbd897b6eb363505e2840b62ec9cee129894 assets/createindustry/models/item/block_mold.json 0e500b3a21b83741ff9a6015fa60bd944f4a9dc0 assets/createindustry/models/item/blue_concrete.json d45354dde8bd8d573bd9ef0e879562795b9b0816 assets/createindustry/models/item/blue_concrete_slab.json @@ -698,7 +697,7 @@ a41929b5df14622b2132c410bcf434b0d728359b assets/createindustry/models/item/cyan_ c41b0d18dd34675d2a9bde1a1a47fb62800e0197 assets/createindustry/models/item/diesel_bucket.json a52e5b74d112f98514db2f39db50cf3f90f9e21c assets/createindustry/models/item/diesel_engine.json 6bff071e67b471a8c6cf0da2442568022ad03edf assets/createindustry/models/item/diesel_engine_expansion.json -d3cd252768cca977d57b814d836630e8eb5ef561 assets/createindustry/models/item/engine_base.json +48a0ea668640b5c304f741b2dc65897ec0810d13 assets/createindustry/models/item/engine_base.json 83e4b84c02445ef94071122a1f9e4841bc4f6672 assets/createindustry/models/item/engine_chamber.json 2e64755176a4d754a4157884e654ea010f9f11aa assets/createindustry/models/item/exhaust.json 19de5aea7331fb1d50f95ee5ac3524e1c4de73e6 assets/createindustry/models/item/factory_floor.json @@ -708,7 +707,7 @@ a3aa70d1667e1cb2ad3a355aa2df5f02fe19fa87 assets/createindustry/models/item/facto b59c027fe75c566a73d1c068f0558e0c8d262226 assets/createindustry/models/item/fireclay_ball.json 3458844b44afee270059968cc283e48783833311 assets/createindustry/models/item/fireproof_brick.json 5977d3dbc4baaef30bbaf5fc1f0dba0ee8df2008 assets/createindustry/models/item/fireproof_bricks.json -1aa5286394e981be037c8f4b5f5d98004bd70122 assets/createindustry/models/item/fireproof_brick_reinforcement.json +4375c1b9f57ca9b5b5cf700b9b7c4ff25c554650 assets/createindustry/models/item/fireproof_brick_reinforcement.json 004725e848bb688280bcb1e0bb03901ab640318a assets/createindustry/models/item/flarestack.json 51b592f033acb1ebef30bcccb5893e8532169eeb assets/createindustry/models/item/formwork_block.json 643ec369a783780a0c783c3190613930536d2141 assets/createindustry/models/item/fossilstone.json diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index bf78217f..2b233a82 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-11-16T14:05:17.9855042 Create: The Factory Must Grow's lang merger -8022b7f5699915d93776d948467ffc363cef009e assets/createindustry/lang/en_us.json +// 1.19.2 2023-11-24T16:01:59.4223239 Create: The Factory Must Grow's lang merger +b27bea40ccf70838d54173cae8099faafdd1ee11 assets/createindustry/lang/en_us.json diff --git a/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json b/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json index d2a22bdd..2f48a669 100644 --- a/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json +++ b/src/generated/resources/assets/createindustry/blockstates/blast_furnace_output.json @@ -1,7 +1,19 @@ { "variants": { - "": { - "model": "createindustry:block/blast_furnace_output" + "facing=east": { + "model": "createindustry:block/blast_furnace_output/block", + "y": 90 + }, + "facing=north": { + "model": "createindustry:block/blast_furnace_output/block" + }, + "facing=south": { + "model": "createindustry:block/blast_furnace_output/block", + "y": 180 + }, + "facing=west": { + "model": "createindustry:block/blast_furnace_output/block", + "y": 270 } } } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/lang/en_us.json b/src/generated/resources/assets/createindustry/lang/en_us.json index 05f8ed52..753ec63c 100644 --- a/src/generated/resources/assets/createindustry/lang/en_us.json +++ b/src/generated/resources/assets/createindustry/lang/en_us.json @@ -419,6 +419,9 @@ "createindustry.ponder.tag.oil.description": "Machines that extract, process or use Crude Oil and its byproducts", "createindustry.ponder.tag.metallurgy.description": "Machines that produce, process or use Metal and raw materials as such", + "createindustry.subtitle.engine_sounds": "Engine Sounds", + "createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds", + "_": "->------------------------] UI & Messages [------------------------<-", @@ -494,6 +497,9 @@ "create.recipe.casting": "Casting", "create.recipe.coking": "Coking", + "createindustry.subtitle.engine_sounds": "Engine Sounds", + "createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds", + "_": "->------------------------] Ponders [------------------------<-", diff --git a/src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json b/src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json deleted file mode 100644 index 6d2e241c..00000000 --- a/src/generated/resources/assets/createindustry/models/block/blast_furnace_output.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "createindustry:block/blast_furnace_output" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json b/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json index 07e7cc48..3e79ac6c 100644 --- a/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json +++ b/src/generated/resources/assets/createindustry/models/item/blast_furnace_output.json @@ -1,3 +1,3 @@ { - "parent": "createindustry:block/blast_furnace_output" + "parent": "createindustry:block/blast_furnace_output/item" } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/engine_base.json b/src/generated/resources/assets/createindustry/models/item/engine_base.json index 155b490f..1281f108 100644 --- a/src/generated/resources/assets/createindustry/models/item/engine_base.json +++ b/src/generated/resources/assets/createindustry/models/item/engine_base.json @@ -1,3 +1,3 @@ { - "parent": "createindustry:item/engine_base" + "parent": "createindustry:item/unfinished_engine" } \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json b/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json index d730d30b..5267cb80 100644 --- a/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json +++ b/src/generated/resources/assets/createindustry/models/item/fireproof_brick_reinforcement.json @@ -1,3 +1,6 @@ { - "parent": "createindustry:block/fireproof_brick_reinforcement" + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "createindustry:block/fireproof_brick_reinforcement" + } } \ No newline at end of file diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java index d9e9eac6..ca426749 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/diesel/DieselEngineBlockEntity.java @@ -54,7 +54,7 @@ import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { - protected ScrollOptionBehaviour movementDirection; + //protected ScrollOptionBehaviour movementDirection; public WeakReference target; /////////// @@ -66,6 +66,8 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo private int consumptionTimer=0; public float engineStrength = 0; + + private Couple tanks; public BlockPos expansionPos; @@ -103,14 +105,14 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo public void addBehaviours(List behaviours) { //movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, // Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new DieselEngineValueBox()); - movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, - Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new SteamEngineValueBox()); - movementDirection.onlyActiveWhen(() -> { - PoweredShaftBlockEntity shaft = getShaft(); - return shaft == null || !shaft.hasSource(); - }); - movementDirection.withCallback($ -> onDirectionChanged()); - behaviours.add(movementDirection); + //movementDirection = new ScrollOptionBehaviour<>(WindmillBearingBlockEntity.RotationDirection.class, + // Lang.translateDirect("contraptions.windmill.rotation_direction"), this, new SteamEngineValueBox()); + //movementDirection.onlyActiveWhen(() -> { + // PoweredShaftBlockEntity shaft = getShaft(); + // return shaft == null || !shaft.hasSource(); + //}); + //movementDirection.withCallback($ -> onDirectionChanged()); + //behaviours.add(movementDirection); //////////////////////////////////////////// behaviours.add(new DirectBeltInputBehaviour(this)); @@ -124,7 +126,13 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo super.tick(); Direction direction; - DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::makeSound); + + + + + + + if(getBlockState().getValue(FACE)==AttachFace.WALL) expansionPos = this.getBlockPos().relative(getBlockState().getValue(FACING).getOpposite()); @@ -184,33 +192,68 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo if(!level.isClientSide) if(getShaft() != null) engineProcess(targetAxis,verticalTarget); + //DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> this::makeSound); + makeSound(targetAxis,verticalTarget); int conveyedSpeedLevel = engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2; if (targetAxis == Axis.Z) conveyedSpeedLevel *= -1; - if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) - conveyedSpeedLevel *= -1; + //if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) + // conveyedSpeedLevel *= -1; float shaftSpeed = shaft.getTheoreticalSpeed(); if (shaft.hasSource() && shaftSpeed != 0 && conveyedSpeedLevel != 0 && (shaftSpeed > 0) != (conveyedSpeedLevel > 0)) { - movementDirection.setValue(1 - movementDirection.get() - .ordinal()); + //movementDirection.setValue(1 - movementDirection.get() + // .ordinal()); conveyedSpeedLevel *= -1; } - shaft.update(worldPosition, conveyedSpeedLevel, engineStrength); + //shaft.update(worldPosition, conveyedSpeedLevel, engineStrength); + + //shaft.update(worldPosition, conveyedSpeedLevel, 40); } + + + @OnlyIn(Dist.CLIENT) - private void makeSound(){ + private void makeSound(Axis targetAxis, boolean verticalTarget){ Float targetAngle = getTargetAngle(); PoweredShaftBlockEntity ste = target.get(); if (ste == null) return; //if (engineStrength == 0) // return; + PoweredShaftBlockEntity shaft = getShaft(); + + if(tanks.get(true).isEmpty()||tanks.get(true).isEmpty()) { + engineStrength=0; + + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + + if(expansionBE != null){ + if(airTank.isEmpty()&&expansionBE.airTank.isEmpty()){ + engineStrength = 0; + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + }else + if(airTank.isEmpty()){ + engineStrength = 0; + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + + if(tanks.get(false).getFluidAmount()+5>1000) { + engineStrength = 0; + shaft.update(worldPosition, getConveyedSpeedLevel(engineStrength,targetAxis,verticalTarget), engineStrength); + return; + } + if (targetAngle == null) return; @@ -218,7 +261,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo angle += (angle < 0) ? -180 + 75 : 360 - 75; angle %= 360; - PoweredShaftBlockEntity shaft = getShaft(); + if (shaft == null || shaft.getSpeed() == 0) return; @@ -232,7 +275,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo return; } - TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 1.0f, 1f, false); + TFMGSoundEvents.DIESEL_ENGINE.playAt(level, worldPosition, 0.4f, 1f, false); prevAngle = angle; } @@ -244,15 +287,15 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2; if (targetAxis == Axis.Z) conveyedSpeedLevel *= -1; - if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) - conveyedSpeedLevel *= -1; + //if (movementDirection.get() == WindmillBearingBlockEntity.RotationDirection.COUNTER_CLOCKWISE) + // conveyedSpeedLevel *= -1; float shaftSpeed = shaft.getTheoreticalSpeed(); if (shaft.hasSource() && shaftSpeed != 0 && conveyedSpeedLevel != 0 && (shaftSpeed > 0) != (conveyedSpeedLevel > 0)) { - movementDirection.setValue(1 - movementDirection.get() - .ordinal()); + //movementDirection.setValue(1 - movementDirection.get() + // .ordinal()); conveyedSpeedLevel *= -1; } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java index 90b5e6e2..f6c46b96 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/intake/AirIntakeBlockEntity.java @@ -76,7 +76,7 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha super.tick(); //if(!level.isClientSide) { - int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 40; + int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 10; if (tankInventory.getFluidAmount() + production <= tankInventory.getCapacity()) { //tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(), production), IFluidHandler.FluidAction.EXECUTE); tankInventory.setFluid(new FluidStack(TFMGFluids.AIR.getSource(), production + tankInventory.getFluidAmount())); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java index 2e508097..cec62000 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/engines/small/AbstractEngineTileEntity.java @@ -542,11 +542,11 @@ public void write(CompoundTag compound, boolean clientPacket) { private void makeSound(){ soundTimer=0; if(this instanceof TurbineEngineTileEntity){ - TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.4f, 1.5f, false); + TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.2f, 1.5f, false); } else - TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.6f, 1f, false); + TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.3f, 1f, false); } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java index f06311e2..5bd7a590 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/exhaust/ExhaustBlockEntity.java @@ -169,9 +169,8 @@ public class ExhaustBlockEntity extends SmartBlockEntity implements IHaveGoggleI smokeTimer = 100; spawnsSmoke = true; - int random = Create.RANDOM.nextInt(5); - if(random==0) - tankInventory.drain(35, IFluidHandler.FluidAction.EXECUTE); + + tankInventory.drain(20, IFluidHandler.FluidAction.EXECUTE); diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java index aa4002c3..4072d5d9 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/BlastFurnaceOutputBlockEntity.java @@ -222,10 +222,17 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem if (timer>0&&type == BlastFurnaceType.SMALL) { posToSpawn = this.getBlockPos().relative(outputFacing.getOpposite()).above(); - level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); + if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) { + level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + }else { + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40; + + } } ////// @@ -235,15 +242,33 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getCounterClockWise()); posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getCounterClockWise()); - level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn3, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); - level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); + + if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) { + level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn3, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + + level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3); + + }else { + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3.above())).discardTimer = 40; + + } } @@ -254,6 +279,9 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getClockWise()); posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getClockWise()); + + + if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) { level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); @@ -263,7 +291,20 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3); + }else { + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2.above())).discardTimer = 40; + + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3)).discardTimer = 40; + ((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3.above())).discardTimer = 40; + + } } } diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java index adaff39b..e45f779e 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/blast_furnace/MoltenMetalBlockEntity.java @@ -17,7 +17,7 @@ public class MoltenMetalBlockEntity extends SmartBlockEntity { public MoltenMetalBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); - discardTimer=20; + discardTimer=40; } diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java index 3729e5f0..c8085091 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java @@ -588,6 +588,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .tag(BlockTags.WALLS) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, "fireproof_brick_reinforcement")) .item() + .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, "fireproof_brick_reinforcement")) .build() .lang("Fireproof Brick Reinforcement") .register(); @@ -595,9 +596,11 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .initialProperties(() -> Blocks.BRICKS) .properties(p -> p.color(MaterialColor.COLOR_RED)) .properties(p -> p.requiresCorrectToolForDrops()) + .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() + .getExistingFile(p.modLoc("block/blast_furnace_output/block")))) .transform(pickaxeOnly()) .item() - .build() + .transform(customItemModel()) .lang("Blast Furnace Output") .register(); public static final BlockEntry MOLTEN_METAL = diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java index 42998785..3c0a5908 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGItems.java @@ -52,7 +52,7 @@ public class TFMGItems { HEAVY_PLATE = REGISTRATE.item("heavy_plate", Item::new).register(), ENGINE_CHAMBER = REGISTRATE.item("engine_chamber", Item::new).register(), ENGINE_BASE = REGISTRATE.item("engine_base", Item::new) - .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/engine_base"))) + .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine"))) .register(), TURBINE_BLADE = REGISTRATE.item("turbine_blade", Item::new).register(), THERMITE_POWDER = REGISTRATE.item("thermite_powder", Item::new).register(), diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java index ad017204..b93f4e2a 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGSoundEvents.java @@ -41,11 +41,17 @@ public class TFMGSoundEvents { public static final TFMGSoundEvents.SoundEntry - ENGINE = create("diesel_engine") - .subtitle("idk how to call this :3") + ENGINE = create("engine") + .subtitle("Engine Sounds") .category(SoundSource.BLOCKS) .attenuationDistance(10) - .build(); + .build(), + + DIESEL_ENGINE = create("diesel_engine") + .subtitle("Diese Engine Sounds") + .category(SoundSource.BLOCKS) + .attenuationDistance(10) + .build(); diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java deleted file mode 100644 index 458c9a17..00000000 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGSounds.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.drmangotea.createindustry.registry; - -public class TFMGSounds { -} diff --git a/src/main/resources/assets/createindustry/lang/default/interface.json b/src/main/resources/assets/createindustry/lang/default/interface.json index 5215424e..41abbc1c 100644 --- a/src/main/resources/assets/createindustry/lang/default/interface.json +++ b/src/main/resources/assets/createindustry/lang/default/interface.json @@ -64,5 +64,8 @@ "create.recipe.advanced_distillation": "Advanced Distillation", "create.recipe.industrial_blasting": "Industrial Blasting", "create.recipe.casting": "Casting", - "create.recipe.coking": "Coking" + "create.recipe.coking": "Coking", + + "createindustry.subtitle.engine_sounds": "Engine Sounds", + "createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds" } diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json index aa081f55..762970e6 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "4": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json index 4f830bff..ee6567d9 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "4": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json index 1f7b5fee..419f84ea 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "3": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json index b95cd9a3..b9af91cd 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/aluminum_fluid_valve", + "3": "createindustry:block/aluminum_pipes", + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json index b09bd0b7..c91c92a8 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/aluminum_fluid_valve", + "3": "createindustry:block/aluminum_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json index 2e9eed35..5d41beef 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/aluminum_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/aluminum_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json index 8dd3ab9b..0b78bceb 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/aluminum_pipes", + "4": "createindustry:block/aluminum_pump", + "particle": "createindustry:block/aluminum_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json index 161c4910..f0201f77 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/aluminum_pipes", + "4": "createindustry:block/aluminum_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/aluminum_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json index 1f674588..b2c12552 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/aluminum_smart_pipe_1", + "3": "createindustry:block/aluminum_smart_pipe_2", + "particle": "createindustry:block/aluminum_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json index a3df689d..4d410eaa 100644 --- a/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/aluminum_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/aluminum_pipes", + "2": "createindustry:block/aluminum_smart_pipe_1", + "3": "createindustry:block/aluminum_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json new file mode 100644 index 00000000..18e1eaf3 --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/blast_furnace_output.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "createindustry:block/blast_furnace_output", + "1": "createindustry:block/fireproof_bricks", + "particle": "createindustry:block/blast_furnace_output" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json new file mode 100644 index 00000000..47d40962 --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/block.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/block", + "textures": { + "0": "createindustry:block/blast_furnace_output", + "1": "createindustry:block/fireproof_bricks", + "particle": "createindustry:block/blast_furnace_output" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json new file mode 100644 index 00000000..6d0e87d7 --- /dev/null +++ b/src/main/resources/assets/createindustry/models/block/blast_furnace_output/item.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/block", + "textures": { + "0": "createindustry:block/blast_furnace_output", + "1": "createindustry:block/fireproof_bricks", + "particle": "createindustry:block/blast_furnace_output" + }, + "elements": [ + { + "from": [0, 0, -1], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json deleted file mode 100644 index 6e1ed256..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json deleted file mode 100644 index cb629ef5..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json deleted file mode 100644 index 2ee1e66b..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_ne.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json deleted file mode 100644 index 86181c66..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_nw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json deleted file mode 100644 index 33da5a76..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_se.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json deleted file mode 100644 index 128dc3af..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_bottom_window_sw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json deleted file mode 100644 index 5bfd2529..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json deleted file mode 100644 index e7baa967..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/fluid_tank_window", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json deleted file mode 100644 index 2472b16e..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_ne.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json deleted file mode 100644 index af2da161..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_nw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json deleted file mode 100644 index 4e0d8abd..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_se.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json deleted file mode 100644 index fa1bfe8a..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_middle_window_sw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json deleted file mode 100644 index 99dafa73..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - }, - { - "name": "block_middle", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - } - ] - }, - { - "name": "block_bottom", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] - }, - { - "name": "block_top", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json deleted file mode 100644 index e643ba90..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json deleted file mode 100644 index 27bc248e..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_ne.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json deleted file mode 100644 index f0904e7e..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_nw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json deleted file mode 100644 index 5c46c1fa..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_se.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json deleted file mode 100644 index 2fc8b1a0..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_single_window_sw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "5": "createindustry:block/brass_fluid_tank_window_single", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json deleted file mode 100644 index ff6be1ea..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json deleted file mode 100644 index c3338240..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json deleted file mode 100644 index 8634ac93..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_ne.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json deleted file mode 100644 index 71bddf49..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_nw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json deleted file mode 100644 index f2eb53c1..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_se.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json deleted file mode 100644 index a4326ce0..00000000 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_tank/block_top_window_sw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/brass_fluid_tank_top", - "1": "createindustry:block/brass_fluid_tank", - "3": "createindustry:block/brass_fluid_tank_window", - "4": "createindustry:block/brass_fluid_tank_inner", - "particle": "createindustry:block/brass_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json index aa081f55..9f3b7260 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "4": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json index 4f830bff..11b3a659 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "4": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json index 1f7b5fee..255239d4 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "3": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json index b95cd9a3..8f419e0b 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/brass_fluid_valve", + "3": "createindustry:block/brass_pipes", + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json index b09bd0b7..c730246e 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/brass_fluid_valve", + "3": "createindustry:block/brass_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json index 2e9eed35..24d68597 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/brass_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/brass_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "create:block/brass_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json index 8dd3ab9b..6add38cd 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/brass_pipes", + "4": "createindustry:block/brass_pump", + "particle": "createindustry:block/brass_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json index 161c4910..0fcce674 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/brass_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/brass_pipes", + "4": "createindustry:block/brass_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/brass_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json index 1f674588..55285f78 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/brass_smart_pipe_1", + "3": "createindustry:block/brass_smart_pipe_2", + "particle": "createindustry:block/brass_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json index a3df689d..66023714 100644 --- a/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/brass_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/brass_pipes", + "2": "createindustry:block/brass_smart_pipe_1", + "3": "createindustry:block/brass_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json deleted file mode 100644 index f1f25b90..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json deleted file mode 100644 index 289e619f..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 4, 8, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json deleted file mode 100644 index 1524e125..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_ne.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json deleted file mode 100644 index ab39de67..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_nw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json deleted file mode 100644 index dda4c4ea..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_se.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "south": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json deleted file mode 100644 index a0a394a4..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_bottom_window_sw.json +++ /dev/null @@ -1,73 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [4, 4, 8, 16], "texture": "#3"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [0, 4, 4, 16], "texture": "#3"}, - "west": {"uv": [4, 4, 8, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json deleted file mode 100644 index aea5d625..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json deleted file mode 100644 index f77fc237..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/fluid_tank_window", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [0, 0, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 16, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"}, - "south": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 16, 12], - "faces": { - "east": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"}, - "west": {"uv": [8, 0, 16, 16], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 16, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 4], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 0, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 0, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json deleted file mode 100644 index 9e997cac..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_ne.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 16, 0.95], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 16, 1], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json deleted file mode 100644 index d0722de3..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_nw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 16, 1], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 16, 16], - "faces": { - "east": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "west": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 16, 0.95], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 16, 12], - "faces": { - "east": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json deleted file mode 100644 index 769dec70..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_se.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 16, 15.05], - "faces": { - "north": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "south": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json deleted file mode 100644 index 68dd4b46..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_middle_window_sw.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 0, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 0, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 16, 15.05], - "faces": { - "north": {"uv": [12, 0, 16, 16], "texture": "#3"}, - "south": {"uv": [8, 0, 12, 16], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 16, 4], - "faces": { - "east": {"uv": [8, 0, 12, 16], "texture": "#3"}, - "west": {"uv": [12, 0, 16, 16], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 0, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 0, 12, 16], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json deleted file mode 100644 index e6b3517f..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 12, 8]}, - "faces": { - "east": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 12], "texture": "#1", "cullface": "north"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - }, - { - "name": "block_middle", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [] - } - ] - }, - { - "name": "block_bottom", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3] - } - ] - }, - { - "name": "block_top", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [4, 5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json deleted file mode 100644 index a7dab069..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window.json +++ /dev/null @@ -1,168 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}, - "south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 4, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 4, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 4, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 4, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 8], "texture": "#5", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"}, - "west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"}, - "east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}, - "south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json deleted file mode 100644 index f7594492..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_ne.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 4, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 4, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [4, 4, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json deleted file mode 100644 index 3f06f6f8..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_nw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "west": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [12, 4, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json deleted file mode 100644 index 9e7f5ff8..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_se.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 4, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 4, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0, 4, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "south": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [15, 4, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json deleted file mode 100644 index 3e6ff727..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_single_window_sw.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "5": "createindustry:block/cast_iron_fluid_tank_window_single", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 4, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 12], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 12], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 12], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 4, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 8], "texture": "#5"}, - "south": {"uv": [0, 0, 4, 8], "texture": "#5"} - } - }, - { - "name": "Window", - "from": [0.95, 4, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 8], "texture": "#5"}, - "west": {"uv": [4, 0, 8, 8], "texture": "#5"} - } - }, - { - "name": "SideLeft", - "from": [0, 4, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 12], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 12], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 12], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "Bottom", - "from": [0, 0, 0], - "to": [16, 4, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "east": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "south": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "west": {"uv": [0, 12, 16, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "down"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - }, - { - "name": "block_bottom_centered_window", - "origin": [8, 8, 8], - "color": 0, - "children": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [5] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json deleted file mode 100644 index 002909e5..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [1, 12, 16], - "faces": { - "east": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json deleted file mode 100644 index 7fed7e48..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "Lid", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1", "cullface": "west"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [4, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "east": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "south": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideRight", - "from": [12, 0, 15], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "west": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideRight", - "from": [0, 0, 12], - "to": [1, 12, 16], - "faces": { - "north": {"uv": [0, 4, 1, 16], "texture": "#1", "cullface": "west"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"} - } - }, - { - "name": "Window", - "from": [4, 0, 0.95], - "to": [12, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "north"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 4], - "to": [15.05, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "east"} - } - }, - { - "name": "Window", - "from": [4, 0, 15.05], - "to": [12, 12, 15.05], - "faces": { - "north": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"}, - "south": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "south"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 4], - "to": [0.95, 12, 12], - "faces": { - "east": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"}, - "west": {"uv": [0, 0, 8, 12], "texture": "#3", "cullface": "west"} - } - }, - { - "name": "SideLeft", - "from": [12, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "north"}, - "south": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "north"}, - "west": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "north"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 12], - "to": [16, 12, 16], - "faces": { - "north": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "east"}, - "east": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "east"}, - "west": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "east"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [4, 12, 16], - "faces": { - "north": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "east": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "south"}, - "south": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "south"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 4], - "faces": { - "east": {"uv": [12, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "south": {"uv": [15, 4, 16, 16], "texture": "#1", "cullface": "west"}, - "west": {"uv": [0, 4, 4, 16], "texture": "#1", "cullface": "west"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json deleted file mode 100644 index 5912cd02..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_ne.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [15, 0, 0], - "to": [16, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0, 0, 0.95], - "to": [4, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 12], - "to": [15.05, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [4, 0, 0], - "to": [16, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [11, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [-23, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json deleted file mode 100644 index 2f07162a..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_nw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 0], - "to": [12, 12, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 12], - "to": [0.95, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "west": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [12, 0, 0.95], - "to": [16, 12, 0.95], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 0], - "to": [1, 12, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "south": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 39]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json deleted file mode 100644 index dc2ff9b9..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_se.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [4, 0, 15], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 5, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [15.05, 0, 0], - "to": [15.05, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0, 0, 15.05], - "to": [4, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "south": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [15, 0, 4], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json deleted file mode 100644 index b860ee88..00000000 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_tank/block_top_window_sw.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "createindustry:block/cast_iron_fluid_tank_top", - "1": "createindustry:block/cast_iron_fluid_tank", - "3": "createindustry:block/cast_iron_fluid_tank_window", - "4": "createindustry:block/cast_iron_fluid_tank_inner", - "particle": "createindustry:block/cast_iron_fluid_tank" - }, - "elements": [ - { - "name": "SideRight", - "from": [0, 0, 4], - "to": [1, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 5, 16], "texture": "#1"}, - "east": {"uv": [0, 4, 12, 16], "texture": "#1"}, - "west": {"uv": [4, 4, 16, 16], "texture": "#1"} - } - }, - { - "name": "Window", - "from": [12, 0, 15.05], - "to": [16, 12, 15.05], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 0, 8, 12], "texture": "#3"}, - "south": {"uv": [0, 0, 4, 12], "texture": "#3"} - } - }, - { - "name": "Window", - "from": [0.95, 0, 0], - "to": [0.95, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "east": {"uv": [0, 0, 4, 12], "texture": "#3"}, - "west": {"uv": [4, 0, 8, 12], "texture": "#3"} - } - }, - { - "name": "SideLeft", - "from": [0, 0, 15], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]}, - "faces": { - "north": {"uv": [4, 4, 16, 16], "texture": "#1"}, - "east": {"uv": [11, 4, 12, 16], "texture": "#1"}, - "south": {"uv": [0, 4, 12, 16], "texture": "#1"} - } - }, - { - "name": "Bottom", - "from": [0, 12, 0], - "to": [16, 16, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [39, 8, 8]}, - "faces": { - "north": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "south": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 4], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#0", "cullface": "up"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#4"} - } - } - ], - "groups": [ - { - "name": "tank", - "origin": [8, 8, -23], - "color": 0, - "children": [0, 1, 2, 3, 4] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json index aa081f55..aeb19fdd 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "4": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json index 4f830bff..59cee066 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "4": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json index 1f7b5fee..11df0360 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "3": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json index b95cd9a3..6d65fabf 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/cast_iron_fluid_valve", + "3": "createindustry:block/cast_iron_pipes", + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json index b09bd0b7..520f945d 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/cast_iron_fluid_valve", + "3": "createindustry:block/cast_iron_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json index 2e9eed35..ee557d88 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/cast_iron_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/cast_iron_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json index 8dd3ab9b..406a0f77 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/cast_iron_pipes", + "4": "createindustry:block/cast_iron_pump", + "particle": "createindustry:block/cast_iron_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json index 161c4910..28cb6388 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/cast_iron_pipes", + "4": "createindustry:block/cast_iron_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/cast_iron_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json index 1f674588..e30a96d3 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/cast_iron_smart_pipe_1", + "3": "createindustry:block/cast_iron_smart_pipe_2", + "particle": "createindustry:block/cast_iron_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json index a3df689d..5dc14d67 100644 --- a/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/cast_iron_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/cast_iron_pipes", + "2": "createindustry:block/cast_iron_smart_pipe_1", + "3": "createindustry:block/cast_iron_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/casting_spout/item.json b/src/main/resources/assets/createindustry/models/block/casting_spout/item.json index 81b65a7e..801453b9 100644 --- a/src/main/resources/assets/createindustry/models/block/casting_spout/item.json +++ b/src/main/resources/assets/createindustry/models/block/casting_spout/item.json @@ -78,5 +78,12 @@ "down": {"uv": [13.5, 0, 15.5, 2], "texture": "#1"} } } - ] + ], + "display": { + "gui": { + "rotation": [23, 45, 0], + "translation": [0, 1.5, 0], + "scale": [0.6, 0.6, 0.6] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json index e5202be8..f70c8efa 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_aluminum_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_aluminum_pipe", + "particle": "createindustry:block/copper_encased_aluminum_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json index e5202be8..69084a96 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_brass_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_brass_pipe", + "particle": "createindustry:block/copper_encased_brass_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json index e5202be8..4b53aa22 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_cast_iron_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_cast_iron_pipe", + "particle": "createindustry:block/copper_encased_cast_iron_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json b/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json index e5202be8..a8363e7d 100644 --- a/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json +++ b/src/main/resources/assets/createindustry/models/block/copper_encased_plastic_pipe/block_open.json @@ -1,8 +1,8 @@ { "credit": "Made with Blockbench", "textures": { - "0": "createindustry:block/copper_encased_steel_pipe", - "particle": "createindustry:block/copper_encased_steel_pipe" + "0": "createindustry:block/copper_encased_plastic_pipe", + "particle": "createindustry:block/copper_encased_plastic_pipe" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json b/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json index 6a22507d..1633c558 100644 --- a/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json +++ b/src/main/resources/assets/createindustry/models/block/gasoline_engine/block.json @@ -3,7 +3,7 @@ "parent": "minecraft:block/block", "textures": { "2": "createindustry:block/engines/gasoline", - "particle": "createindustry:block/engines/gasoline" + "particle": "block/anvil" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json b/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json index e6e9f48d..19579e75 100644 --- a/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json +++ b/src/main/resources/assets/createindustry/models/block/gasoline_engine/item.json @@ -5,7 +5,7 @@ "1": "create:block/axis", "2": "createindustry:block/engines/gasoline", "3": "create:block/axis_top", - "particle": "createindustry:block/engines/gasoline" + "particle": "block/anvil" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json b/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json index 3440aede..f4151382 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine/block.json @@ -1,105 +1,106 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "1": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/lpg", + "particle": "block/anvil" }, "elements": [ { "from": [2, 3, 2], "to": [14, 12, 16], "faces": { - "north": {"uv": [3.125, 0.375, 4.625, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 4.5, 11.875, 5.625], "texture": "#1"}, - "south": {"uv": [2.25, 2.125, 3.75, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 4.5, 13.625, 5.625], "texture": "#1"}, - "up": {"uv": [5.375, 5.7, 6.875, 7.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [11.875, 0.625, 13.125, 1.5], "texture": "#1"} + "north": {"uv": [0.5, 0, 2, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.125, 2, 7.25], "texture": "#0"}, + "south": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [4.25, 1.75, 2.75, 3.5], "texture": "#0"} } }, { "from": [0, 0, 2], "to": [16, 3, 16], "faces": { - "north": {"uv": [2.875, 1.5, 4.875, 1.875], "texture": "#1"}, - "east": {"uv": [11.875, 9.625, 13.625, 9.25], "rotation": 180, "texture": "#1"}, - "south": {"uv": [2, 3.25, 4, 3.625], "texture": "#1"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#1"}, - "down": {"uv": [5.125, 3.75, 7.125, 5.5], "rotation": 180, "texture": "#1"} + "north": {"uv": [0.25, 1.125, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [0.25, 7.375, 2, 7.75], "texture": "#0"}, + "south": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "up": {"uv": [2, 1.75, 0, 0], "texture": "#0"}, + "down": {"uv": [4.5, 1.75, 2.5, 3.5], "texture": "#0"} } }, { "from": [3, 6, 11], "to": [7, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 11], "to": [13, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 5], "to": [13, 15, 9], "faces": { - "north": {"uv": [16, 0, 15.5, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 5], "to": [7, 15, 9], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 3, 2], "to": [2, 7, 16], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#1"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [2, 0.625, 2.25, 1.125], "texture": "#0"}, + "east": {"uv": [3.5, 2.25, 5.25, 2.75], "texture": "#0"}, + "south": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.75, 5.125, 5.5, 6.875], "texture": "#0"} } }, { "from": [14, 3, 2], "to": [16, 7, 16], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#1"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#1"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [0.25, 0.625, 0.5, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "west": {"uv": [3.875, 5.5, 5.625, 6], "texture": "#0"}, + "up": {"uv": [0.375, 3.5, 0.125, 1.75], "texture": "#0"}, + "down": {"uv": [6, 5.125, 5.75, 6.875], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json b/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json index 221ee827..7dbb5822 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine/item.json @@ -1,107 +1,107 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "1": "createindustry:block/gasoline_engine", - "3": "create:block/axis_top", - "4": "create:block/axis", - "particle": "block/anvil" + "0": "createindustry:block/engines/lpg", + "1": "create:block/axis", + "2": "create:block/axis_top", + "particle": "createindustry:block/engines/lpg" }, "elements": [ { "from": [2, 3, 2], "to": [14, 12, 16], "faces": { - "north": {"uv": [3.125, 0.375, 4.625, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 4.5, 11.875, 5.625], "texture": "#1"}, - "south": {"uv": [2.25, 2.125, 3.75, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 4.5, 13.625, 5.625], "texture": "#1"}, - "up": {"uv": [5.375, 5.7, 6.875, 7.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [11.875, 0.625, 13.125, 1.5], "texture": "#1"} + "north": {"uv": [0.5, 0, 2, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.125, 2, 7.25], "texture": "#0"}, + "south": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [4.25, 1.75, 2.75, 3.5], "texture": "#0"} } }, { "from": [0, 0, 2], "to": [16, 3, 16], "faces": { - "north": {"uv": [2.875, 1.5, 4.875, 1.875], "texture": "#1"}, - "east": {"uv": [11.875, 9.625, 13.625, 9.25], "rotation": 180, "texture": "#1"}, - "south": {"uv": [2, 3.25, 4, 3.625], "texture": "#1"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#1"}, - "up": {"uv": [0, 0, 16, 14], "texture": "#1"}, - "down": {"uv": [5.125, 3.75, 7.125, 5.5], "rotation": 180, "texture": "#1"} + "north": {"uv": [0.25, 1.125, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [0.25, 7.375, 2, 7.75], "texture": "#0"}, + "south": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "down": {"uv": [4.5, 1.75, 2.5, 3.5], "texture": "#0"} } }, { "from": [3, 6, 11], "to": [7, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 11], "to": [13, 15, 15], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 5], "to": [13, 15, 9], "faces": { - "north": {"uv": [16, 0, 15.5, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 5], "to": [7, 15, 9], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#1"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#1"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 3, 2], "to": [2, 7, 16], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#1"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#1"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#1"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [2, 0.625, 2.25, 1.125], "texture": "#0"}, + "east": {"uv": [3.5, 2.25, 5.25, 2.75], "texture": "#0"}, + "south": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.75, 5.125, 5.5, 6.875], "texture": "#0"} } }, { "from": [14, 3, 2], "to": [16, 7, 16], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#1"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#1"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#1"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#1"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#1"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#1"} + "north": {"uv": [0.25, 0.625, 0.5, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "west": {"uv": [3.875, 5.5, 5.625, 6], "texture": "#0"}, + "up": {"uv": [0.375, 3.5, 0.125, 1.75], "texture": "#0"}, + "down": {"uv": [6, 5.125, 5.75, 6.875], "texture": "#0"} } }, { @@ -110,12 +110,12 @@ "to": [10, 10, 10], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#3"}, - "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#4"}, - "south": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#missing"}, - "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#4"}, - "up": {"uv": [6, 0, 10, 10], "texture": "#4"}, - "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#4"} + "north": {"uv": [6, 6, 10, 10], "texture": "#2"}, + "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#1"}, + "up": {"uv": [6, 0, 10, 10], "texture": "#1"}, + "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json index 7da44390..a5445a6b 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/block.json @@ -1,8 +1,9 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "0": "createindustry:block/gasoline_engine", + "0": "createindustry:block/engines/lpg", "particle": "block/anvil" }, "elements": [ @@ -10,110 +11,109 @@ "from": [0, 0, 0], "to": [16, 3, 14], "faces": { - "north": {"uv": [4, 3.25, 6, 3.625], "texture": "#0"}, - "east": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 14], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.125, 5.5, 7.125, 7.25], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "east": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [5.25, 3.25, 7.25, 3.625], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "up": {"uv": [2, 1.75, 0, 0], "texture": "#0"}, + "down": {"uv": [4.5, 3.75, 2.5, 5.5], "texture": "#0"} } }, { "from": [0, 3, 0], "to": [2, 7, 14], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#0"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#0"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "east": {"uv": [6.75, 5.125, 8.5, 5.625], "texture": "#0"}, + "south": {"uv": [6.5, 4.125, 6.75, 4.625], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.375, 4.375, 5.125, 6.125], "texture": "#0"} } }, { "from": [14, 3, 0], "to": [16, 7, 14], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#0"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#0"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#0"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [6.5, 5.75, 6.75, 6.25], "texture": "#0"}, + "west": {"uv": [5, 4.375, 6.75, 4.875], "texture": "#0"}, + "up": {"uv": [0.375, 5.25, 0.125, 3.5], "texture": "#0"}, + "down": {"uv": [0.5, 6.375, 0.25, 8.125], "texture": "#0"} } }, { "from": [2, 3, 0], "to": [14, 12, 14], "faces": { - "north": {"uv": [4.25, 2.125, 5.75, 3.25], "texture": "#0"}, - "east": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "south": {"uv": [0, 0, 12, 9], "texture": "#0"}, - "west": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "up": {"uv": [5.5, 4.75, 7, 6.55], "texture": "#0"}, - "down": {"uv": [6.75, 10, 10.25, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "east": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "south": {"uv": [3.5, 4.375, 5, 5.5], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [6, 5.25, 4.5, 7], "texture": "#0"} } }, { "from": [9, 6, 7], "to": [13, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14.75, 1.5, 15.25, 2], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 7], "to": [7, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.375], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9, 4, 13], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 1], "to": [7, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5125, 0, 16, 1.275], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9.625, 4, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 1], "to": [13, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 12, 4, 16], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 0, 14], "to": [16, 13, 16], "faces": { - "north": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "east": {"uv": [9.125, 0.25, 9.375, 1.875], "texture": "#0"}, - "south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "west": {"uv": [10.875, 0.25, 11.125, 1.875], "texture": "#0"}, - "up": {"uv": [6.625, 2.875, 8.625, 3.125], "texture": "#0"}, - "down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"} + "north": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "east": {"uv": [7.75, 1.875, 8, 3.5], "texture": "#0"}, + "south": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "west": {"uv": [5.25, 1.875, 5.5, 3.5], "texture": "#0"}, + "up": {"uv": [7.625, 2.125, 5.625, 1.875], "texture": "#0"}, + "down": {"uv": [4.5, 4.625, 2.5, 4.875], "texture": "#0"} } } ] - } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json index 7da44390..7f145c09 100644 --- a/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json +++ b/src/main/resources/assets/createindustry/models/block/lpg_engine_back/item.json @@ -1,119 +1,119 @@ { "credit": "Made with Blockbench", "parent": "minecraft:block/block", + "texture_size": [128, 128], "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "block/anvil" + "0": "createindustry:block/engines/lpg", + "particle": "createindustry:block/engines/lpg" }, "elements": [ { "from": [0, 0, 0], "to": [16, 3, 14], "faces": { - "north": {"uv": [4, 3.25, 6, 3.625], "texture": "#0"}, - "east": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "south": {"uv": [0, 0, 16, 3], "texture": "#0"}, - "west": {"uv": [11.875, 9.25, 13.625, 9.625], "texture": "#0"}, - "up": {"uv": [0, 0, 16, 14], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.125, 5.5, 7.125, 7.25], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.5, 1.125, 4.5, 1.5], "texture": "#0"}, + "east": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "south": {"uv": [5.25, 3.25, 7.25, 3.625], "texture": "#0"}, + "west": {"uv": [2, 7.375, 3.75, 7.75], "texture": "#0"}, + "up": {"uv": [2, 1.75, 0, 0], "texture": "#0"}, + "down": {"uv": [4.5, 3.75, 2.5, 5.5], "texture": "#0"} } }, { "from": [0, 3, 0], "to": [2, 7, 14], "faces": { - "north": {"uv": [4.625, 1, 4.875, 1.5], "texture": "#0"}, - "east": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "south": {"uv": [2, 2.75, 2.25, 3.25], "texture": "#0"}, - "west": {"uv": [11.875, 8.75, 13.625, 9.25], "texture": "#0"}, - "up": {"uv": [8.75, 3.75, 9, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [4.25, 0.625, 4.5, 1.125], "texture": "#0"}, + "east": {"uv": [6.75, 5.125, 8.5, 5.625], "texture": "#0"}, + "south": {"uv": [6.5, 4.125, 6.75, 4.625], "texture": "#0"}, + "west": {"uv": [2, 6.875, 3.75, 7.375], "texture": "#0"}, + "up": {"uv": [2.375, 3.5, 2.125, 1.75], "texture": "#0"}, + "down": {"uv": [5.375, 4.375, 5.125, 6.125], "texture": "#0"} } }, { "from": [14, 3, 0], "to": [16, 7, 14], "faces": { - "north": {"uv": [2.875, 1, 3.125, 1.5], "texture": "#0"}, - "east": {"uv": [13.625, 8.75, 11.875, 9.25], "texture": "#0"}, - "south": {"uv": [3.75, 2.75, 4, 3.25], "texture": "#0"}, - "west": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "up": {"uv": [8.875, 3.75, 8.625, 5.5], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 14], "texture": "#0"} + "north": {"uv": [2.5, 0.625, 2.75, 1.125], "texture": "#0"}, + "east": {"uv": [0.25, 6.875, 2, 7.375], "texture": "#0"}, + "south": {"uv": [6.5, 5.75, 6.75, 6.25], "texture": "#0"}, + "west": {"uv": [5, 4.375, 6.75, 4.875], "texture": "#0"}, + "up": {"uv": [0.375, 5.25, 0.125, 3.5], "texture": "#0"}, + "down": {"uv": [0.5, 6.375, 0.25, 8.125], "texture": "#0"} } }, { "from": [2, 3, 0], "to": [14, 12, 14], "faces": { - "north": {"uv": [4.25, 2.125, 5.75, 3.25], "texture": "#0"}, - "east": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "south": {"uv": [0, 0, 12, 9], "texture": "#0"}, - "west": {"uv": [13.75, 4.5, 15.5, 5.625], "texture": "#0"}, - "up": {"uv": [5.5, 4.75, 7, 6.55], "texture": "#0"}, - "down": {"uv": [6.75, 10, 10.25, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [2.75, 0, 4.25, 1.125], "texture": "#0"}, + "east": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "south": {"uv": [3.5, 4.375, 5, 5.5], "texture": "#0"}, + "west": {"uv": [2, 6.125, 3.75, 7.25], "texture": "#0"}, + "up": {"uv": [2, 5.25, 0.5, 3.5], "texture": "#0"}, + "down": {"uv": [6, 5.25, 4.5, 7], "texture": "#0"} } }, { "from": [9, 6, 7], "to": [13, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [14.75, 1.5, 15.25, 2], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 7], "to": [7, 15, 11], "faces": { - "north": {"uv": [15.5, 0, 16, 1.375], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9, 4, 13], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [3, 6, 1], "to": [7, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5125, 0, 16, 1.275], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 9.625, 4, 13.625], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [9, 6, 1], "to": [13, 15, 5], "faces": { - "north": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "east": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "west": {"uv": [15.5, 0, 16, 1.25], "texture": "#0"}, - "up": {"uv": [15.5, 1.375, 16, 1.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 12, 4, 16], "rotation": 180, "texture": "#0"} + "north": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "east": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "south": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "west": {"uv": [6.375, 0, 6.875, 1.125], "texture": "#0"}, + "up": {"uv": [6.875, 1.625, 6.375, 1.125], "texture": "#0"}, + "down": {"uv": [6.875, 1.125, 6.375, 1.625], "texture": "#0"} } }, { "from": [0, 0, 14], "to": [16, 13, 16], "faces": { - "north": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "east": {"uv": [9.125, 0.25, 9.375, 1.875], "texture": "#0"}, - "south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "west": {"uv": [10.875, 0.25, 11.125, 1.875], "texture": "#0"}, - "up": {"uv": [6.625, 2.875, 8.625, 3.125], "texture": "#0"}, - "down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"} + "north": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "east": {"uv": [7.75, 1.875, 8, 3.5], "texture": "#0"}, + "south": {"uv": [5.625, 1.875, 7.625, 3.5], "texture": "#0"}, + "west": {"uv": [5.25, 1.875, 5.5, 3.5], "texture": "#0"}, + "up": {"uv": [7.625, 2.125, 5.625, 1.875], "texture": "#0"}, + "down": {"uv": [4.5, 4.625, 2.5, 4.875], "texture": "#0"} } } ] - } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json index aa081f55..dfe50e78 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "4": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json index 4f830bff..63a5eca5 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "4": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json index 1f7b5fee..feef64f3 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "3": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json index b95cd9a3..f0961125 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/plastic_fluid_valve", + "3": "createindustry:block/plastic_pipes", + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json index b09bd0b7..65f8ddba 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/plastic_fluid_valve", + "3": "createindustry:block/plastic_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json index 2e9eed35..9945f2ad 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/plastic_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/plastic_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json index 8dd3ab9b..5ed6e5c4 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "2": "createindustry:block/plastic_pipes", + "4": "createindustry:block/plastic_pump", + "particle": "createindustry:block/plastic_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json index 161c4910..d8d5adda 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_mechanical_pump/item.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", + "2": "createindustry:block/plastic_pipes", + "4": "createindustry:block/plastic_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "createindustry:block/plastic_pump" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json index 1f674588..b3464292 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/plastic_smart_pipe_1", + "3": "createindustry:block/plastic_smart_pipe_2", + "particle": "createindustry:block/plastic_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json index a3df689d..d0503c6b 100644 --- a/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/plastic_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/plastic_pipes", + "2": "createindustry:block/plastic_smart_pipe_1", + "3": "createindustry:block/plastic_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json index aa081f55..bfb179a1 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "4": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json index 4f830bff..b9b308b6 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_horizontal_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "4": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "4": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json index 1f7b5fee..08c8810e 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_closed.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "3": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json index b95cd9a3..6e6c531f 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/block_vertical_open.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", - "particle": "create:block/copper_plating" + "2": "createindustry:block/steel_fluid_valve", + "3": "createindustry:block/steel_pipes", + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json index b09bd0b7..ee47df6c 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/item.json @@ -1,12 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", - "3": "create:block/pipes", + "2": "createindustry:block/steel_fluid_valve", + "3": "createindustry:block/steel_pipes", "4": "create:block/pump", "1_1": "create:block/axis_top", "1_0": "create:block/axis", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json index 2e9eed35..20682062 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json +++ b/src/main/resources/assets/createindustry/models/block/steel_fluid_valve/pointer.json @@ -1,9 +1,9 @@ { "credit": "Made with Blockbench", "textures": { - "2": "create:block/fluid_valve", + "2": "createindustry:block/steel_fluid_valve", "4": "create:block/pump", - "particle": "create:block/copper_plating" + "particle": "createindustry:block/steel_block" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json index 1f674588..91df3303 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json +++ b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/block.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2", - "particle": "create:block/smart_pipe_2" + "2": "createindustry:block/steel_smart_pipe_1", + "3": "createindustry:block/steel_smart_pipe_2", + "particle": "createindustry:block/steel_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json index a3df689d..4142dd33 100644 --- a/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json +++ b/src/main/resources/assets/createindustry/models/block/steel_smart_fluid_pipe/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/pipes", - "2": "create:block/smart_pipe_1", - "3": "create:block/smart_pipe_2" + "1": "createindustry:block/steel_pipes", + "2": "createindustry:block/steel_smart_pipe_1", + "3": "createindustry:block/steel_smart_pipe_2" }, "elements": [ { diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json b/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json index 54efa9e9..2a5a0a6b 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine/block.json @@ -2,19 +2,19 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/turbine", + "particle": "block/anvil" }, "elements": [ { "from": [1, 4, 5], "to": [15, 10, 16], "faces": { - "north": {"uv": [5.25, 3.75, 7, 4.5], "texture": "#0"}, - "east": {"uv": [11.875, 4.5, 13.25, 5.25], "texture": "#0"}, - "south": {"uv": [1.375, 5.625, 3.125, 6.375], "texture": "#0"}, - "west": {"uv": [11.875, 5.25, 13.25, 4.5], "rotation": 180, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.1, 3.875], "rotation": 90, "texture": "#0"}, + "north": {"uv": [2.125, 8.875, 3.875, 9.625], "texture": "#0"}, + "east": {"uv": [1.5, 6.375, 2.875, 7.125], "texture": "#0"}, + "south": {"uv": [2.125, 8.125, 3.875, 8.875], "texture": "#0"}, + "west": {"uv": [1.125, 7.125, 2.5, 6.375], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8.5, 5.875, 9.725, 7.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 14, 11], "texture": "#0"} } }, @@ -22,11 +22,11 @@ "from": [0, 0, 2], "to": [16, 4, 16], "faces": { - "north": {"uv": [0.25, 1.375, 2.25, 1.875], "texture": "#0"}, - "east": {"uv": [13.625, 7.875, 11.875, 8.35], "texture": "#0"}, - "south": {"uv": [1, 4.875, 3, 5.375], "texture": "#0"}, - "west": {"uv": [11.875, 7.875, 13.625, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 7.125, 5.5], "texture": "#0"}, + "north": {"uv": [0.25, 1, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [4.5, 1, 2.75, 1.475], "texture": "#0"}, + "south": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "west": {"uv": [2.75, 1, 4.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.75, 4.5, 7.75, 6.25], "texture": "#0"}, "down": {"uv": [5.125, 5.5, 7.125, 3.75], "texture": "#0"} } }, @@ -34,24 +34,12 @@ "from": [3, 4, 2], "to": [13, 13, 16], "faces": { - "north": {"uv": [0.625, 0.25, 1.875, 1.375], "texture": "#0"}, - "east": {"uv": [9.875, 3.875, 11, 2.125], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.375, 3.75, 2.625, 4.875], "texture": "#0"}, - "west": {"uv": [10, 2.125, 11.125, 3.875], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "texture": "#0"}, - "down": {"uv": [0, 0.375, 10, 14.375], "texture": "#0"} - } - }, - { - "from": [6, 13, 2], - "to": [10, 14, 16], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [14.25, 2.25, 14.375, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 0.25, 1.5, 0.125], "texture": "#0"}, - "west": {"uv": [14.375, 2.25, 14.25, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14, 2.25, 14.5, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 14], "texture": "#0"} + "north": {"uv": [0.625, 0, 1.875, 1.125], "texture": "#0"}, + "east": {"uv": [0.5, 11, 1.625, 9.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5.375, 0, 6.625, 1.125], "texture": "#0"}, + "west": {"uv": [0.5, 9.25, 1.625, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0.625, 1.75, 1.875, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 14], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json b/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json index f2aff988..d7c80ffe 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine/item.json @@ -2,9 +2,9 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "2": "create:block/axis", - "3": "create:block/axis_top", + "0": "createindustry:block/engines/turbine", + "1": "create:block/axis", + "2": "create:block/axis_top", "particle": "block/anvil" }, "elements": [ @@ -12,11 +12,11 @@ "from": [1, 4, 5], "to": [15, 10, 16], "faces": { - "north": {"uv": [5.25, 3.75, 7, 4.5], "texture": "#0"}, - "east": {"uv": [11.875, 4.5, 13.25, 5.25], "texture": "#0"}, - "south": {"uv": [1.375, 5.625, 3.125, 6.375], "texture": "#0"}, - "west": {"uv": [11.875, 5.25, 13.25, 4.5], "rotation": 180, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.1, 3.875], "rotation": 90, "texture": "#0"}, + "north": {"uv": [2.125, 8.875, 3.875, 9.625], "texture": "#0"}, + "east": {"uv": [1.5, 6.375, 2.875, 7.125], "texture": "#0"}, + "south": {"uv": [2.125, 8.125, 3.875, 8.875], "texture": "#0"}, + "west": {"uv": [1.125, 7.125, 2.5, 6.375], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8.5, 5.875, 9.725, 7.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 14, 11], "texture": "#0"} } }, @@ -24,11 +24,11 @@ "from": [0, 0, 2], "to": [16, 4, 16], "faces": { - "north": {"uv": [0.25, 1.375, 2.25, 1.875], "texture": "#0"}, - "east": {"uv": [13.625, 7.875, 11.875, 8.35], "texture": "#0"}, - "south": {"uv": [1, 4.875, 3, 5.375], "texture": "#0"}, - "west": {"uv": [11.875, 7.875, 13.625, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 7.125, 5.5], "texture": "#0"}, + "north": {"uv": [0.25, 1, 2.25, 1.5], "texture": "#0"}, + "east": {"uv": [4.5, 1, 2.75, 1.475], "texture": "#0"}, + "south": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "west": {"uv": [2.75, 1, 4.5, 1.5], "texture": "#0"}, + "up": {"uv": [5.75, 4.5, 7.75, 6.25], "texture": "#0"}, "down": {"uv": [5.125, 5.5, 7.125, 3.75], "texture": "#0"} } }, @@ -36,24 +36,12 @@ "from": [3, 4, 2], "to": [13, 13, 16], "faces": { - "north": {"uv": [0.625, 0.25, 1.875, 1.375], "texture": "#0"}, - "east": {"uv": [9.875, 3.875, 11, 2.125], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1.375, 3.75, 2.625, 4.875], "texture": "#0"}, - "west": {"uv": [10, 2.125, 11.125, 3.875], "rotation": 90, "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "texture": "#0"}, - "down": {"uv": [0, 0.375, 10, 14.375], "texture": "#0"} - } - }, - { - "from": [6, 13, 2], - "to": [10, 14, 16], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [14.25, 2.25, 14.375, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 0.25, 1.5, 0.125], "texture": "#0"}, - "west": {"uv": [14.375, 2.25, 14.25, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [14, 2.25, 14.5, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 14], "texture": "#0"} + "north": {"uv": [0.625, 0, 1.875, 1.125], "texture": "#0"}, + "east": {"uv": [0.5, 11, 1.625, 9.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [5.375, 0, 6.625, 1.125], "texture": "#0"}, + "west": {"uv": [0.5, 9.25, 1.625, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0.625, 1.75, 1.875, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 10, 14], "texture": "#0"} } }, { @@ -62,12 +50,12 @@ "to": [10, 10, 10], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#3"}, - "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#2"}, - "south": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#missing"}, - "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#2"}, - "up": {"uv": [6, 0, 10, 10], "texture": "#2"}, - "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#2"} + "north": {"uv": [6, 6, 10, 10], "texture": "#2"}, + "east": {"uv": [6, 0, 10, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [6, 0, 10, 10], "rotation": 270, "texture": "#1"}, + "up": {"uv": [6, 0, 10, 10], "texture": "#1"}, + "down": {"uv": [6, 0, 10, 10], "rotation": 180, "texture": "#1"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json index 9ae1f556..b50640da 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/block.json @@ -2,20 +2,20 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/turbine", + "particle": "block/anvil" }, "elements": [ { "from": [0, 0, 0], "to": [16, 4, 16], "faces": { - "north": {"uv": [3, 4.875, 5, 5.375], "texture": "#0"}, - "east": {"uv": [15.75, 7.875, 13.75, 8.375], "texture": "#0"}, - "south": {"uv": [0, 8.75, 2, 9.25], "texture": "#0"}, - "west": {"uv": [13.75, 7.875, 15.75, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 7.5], "texture": "#0"}, - "down": {"uv": [5.125, 7.5, 7.125, 5.5], "texture": "#0"} + "north": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "east": {"uv": [2.25, 7.125, 0.25, 7.625], "texture": "#0"}, + "south": {"uv": [2.625, 1, 4.625, 1.5], "texture": "#0"}, + "west": {"uv": [0.25, 7.125, 2.25, 7.625], "texture": "#0"}, + "up": {"uv": [5.75, 4.375, 7.75, 6.375], "texture": "#0"}, + "down": {"uv": [2.5, 5.375, 4.5, 3.375], "texture": "#0"} } }, { @@ -23,10 +23,10 @@ "to": [13, 9, 9], "faces": { "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.5], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [5.375, 7.875, 5.125, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9.375, 0.5, 9.125, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} } }, @@ -34,11 +34,11 @@ "from": [3, 4, 9], "to": [4, 9, 11], "faces": { - "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, + "north": {"uv": [8.75, 0.25, 8.875, 0.875], "texture": "#0"}, "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "west": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "west": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "up": {"uv": [9.125, 0.5, 9.375, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -49,9 +49,9 @@ "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "west": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} + "west": {"uv": [9.125, 0.5, 9.375, 0.75], "texture": "#0"}, + "up": {"uv": [8.75, 0.25, 9, 0.375], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.75, 0.625, 9, 0.75], "rotation": 90, "texture": "#0"} } }, { @@ -59,10 +59,10 @@ "to": [13, 9, 11], "faces": { "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, - "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5, 7.875, 4.875, 8.5], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "south": {"uv": [8.875, 0.25, 8.75, 0.875], "texture": "#0"}, "west": {"uv": [0, 0, 2, 5], "texture": "#0"}, - "up": {"uv": [5.625, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.5, 8.75, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -70,11 +70,11 @@ "from": [1, 4, 0], "to": [4, 10, 7], "faces": { - "north": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [2.75, 6.625, 3.125, 7.375], "texture": "#0"}, "east": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "south": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "west": {"uv": [7.375, 3.75, 8.25, 4.5], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 5.5, 4.625], "texture": "#0"}, + "south": {"uv": [0.375, 6.375, 0.75, 7.125], "texture": "#0"}, + "west": {"uv": [2.625, 6.375, 3.5, 7.125], "texture": "#0"}, + "up": {"uv": [1, 2, 1.375, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -82,11 +82,11 @@ "from": [12, 4, 0], "to": [15, 10, 7], "faces": { - "north": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "east": {"uv": [5.875, 5, 6.75, 5.75], "texture": "#0"}, - "south": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [0.875, 6.625, 1.25, 7.375], "texture": "#0"}, + "east": {"uv": [0.5, 6.375, 1.375, 7.125], "texture": "#0"}, + "south": {"uv": [2.875, 6.375, 3.25, 7.125], "texture": "#0"}, "west": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "up": {"uv": [6.75, 3.75, 7.125, 4.625], "texture": "#0"}, + "up": {"uv": [1.25, 2, 1.625, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -94,48 +94,36 @@ "from": [2, 12, -1], "to": [6, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [8.125, 1.75, 10, 2.25], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [10, 12, -1], "to": [14, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [8.25, 8.5, 6.375, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 12, 0], - "to": [10, 13, 15], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "south": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "west": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "up": {"uv": [14.625, 2.125, 15.125, 4.125], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 15], "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [10, 2.25, 8.125, 2.75], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [4, 4, 0], "to": [12, 12, 16], "faces": { - "north": {"uv": [3.5, 3.875, 4.5, 4.875], "texture": "#0"}, - "east": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "south": {"uv": [0.5, 7.75, 1.5, 8.75], "texture": "#0"}, - "west": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 8, 16], "texture": "#0"} + "north": {"uv": [5.5, 0, 6.5, 1], "texture": "#0"}, + "east": {"uv": [1.75, 6.125, 3.75, 7.125], "texture": "#0"}, + "south": {"uv": [3.125, 0, 4.125, 1], "texture": "#0"}, + "west": {"uv": [0.25, 6.125, 2.25, 7.125], "texture": "#0"}, + "up": {"uv": [8.5, 4.5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 16], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json index 9ae1f556..b50640da 100644 --- a/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json +++ b/src/main/resources/assets/createindustry/models/block/turbine_engine_back/item.json @@ -2,20 +2,20 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:block/engines/turbine", + "particle": "block/anvil" }, "elements": [ { "from": [0, 0, 0], "to": [16, 4, 16], "faces": { - "north": {"uv": [3, 4.875, 5, 5.375], "texture": "#0"}, - "east": {"uv": [15.75, 7.875, 13.75, 8.375], "texture": "#0"}, - "south": {"uv": [0, 8.75, 2, 9.25], "texture": "#0"}, - "west": {"uv": [13.75, 7.875, 15.75, 8.375], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 7.5], "texture": "#0"}, - "down": {"uv": [5.125, 7.5, 7.125, 5.5], "texture": "#0"} + "north": {"uv": [5, 1, 7, 1.5], "texture": "#0"}, + "east": {"uv": [2.25, 7.125, 0.25, 7.625], "texture": "#0"}, + "south": {"uv": [2.625, 1, 4.625, 1.5], "texture": "#0"}, + "west": {"uv": [0.25, 7.125, 2.25, 7.625], "texture": "#0"}, + "up": {"uv": [5.75, 4.375, 7.75, 6.375], "texture": "#0"}, + "down": {"uv": [2.5, 5.375, 4.5, 3.375], "texture": "#0"} } }, { @@ -23,10 +23,10 @@ "to": [13, 9, 9], "faces": { "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.5], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "up": {"uv": [5.375, 7.875, 5.125, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9.375, 0.5, 9.125, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} } }, @@ -34,11 +34,11 @@ "from": [3, 4, 9], "to": [4, 9, 11], "faces": { - "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, + "north": {"uv": [8.75, 0.25, 8.875, 0.875], "texture": "#0"}, "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "west": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "west": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "up": {"uv": [9.125, 0.5, 9.375, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -49,9 +49,9 @@ "north": {"uv": [0, 0, 10, 2], "texture": "#0"}, "east": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, "south": {"uv": [0, 0, 10, 2], "texture": "#0"}, - "west": {"uv": [5.375, 7.875, 5.625, 8.125], "texture": "#0"}, - "up": {"uv": [5.125, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, - "down": {"uv": [5.375, 8, 5.625, 8.125], "rotation": 90, "texture": "#0"} + "west": {"uv": [9.125, 0.5, 9.375, 0.75], "texture": "#0"}, + "up": {"uv": [8.75, 0.25, 9, 0.375], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8.75, 0.625, 9, 0.75], "rotation": 90, "texture": "#0"} } }, { @@ -59,10 +59,10 @@ "to": [13, 9, 11], "faces": { "north": {"uv": [4.875, 7.875, 5, 8.5], "texture": "#0"}, - "east": {"uv": [5.125, 7.875, 5.375, 8.5], "texture": "#0"}, - "south": {"uv": [5, 7.875, 4.875, 8.5], "texture": "#0"}, + "east": {"uv": [8.75, 0.25, 9, 0.875], "texture": "#0"}, + "south": {"uv": [8.875, 0.25, 8.75, 0.875], "texture": "#0"}, "west": {"uv": [0, 0, 2, 5], "texture": "#0"}, - "up": {"uv": [5.625, 7.875, 5.375, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.5, 8.75, 0.625], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 0, 10, 2], "texture": "#0"} } }, @@ -70,11 +70,11 @@ "from": [1, 4, 0], "to": [4, 10, 7], "faces": { - "north": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [2.75, 6.625, 3.125, 7.375], "texture": "#0"}, "east": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "south": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "west": {"uv": [7.375, 3.75, 8.25, 4.5], "texture": "#0"}, - "up": {"uv": [5.125, 3.75, 5.5, 4.625], "texture": "#0"}, + "south": {"uv": [0.375, 6.375, 0.75, 7.125], "texture": "#0"}, + "west": {"uv": [2.625, 6.375, 3.5, 7.125], "texture": "#0"}, + "up": {"uv": [1, 2, 1.375, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -82,11 +82,11 @@ "from": [12, 4, 0], "to": [15, 10, 7], "faces": { - "north": {"uv": [1.375, 6.5, 1.75, 7.25], "texture": "#0"}, - "east": {"uv": [5.875, 5, 6.75, 5.75], "texture": "#0"}, - "south": {"uv": [2.75, 6.5, 3.125, 7.25], "texture": "#0"}, + "north": {"uv": [0.875, 6.625, 1.25, 7.375], "texture": "#0"}, + "east": {"uv": [0.5, 6.375, 1.375, 7.125], "texture": "#0"}, + "south": {"uv": [2.875, 6.375, 3.25, 7.125], "texture": "#0"}, "west": {"uv": [0, 0, 7, 6], "texture": "#0"}, - "up": {"uv": [6.75, 3.75, 7.125, 4.625], "texture": "#0"}, + "up": {"uv": [1.25, 2, 1.625, 2.875], "texture": "#0"}, "down": {"uv": [0, 0, 3, 7], "texture": "#0"} } }, @@ -94,48 +94,36 @@ "from": [2, 12, -1], "to": [6, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [8.125, 1.75, 10, 2.25], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [10, 12, -1], "to": [14, 16, 14], "faces": { - "north": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "east": {"uv": [8.25, 8.5, 6.375, 9], "texture": "#0"}, - "south": {"uv": [6.375, 7.875, 6.875, 8.375], "texture": "#0"}, - "west": {"uv": [6.375, 8.5, 8.25, 9], "texture": "#0"}, - "up": {"uv": [6.375, 8.5, 8.25, 9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [8.25, 8.5, 6.375, 9], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 12, 0], - "to": [10, 13, 15], - "faces": { - "north": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "east": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "south": {"uv": [1, 0.125, 1.5, 0.25], "texture": "#0"}, - "west": {"uv": [0.25, 1.75, 2.25, 1.875], "texture": "#0"}, - "up": {"uv": [14.625, 2.125, 15.125, 4.125], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 15], "texture": "#0"} + "north": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "east": {"uv": [10, 2.25, 8.125, 2.75], "texture": "#0"}, + "south": {"uv": [10, 1.75, 10.5, 2.25], "texture": "#0"}, + "west": {"uv": [8.125, 2.25, 10, 2.75], "texture": "#0"}, + "up": {"uv": [8.125, 2.25, 10, 2.75], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10, 2.25, 8.125, 2.75], "rotation": 90, "texture": "#0"} } }, { "from": [4, 4, 0], "to": [12, 12, 16], "faces": { - "north": {"uv": [3.5, 3.875, 4.5, 4.875], "texture": "#0"}, - "east": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "south": {"uv": [0.5, 7.75, 1.5, 8.75], "texture": "#0"}, - "west": {"uv": [5.125, 6.5, 7.125, 7.5], "texture": "#0"}, - "up": {"uv": [5.125, 5.5, 7.125, 6.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 8, 16], "texture": "#0"} + "north": {"uv": [5.5, 0, 6.5, 1], "texture": "#0"}, + "east": {"uv": [1.75, 6.125, 3.75, 7.125], "texture": "#0"}, + "south": {"uv": [3.125, 0, 4.125, 1], "texture": "#0"}, + "west": {"uv": [0.25, 6.125, 2.25, 7.125], "texture": "#0"}, + "up": {"uv": [8.5, 4.5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 16], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/models/item/unfinished_engine.json b/src/main/resources/assets/createindustry/models/item/unfinished_engine.json index 8f593216..cf1124ff 100644 --- a/src/main/resources/assets/createindustry/models/item/unfinished_engine.json +++ b/src/main/resources/assets/createindustry/models/item/unfinished_engine.json @@ -2,34 +2,34 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "1": "createindustry:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "0": "createindustry:item/engine_base", + "particle": "createindustry:item/engine_base" }, "elements": [ - { - "from": [0, 0, 2], - "to": [3, 7, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, - "faces": { - "north": {"uv": [13.125, 1.25, 13.5, 2.125], "texture": "#1"}, - "east": {"uv": [0, 0, 16, 7], "texture": "#1"}, - "south": {"uv": [5, 1, 5.375, 1.875], "texture": "#1"}, - "west": {"uv": [11.875, 4.5, 13.625, 5.375], "texture": "#1"}, - "up": {"uv": [8.625, 3.75, 9, 5.5], "texture": "#1"}, - "down": {"uv": [7.125, 5.75, 6.75, 3.75], "texture": "#1"} - } - }, { "from": [3, 0, 2], "to": [13, 12, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [11.875, 0.625, 13.125, 2.125], "texture": "#1"}, - "east": {"uv": [7.875, 2.125, 6.125, 3.625], "texture": "#1"}, - "south": {"uv": [5.375, 0.375, 6.625, 1.875], "texture": "#1"}, - "west": {"uv": [9.625, 2.125, 7.875, 3.625], "texture": "#1"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "texture": "#1"}, - "down": {"uv": [5.5, 3.75, 6.75, 5.5], "rotation": 180, "texture": "#1"} + "north": {"uv": [1, 0, 3.5, 3], "texture": "#0"}, + "east": {"uv": [3.5, 12.25, 0, 15.25], "texture": "#0"}, + "south": {"uv": [5.5, 0, 8, 3], "texture": "#0"}, + "west": {"uv": [0, 12.25, 3.5, 15.25], "texture": "#0"}, + "up": {"uv": [1, 7, 3.5, 10.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [5.5, 3.5, 8, 7], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [0, 0, 2], + "to": [3, 7, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [3.5, 1.25, 4.25, 3], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#0"}, + "west": {"uv": [0, 13.75, 3.5, 15.5], "texture": "#0"}, + "up": {"uv": [0, 7, 0.75, 10.5], "texture": "#0"}, + "down": {"uv": [8.625, 7, 8, 3.5], "texture": "#0"} } }, { @@ -37,12 +37,38 @@ "to": [16, 7, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [11.5, 1.25, 11.875, 2.125], "texture": "#1"}, - "east": {"uv": [13.625, 6.75, 11.875, 7.625], "texture": "#1"}, - "south": {"uv": [6.625, 1, 7, 1.875], "texture": "#1"}, - "west": {"uv": [0, 0, 16, 7], "texture": "#1"}, - "up": {"uv": [8.625, 5.625, 9, 7.375], "texture": "#1"}, - "down": {"uv": [5.5, 5.5, 5.125, 3.75], "texture": "#1"} + "north": {"uv": [0.25, 1.25, 1, 3], "texture": "#0"}, + "east": {"uv": [3.5, 13.75, 0, 15.5], "texture": "#0"}, + "south": {"uv": [8, 1.25, 8.75, 3], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [3.75, 7, 4.5, 10.5], "texture": "#0"}, + "down": {"uv": [5.5, 3.5, 4.75, 7], "texture": "#0"} + } + }, + { + "from": [2, 7, 2], + "to": [3, 10, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "west": {"uv": [14, 1, 14.5, 1.75], "texture": "#0"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#0"}, + "down": {"uv": [14.25, 0, 15.25, 2], "texture": "#0"} + } + }, + { + "from": [13, 7, 2], + "to": [14, 10, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, + "faces": { + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "east": {"uv": [14, 1, 14.5, 1.75], "texture": "#0"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#0"}, + "down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/createindustry/sounds.json b/src/main/resources/assets/createindustry/sounds.json index 7e999b18..06ecf5d8 100644 --- a/src/main/resources/assets/createindustry/sounds.json +++ b/src/main/resources/assets/createindustry/sounds.json @@ -1,5 +1,15 @@ { + "engine": { + "sounds": [ + { + "name": "createindustry:engine", + "type": "file", + "attenuation_distance": 16 + } + ], + "subtitle": "createindustry.subtitle.engine_sounds" + }, "diesel_engine": { "sounds": [ { @@ -8,6 +18,6 @@ "attenuation_distance": 16 } ], - "subtitle": "createindustry.subtitle.engine_sounds" + "subtitle": "createindustry.subtitle.diesel_engine_sounds" } } \ No newline at end of file diff --git a/src/main/resources/assets/createindustry/sounds/diesel_engine.ogg b/src/main/resources/assets/createindustry/sounds/diesel_engine.ogg index a3885eb18ca5e0b7cbafb58c6c5cab47aac0c1e6..ecd3402a9fdf348581da6fc1a1443db8ecf36989 100644 GIT binary patch delta 3261 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 delta 2945 zcmV-{3x4$4H=#8ePiJRS00IC200000005P100000001-3y*QB?E)11x00031008gV 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 diff --git a/src/main/resources/assets/createindustry/sounds/diesel_engine_.ogg b/src/main/resources/assets/createindustry/sounds/engine.ogg similarity index 97% rename from src/main/resources/assets/createindustry/sounds/diesel_engine_.ogg rename to src/main/resources/assets/createindustry/sounds/engine.ogg index 5254b4fef2e8640d5b1b631910f81ea060d74470..a3885eb18ca5e0b7cbafb58c6c5cab47aac0c1e6 100644 GIT binary patch delta 69 zcmZ2zy3kb0KRrE|fr$YMre;GJ#^?81Oq9~&0r44uLho-@=57p;;|B|XRQokZ`E0J^ HSLOx)6Ri)X delta 69 zcmZ2zy3kb0KRrE|fr$YMlH4JTbG6nD6Q%TcKzv4^kmj>LCpL!2@q-0Gs=s_!HQrpu Hugnbq|Besj diff --git a/src/main/resources/assets/createindustry/textures/block/aluminum_pipes.png b/src/main/resources/assets/createindustry/textures/block/aluminum_pipes.png index 2b96340dbab85aa065c1d6d4729c344a7770c78a..3f32cda8bba12d3e53a3c4b710c5d22343b499e3 100644 GIT binary patch delta 540 zcmV+%0^|Lf1hoW^B!B!#L_t(|Ud5KZN(4a+fbZ#i0`06Vv=S=|D?w}(J4+iI!OFtU zM(i!_Ap{lf0am_+@66?P++Fs^K)BtRZ1PQ#i7xK$AFB7|vO@TMe0r{~Zf>jdi|cCt z@T^))Ed+acecJ*!KDnF+fD8cey;}Vr0D&{WY$cczfJ}dUeSg+UJYsJEurUSz-|7ed zyt7^eum>W*kRHG%z7TxZffm02#@YZt#s)B;0Qfb#>Ll0D!1330)q~dnV>h7($^bbl z_4*V|_!ofXG4qoFluF>qy&;p#fnH5m0vOVS0(8EH1RnDi^d3Y_07FVpl12am@jzgM zqXb878X=>w7JpORB=|5R*hgh;J&2;SSc3Q=0y!$c+EGDv4^Ar-yWD`RZ2{ySFhgb{ zs_WLcN%Vn#eg!8+4UkJ<1}s5#*jF-uS+n=D{pgZQVAf^>Xl+7jf?*^pX`i0x+`Mj( z9u~Z(C`Qq_*Rl-&P?9N*_oOFsDJ;?-qD7#rp@}Fga{C`z#fhT z&^`xN-AAy`!Byha<#+N$0Bbb_03U4t*en=0Xa?{v)(`;RbKori2aa`S!=dD0!V%AX z06Lez1wYR78ufZ0+KB>)3E eaFEg<`V|4%F4*?SQo>mP0000J&910=4B-)eco9&m3CXZ!Xa&@4LW#MW`Kkh9>fz`d!?{b)+k`^` z=4!&;V+e7rQ_wqz`UK2Tf?fd-aRagB0CHf{C^8yrHdZFnhye$&@sD7w9Yir$EJ1t` zLpe}D8)(4xkAKb^fM0Gv);a=m511h{5#f62<^eMX@wqA-jv^qJzzkS|9B`^-0cOqK z%l`jvxddjdnt;(Jq$W5EK?&ndtu2KQKw2>`sS;31R}NM={&uLho! zC?E$DSpfClJ2+VbYx=Z*5~6^Z1@;K60R1zua38}zlX(kxO8K39QGm7DMgTF!1mLq^ z;D9W^U#x8e@SKS|0vtHjnGJ`MgNZ=gPZ6+j30&~yJg<5l z!tpFY_A`4~K+L8Y^}Yy*6KfO1uN)E}u>%Ji8bp6^OEU=Ruxrh3CX6vkQwmo^Ol0yfAdbwq2L6U;lk35(4)n5^26 zv`U~>kyr&YASF~1(xfn(=Xv)yN>-d)oYaON8$gFE*DhUxk%zOv+0@u>IKz!N1CXP!Ezles{~!!v6BUif38~245Cs#JkcK7z02U1o)9zGFX8-^I07*qo IM6N<$f)$`xy8r+H diff --git a/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_2.png b/src/main/resources/assets/createindustry/textures/block/aluminum_smart_pipe_2.png index c301891f6328723afc211d729c2730310e3cb797..828427b4cbc1ca54baf5d5cc62e05ae536934498 100644 GIT binary patch delta 284 zcmZo?TEjF!vYwfNfk8u;KNv_c76-XIF|0c$^AgBmNq6*hWMJ6X&;2Kn705RT@Ck99 z8D+b*!ZRkTc6p}r<%OZox5YKLO`14m_U|(pm#<&nux;0o9{+jnW!^k)?YUZT%*E`VGv*uKvx SKI{y%mBG{1&t;ucLK6T7L3Gam delta 246 zcmV0E7#RJKz{y6K^s=wiI2CD1Z`;$Sy#~ zFoiJxB4dykJRN`(V#Bb&g4u?Q;a(tQ0LV6w26Wp&2EbzhT_ZLF{@$*GW3mnS|9T1- wlVt!%6EY^+0GMKI7#xT&h1f7ij!-lL0EH9zQ5im-p8x;=07*qoM6N<$f{|ll+W-In diff --git a/src/main/resources/assets/createindustry/textures/block/blast_furnace_output.png b/src/main/resources/assets/createindustry/textures/block/blast_furnace_output.png index bb5ce18e7f6e0507c2493c7656d2be37a8477d4e..2c955d6a1e39f2cf36f6997ebd5b7b525085e804 100644 GIT binary patch delta 197 zcmV;$06PDX0+IrdRevxK799)^6ABFr1P14-j@JMH010qNS#tmY4#5Bb4#5Gqk!$S$ z004kVL_t&-(-n@v4Z<)G1lJv4OZ>5oQUG^^f09FdfpY^%6beAX4e+3B&hr}WN~;9| zoI5y=l*g1fBoiq`O{C~43r)bj-?rruk)N+xKW9e1R%2xh{XWlF1n8Q~w$rt0PM9t& zc@yHT$v0ro=zWkQRFp_maQ8ddg#gOLIGi delta 196 zcmV;#06YJZ0+9lcRev1}4=@iF6ABFr1O_Y`Bj^AC010qNS#tmY4#EHc4#EKyC`y0; z004hUL_t&-(-q0F3c@fHh2awgacpjN@4fK>)TG!^jAWM%buIJ_M6wD&@UhK3)5rM% z0!(Kt#6_k+QbGO5XF;0#oX7SKw7KrYaC^lgfG@wg*ACaG;yt@TGiiDo@Ssm2#I54v yA#24^aO-L-s{@v3hhjs*Y^5O>_%)r2R7=#&*=dVZs3YvJjIEF}E zPCmfM!s^(<&}K1t(jtW!3zsZe!jLH8EYWo8*fFmF!4(3+K7t*LW)m3g6A~C0)IC`I UtroXi0`)U^y85}Sb4q9e06?QJ6aWAK diff --git a/src/main/resources/assets/createindustry/textures/block/brass_pipes.png b/src/main/resources/assets/createindustry/textures/block/brass_pipes.png index 085b1eb743b6baa18f8bfb0aad8c6475ac14e7e5..efde4111b57fde1818e95d66daa0061e7b8639bd 100644 GIT binary patch delta 557 zcmV+|0@D4k1jPi9BYy%6Nklji}dIAPo+QkZUAUu z4gh_N9og5r=Cc6QfCrdT1F~sO%EFdyb5uBh%2yMh+&nh`4gru|qKg)}hB)@W%p(qN z0CN{12Z{hODmK4F5$*yYJw$#vfJ_QFIX7gHJ}{~Xa{yC{5P-qg&;Vw<1*02L7r>Mh z7_Xz;;tbZL`3_&G*>qwZ_KB_e`t=CKdAz!4Q0ml$$pZw zFBYKYS^%*Ih!BzRVxAm#4Q$B1egT&c1BfXg0;C`s96KTaQKR z6K(WlIgP1_!Ntph!lQ}$o|e)kZ=7q{2O#NNfOE1G;D3y&jHi~kDIOpiLlHpvzdG1! zNOSC||4HxwJ_=fsVF1`49V6BiYVD8Ck@->j>3j`+5r00000NkvXXu0mjfKl<@a delta 536 zcmV+z0_Xk31h52cQmPcg($Up@6eB2#CEP(?kR)2z$05Q`a>tEG=c((v} zuoD3FfCZSN2NFQz)dr|{!Q24ERd%JK+Ylc~A07cpH6a;R84^IrCX_K}WxgnYO+6l+ zZ8&!cdYdo@Fjo`yZo>#rXczPjqCS8*O3({{5f>QC9AS>sG=j9^o*K)W=^zFk#Adw} z_tGG;!E6cai+|CW`k@9O10lp$rpO7~+oXAZ?6K4*dB5dnM& zlmV5%2b_9%0A)?R=hy%H;Y*;b6$2P-LTbW7OP14=o*3P{dO&)(k@jgV7TMt1mO}uD zcLkhNEP>3_mHw-dc8Ue?!6Xl`I@k*ri$zP^)0*^8f`0|DS>PFg1)%lbSkiM+&3bPx zMIXwq$=3pCYPA(W9b*unUQ;n}PzRv-i?s~^zrAq>Km$j0=7ENi1`~m}o&+$q1T+NF z%YI%X?U1QW$nU`>WJ)myWW)n~1yUw7o@LXo}bp)^zYmDqy<^W`@f%DfO a`T@SHa}jE}f|I-e0000rtigRztX1jOXvJ$(lr4beFrF=mxapC?`k$u+d t*=F9C{aAg&VSdvFt&Ou;RweO&VbFJx^SmbgISyzwgQu&X%Q~loCIE3ZMiBr2 delta 210 zcmV;@04@Le0gD2VL4O-iOjJcpO;TD~USnfrgMx%XK}I$nk z010qNS#tmY4#EHc4#EKyC`y0;004POL_t&-(OZPU+-wQ%vi0Eaixh)V$9%45$JT5nrL*RC!c z`w3pXx$?pAP7rFxOOyptu1KcDn684Penf*R;AetyKI;a|6TX`H4@2TEk(+Eu9smFU M07*qoM6N<$f{8g%r~m)} diff --git a/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_top.png b/src/main/resources/assets/createindustry/textures/block/cast_iron_distillation_controller_top.png index ad7a01162749c396f27a0921452c128a54702fc1..8b51ad8555a9d5420bba714b1b0434bf9ca20343 100644 GIT binary patch delta 167 zcmaFQ_?mHoPraF$rK6*puWwLPRGhxP5o20~9|HpeXMsm#F#`kNK@eu#F){lsP%z%p z#W6(Ua&kgK2on<{8(Z4s0EGgxgak2`PZF%W5-vxk#K!ap$x4Q_o|$xIl4!F;$V_2Y z)}uTPJkyR`5HMsHa5nUa;5fwL(`FzvxA$OB!BK;^3I)s$!w%@SS~xc_GRT|}efTRQ RT^DEd#9?fxA#JE30c03+Xc|dK z7MStJ+?#QFX| TnfId^Xdi>8tDnm{r-UW|?sYHL diff --git a/src/main/resources/assets/createindustry/textures/block/cast_iron_pipes.png b/src/main/resources/assets/createindustry/textures/block/cast_iron_pipes.png index b853b1acd4235635e94e04131ec15be3ec35a0dc..04aace744674cb671b6e05690a406f5296b96abe 100644 GIT binary patch delta 535 zcmV+y0_gpe1h52(&3Ou&O5`&DzWR2Ol{FMr|^HyG2M&*ci#0)TJg`7q1J1hY9Z~ zVpBBkwY&#__*UR1l@#dAs?4WG-joQCjj0Sk{^t+#3x6@^p7TEm5gj{_I$} zPN>w`Q|>Y1Zpavs^wkv#AGS z`~7~bpgOB zm>K}TMpvtP4AIg2@B&b)2#K(1XaQ;#p~75^d{uxLdNex6aOxEF7U2-UR7Kc(3=yt% z3VIt+AHWnT=mkKC8-x|d5XUSUA)_&8VP!D~KG487`=c?}HlpY(rXaqEDCC#`t)qdl zSUffu`*Hy?*M9-XHDH8{L^S71H4hAZ;Ge7DXcT~)0wZ7wvcs_>0~j@HFYo{JkyBvQ zssUUrLUO{!NH%0+YU1YNb%F3O;W@?F6rFo4uK{4ZEAWt&6ewm@=C8&)DG?w$(=q`0 zpFhkmj5+tTe-a`kSaY3Fvp8hW>0Yj{pDw07*qoM6N<$g0=MFGynhq diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_aluminum_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_aluminum_pipe.png index 2ce6f97c0134623e221ea53840ef3834316dd751..a3074fe92828762ddef2e0f226a0dc0e21d983f2 100644 GIT binary patch delta 49 zcmV-10M7rR1)&A7&jBT{wz|{T*Z=?j@bmLrYJG!-l15c)K}=|)sI9P6O2lJQjngm( Hlk@?tyHOg- delta 49 zcmV-10M7rR1)&A7&jBTBYHosphMk?EtE;a(JU~oLP$wrW92_8GVrH;ZO2lJQxF}Fr Hlk@?t??n^8 diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_brass_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_brass_pipe.png index 2ce6f97c0134623e221ea53840ef3834316dd751..7672606cb80ee891ad831bc27c434d37617f401e 100644 GIT binary patch delta 49 zcmV-10M7rR1)&A7&jBUQpj!9KZ2$Sc|MRAXQ8%M#Msi0nY&9spj8(8yO2lJQlp$zJ Hlk@?tdPEpY delta 49 zcmV-10M7rR1)&A7&jBTBYHosphMk?EtE;a(JU~oLP$wrW92_8GVrH;ZO2lJQxF}Fr Hlk@?t??n^8 diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_cast_iron_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_cast_iron_pipe.png index 2ce6f97c0134623e221ea53840ef3834316dd751..25f84adfd6edce2cee73a0c314cb378a6a712c0e 100644 GIT binary patch delta 49 zcmZ3;x{!6lc}7)7M>k*JptQ8i`1oWkEnQ<{Gi7CUS!r1t8;1=cUPqFH;`knaocx7x FEdYSJ5YGSr delta 49 zcmV-10M7rR1)&A7&jBTBYHosphMk?EtE;a(JU~oLP$wrW92_8GVrH;ZO2lJQxF}Fr Hlk@?t??n^8 diff --git a/src/main/resources/assets/createindustry/textures/block/copper_encased_plastic_pipe.png b/src/main/resources/assets/createindustry/textures/block/copper_encased_plastic_pipe.png index 2ce6f97c0134623e221ea53840ef3834316dd751..7a3270a9513418442b4614796c1d27be29489f85 100644 GIT binary patch delta 220 zcmV<203-jQ1)>G8&jEkCzsJPM&)D7J&C=JGoT;#~zK)ZiOj2LAxx=tjO2lJQV^f%~ z00009a7bBm000XU000XU0RWnu7ytkOfk{L`R47wTk69ALAP5D4QAA^u-2bxkT(Wfe z0bPhsB4*(Y3L*Xljsd7f)ELkRJ0a0XBqGTymy*pA8ceVqbzxMD2@Viv17|nZDe^J; z)_UHe+@jo~Zjt8>{a#tZ>a%o+NLCZ*DH)Am{te~`7W9oC#w*D0egSuyf0<_?MDhnC WtOhdA9Spw!0000YMq80qQa7$R{wIYGpzu&^*p zBq6}eS6^SB+bk&{h}E!ZiiA~~5f>NNnKubDj;2nVHf>LWD)aUUlQwRgWb%lOO)YVP xlrt-vS_g*_vl?qS&via?fjrhbK^?{-tPD+sN{mxAN17zqdl0000V^Z#LyAs~MVa7bBm000tl000tl0bXTW;{X5wR!Kxb zR5(xVQ(a2}Q4pPbZOdK1GjkEa?Bk`9${q@Osb2aYJ=MSP*9DPS5j_P(Xa?D`x>Bp? zdfPdyA-##O9T;Zj?47xDmpS6(^h}YD1wE|d$%M!k@|*&h<#Z4cwLUEP#%qI|b_aho zeYYnh2b0BI#FjNPB&GbdF`rsY5})NdhB&{tRGOwyB9)}{QVL`|7K8r_r`sj#)25Ey zMm`t}NbHpMF-}<5K^8VvF(Tg*jYYsU>rI@oTNZBaxh^{(WM*@f!{Z}zIu1n>ab@OA zp%jT=R5aG+H6f%FG9;D%9HB=H+T4HJruX_A;UC;x*U)VmJk}oI(O?$*HwYT+9+Z(x zgROE2e&$7*dX*W^PcQITWme-@OuT(7YXy8{0Zn2w8U+#2?ae)=WHpA0#r29e9173# z6tD1{Kh5`-ONOBn6JujJGhe-`s(!BzDH9R>06O!M*ig{7=l}o!07*qoM6LruV1h-? Bvflsz diff --git a/src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png b/src/main/resources/assets/createindustry/textures/block/distillation_controller_front.png index f47d98bf835481b8af2874b2831971c5cedcc026..fdc71e0ce5e2c59ecad565dcde37dd21dca32cc0 100644 GIT binary patch delta 225 zcmcb^+{-jUf|G@rfq~)e-A6$a6&30Y0(?ST%`B{K?42Ux;uF)->zkV^YU&G0DtaeR z(bm>8Ha2zf@RAZzk&@N*_79NPFmjBIy>j}e56}$G0*}aI1_q%55N1@IJtGS!nC9u? z7$R{wIYGpzu&^*pBq6}eS6^SB+bk&{h}E!ZiiDK}OCy8F*-duLEVILXjXvD^YyJKI z{fFE5tp;Ion#AjoHC2XXH%E|TCH&vzXTqNkGiyZ9OU+;65u-snx_7*+;JXe zE{H`AU;%4onJ)(v3-`Vvh(!)y0g!*mrr9DHBJ)tOKnp1RlBdxE<JGS- zF^y`NRQX`mFDPzr?zp8fjSK1Y-jzEX3fFa|lq42M)%3bHS(Zs~sD*Kczi=L1kbS4m cqfA8f4c30A%q3~ZtpET307*qoM6N<$f*^p!%K!iX diff --git a/src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png b/src/main/resources/assets/createindustry/textures/block/distillation_controller_top.png index e6cb13434023b37231e045362ab8642cc5ef759c..90f6712a931c8fe4a61610ebd64699f0ad885e7b 100644 GIT binary patch delta 201 zcmcc3{FQNn1SbnK0|Ud`yN`kc;^C#Ot>^6@aOog}CQu(|fk$L91A|Zj2s0|qo{jUC6>eMMOYc$u2U}mDYCl`Xbpp>tDnm{r-UW|wrxSR delta 433 zcmV;i0Z#t)0owzR7zqdl0000V^Z#LyAs~MVa7bBm000tk000tk0rT8?jsO4wa7jc# zR5(w~Q%y?(VGw@aP06*?U3II2pk~w|`k)R4U8+m}qf`Bhep;8JNbEyAgk%byQu8Za zMb|fHaAgsLq)QJBGw-uA5AWQJ6rpF9gnJ_W1865-b5@B8;jYX!u(qvuP>Q#E`bGz*ge?8-SrKB)Qu3g z#2F({-_=q@P~qY65uWZ-EHW1GE-ruIvsC`o4T44(?XMOK@K2ls^+*Lyv-_UJRDoIW zPX+9ma2j#b;2L?v*H`%!3fUY#*-y_%G391bY3BbvNVASIA(wq;&!bG+XfG2jN-PoO zkF-Qi3e;qm?E;d7B-S-AEa$9~l>~t*vKfVQpjY zMC0H4B0%RGbR8M9Ctz+bP0 Hl+XkK5FSEk delta 463 zcmV;=0Wkjk0r>-v7zqdl0000V^Z#LyAs~MVa7bBm000id000id0mpBsWB>pGj!8s8 zR5(wiQ%g$%Q4~Jck{rv&WLAiwW{*Xbk&r(>k%{TXmqvI1v159Zy>Gk_WI1G^ z=ct&Ssny^&0ilaBK*dxpU^VzJtOgJXfMBE0g8|k_#Z)d}HBbs82m$vF_gPq2XelJ{ zR#c(=Z;byN$9_nEeab-L<&{@{%9utqOc<1CJirL459YWmt03=9mM1s;*b3=Dh+ zL6~vJ#O${~K`T!e#}J9j$q6DsOiZqfY{JQks%l}=6ZY@~tEwsnDl|`IJi+kN%bSyx qX}d`aM+~na+o9a{8IPy2F*M#4m0vlrHxpEak7aXC3bAS5U#NF*V_z%Y&1*SB2r*r9?1)|H$I2bV8f ztlYS8!H&hvjg5){nudF2);AWgF>8AiGBSr$yR$Qhe8^Lp>85Oy12m4o)78&qol`;+ E05x7OcK`qY diff --git a/src/main/resources/assets/createindustry/textures/block/engines/lpg.png b/src/main/resources/assets/createindustry/textures/block/engines/lpg.png new file mode 100644 index 0000000000000000000000000000000000000000..9c9985af44220d4d36450aff83bfe696b9138edd GIT binary patch literal 1583 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/createindustry/textures/block/exhaust.png b/src/main/resources/assets/createindustry/textures/block/exhaust.png index f3f8369a40cd07d0eabe404bd62493be250ed97e..8fecb8c4835d2de1d10e61d41f691ebb3d7179bc 100644 GIT binary patch delta 329 zcmZo=Yh<3_SZ@&E6XI%SVI2@0k&&Ccdxd#p_P?`tE;z) zidIxqLP$sy0|UeE2MvlqN}wdjFZe$yV0fS$D+!e2EbxddW?8eR=R!F`@C zjv*HQdncS0JFLLr^7)EJz0|+|`PLl1Sy8!SwtICJov~my;?X&3rN*kt>T`3!5q6}d&`%$Mez zsPX86;S!ZLF@I)P-R${1K9<78YCwjJ^R^$YjM-uZ8-q`8a5`3D+A%N4 zkl{sa^9yn2y;5EGJT-omvaMgu|U4d2M33H zdHKo8%1TN~hKEPT#U%v>hWhvf8XFt?`1pi|MumsRgoH#WD=Yi@`Z_u~#>OU^nwole zczAnzo0*x}*w|QES;fS}sH>}+o14ePB>4CQ*x5O|xOlj^d0AQ6`TK{sx_UY~x|*6= z+S)q$`UWN@rh0q(%gD&s+dB&j3+w3U*x9*wc?CE-dpbC{xw-i`IJo%x2ix1bdV2ah zIeGZ_1i8EWy0`#Mb8vO__Vo1h^77KwHdIm33JHmFcXxMiaBy;R0_u#4N&tG@a?_rP zKq{yt$S?RmwE@FgU7kXq>6`@~k;M!Qe1}1p@p%4<6kvo{dAc};SorUq6dulGDAKYx z!ok&%Wy*_N0!QwhjuPNrm@@I_|N3K*lbO>}D?k0%`{ry)k+FGt>j4%uMwMmD(trGH zJ)kqmgR%HCcjju#4%f1Xq=_f>p7%Ua+Ti3ary&yVE`2SaDP>}${;`r1#>quKZ9--b zHg=rf(7Cpt>juwloBfBC><;Uldgv{>x%HytH;dGnuFEE^kUHu5;otl1_twkGM4ffK zq2H&qGdbFdW6qqg^AU66W3Kf)adLi@_2j8oslwv6g8i2b+YU@_=}I!= aJ_czYWi7ertuuf@%i!ti=d#Wzp$Pyno=6k` diff --git a/src/main/resources/assets/createindustry/textures/block/img.png b/src/main/resources/assets/createindustry/textures/block/img.png deleted file mode 100644 index 98d78d68012585f782b415a29e843d42908083e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 493 zcmVtwETh?~MSC2{8NoDg-r< z1XyF-H~|92ladiYMnvA*i5NJJ>IJ0KcP=A9vf0$oh;UvfA;t{EUB*hiqt_Hz<95)|gvw~eFygQEhl z%MFMw+s_GxoX|`}s9)60W`JOf5{FDH0_#d9VAdes3xQk$v(_7drAa4Z4sb70{*sm4AB7sRRM_X`yXSgUmi;A0s9Y)0dgNdcLFU#xWqFwcSK2;dZ0 zXBKEiVZHgi3W3%oP~qnMUITB)s!hmzX%jNx9WW3Jo&uN&)>gfS_>9>!qyDZ0;)~S= j@sv#j4D5rm=pp(B{7W?s4Z`>Y00000NkvXXu0mjf9fZ|c diff --git a/src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta b/src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta new file mode 100644 index 00000000..0645f48c --- /dev/null +++ b/src/main/resources/assets/createindustry/textures/block/molten_metal.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/src/main/resources/assets/createindustry/textures/block/plastic_pipes.png b/src/main/resources/assets/createindustry/textures/block/plastic_pipes.png index 6baf400e430e760794afbe4dd475f1c8bb0d4998..ee97c8a9122a667f82321a901a74a9180fc22999 100644 GIT binary patch delta 555 zcmV+`0@VG12g3xABYy%4Nklj(2SL@nvnO$Ju zIJ>TS@D?ELg4&D71Em0D*=%(7f}wNMgygh1(1@!)<0@M(FhrhwV2}E*x5b!G9$bnjkWF~ ziq4`2;>H|6=cq97f$?4{K-PW$q#`s!W+IyF);KrJ0REW~r!Xx*S^^!`h%k;6fZ5h; z0aiWI5}38M0W1`uBa)SDj3!d?aw%!COQH>k|O{B002ovPDHLkV1k>o{Zjw{ delta 875 zcmV-x1C;#31c3*TBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0~Sd{K~z{r#a2yEQ$ZA+*M+5DQlK`~wm^a(pbHm97OvF9m5Fhs zzrvM2z_@f_T)1^_TxtAD42iH2lNt=BQ3BBjv?ys>DD>L}&wrl#=8p4TUj-ts9x}|E zdF{-Zx#yl<E~;_;X$6pEr;+7^{cMbsNjF`vzfhxhLq!bA9s_VSH-Qx5+C z1bP9VX<84_NXUBVF?{$J2=>u{5srjKFkqka3Pb=XS8DRff)@m)rr(=O-*c)#e~JJ? z5DEq5sCOU&|9@44vbTkxTB&+MpxJ1N#f5KTF7t_6ty;Cx5I_iOwYoL%2z>!RwOD*e zgu-F!U9$l2LWCouDO(RHA3z9n5qgz|je3iEzImkq9q<7!u(F)D^&n#-pliS@5#r>< zLWzV_o2!7=MqSyfo=5q%6($AAs5b^}vI?K>o@ zn>Vgg2-tano)Fkggo*&F6ZzN`Q*WmQ;)##}5U&pQd4y2k5ZR;GocP`03S1F*@p{HI z+QZ~SN=Fi8FalCDmOFQcVLj?yWSJ`Bs0>?ha3@A=A| zn*%(D&~&w8ERakbkt1(_JzNPKRB86N_%mz-Sa55r>mrlMQe$DY8o#LDE1>k%AM3kj zmSiHpafaYvt=u3sy+Q&ZUF}Zrd!!j|0D^OZ=Ri_j5iA)S!KrkS@yYQk`DJl`X$b3u zALxM9v+ctt)MBtq{BX#jE09wAHKJ}NM9-yd@f-6dt!JP_@Ol6M002ovPDHLkV1g-7 Bnw$Ut diff --git a/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer_holder.png b/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer_holder.png deleted file mode 100644 index efdf27089cf24561c1ffe9dca4c2150e17457f85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19028 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 QJPC@y)78&qol`;+03C47`2YX_ diff --git a/src/main/resources/assets/createindustry/textures/block/steel_distillation_controller.png b/src/main/resources/assets/createindustry/textures/block/steel_distillation_controller.png deleted file mode 100644 index efdf27089cf24561c1ffe9dca4c2150e17457f85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19028 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 QJPC@y)78&qol`;+03C47`2YX_ diff --git a/src/main/resources/assets/createindustry/textures/block/steel_distillation_output.png b/src/main/resources/assets/createindustry/textures/block/steel_distillation_output.png deleted file mode 100644 index efdf27089cf24561c1ffe9dca4c2150e17457f85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19028 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 QJPC@y)78&qol`;+03C47`2YX_ diff --git a/src/main/resources/assets/createindustry/textures/item/engine_base.png b/src/main/resources/assets/createindustry/textures/item/engine_base.png new file mode 100644 index 0000000000000000000000000000000000000000..b18e27f7f8f3908011ad6597d4feab138ececb4c GIT binary patch literal 1316 zcmV+<1>5?GP);5B#%UcqC13l&vcdfn`u z-66f>Eub(n-LK#DtA716OP-wte*feB1poZ-VfyRuk6WZn_1P}*=9hQV+h2d{5}Rzd z53a7RrpwFAi7U+dA<(HGe}28`+{164P7m%s*^qm$%XSIb_Bi5a7bx((1bF%K)%4=U z5C0JG<44b@XHUP|kbBCg!zSA$upMEx+XojH7t{Iq`NWk>pzNpbzn!4&AKkyVdFHy^ z`ZGvxMu$;X@FHc@jZ6WFCJ|fr*=`?H89<;4R`*>2G|yWCXnn|b2_NMQdZ`TXHK3IN zy59nG5h^%H=c*~7dTiBBewZFABU4!D_-lsXJ7Qre5wp*QjS+FF4R(d+> zi=giinkp#(Wn8t=_XLoQ+IXMlV0H#5C_2MESBFW9Zx^nPAj@i`k4zx z-I?`G(1~O&QhH81n0|cc;8{Mz%EtZ71wrRIU9hYx(61XxmlUa)hgz)=XGpq(CQuRi@b=qy2TPY~Ge zDgbRH0QHLq;H-kppyy_Qf^q?1{+3zU;$yK4NGjMvuK^j9uB~&xtqP#I2CI>#%xy*m zP=|ellgh9xcc#CCp%NgUtFjRRMr?M$wLeCKl;P?XkaGP1QvDR(YMa3wLI8)_Dcwh@ zc3aMr3Q7lmb}?Yjmgh=Ylx&|-CP#sWbQoSkzT5X+&S_B=~rq5A+ z^`2G`3Y^~o=L(=;E2=Y2?^h4`juAHBLnXm+b>}I7uI{92TLtYM=+%3_dhpE5KwI=S zTh6K=phjH31dj^ffx;@?6*Tm6?^h3ZCIHt_0jgldN|ap$NPoNXD`!;@p8Eea0S*dY ztkl-?r~s|DuovvUQ^2?1Ioxul&Sp>b+k*V6XX1pGN3w#+I`x zh5Y_PVd*PAy-GKO28E*Le(|{f}ZXoWodV30%%0^mE@z89rQYE{p*Wo*)4q( zJ}7boxOx_-t~CX+EzIEjxhlI;0S*a`b_SPIpkC=ed$vF@pH6buM_v7IaF44JfX_pYvdV<~(^7JE0tk%01h|Q-6oB9nf%(sU zp3+3JV3nsfrMRXlQ0v0#1n`wUM?Lw;=9=l}Xwe(>r0*2z=Y$iE a6aND7XA`hdyIm3h0000Bi5LA29OX0L~|?y>nCCp?sI-kiC-cXuAYWOCBE%y-U0 zHGan{r2SXRA5JV3J>qca`}I^q1)cP?luZJ5LKj$hFHKN7P%Xdy`9Izz=8xXY(Pnny z&~}M#xOU6TL0V!N3k$<{HHKQ&gdf5U4x9(p{9@CnZ7*rgl6-kzfI;=<0!|01Mc40# hhzXvtJp0$xcvX9eO9)@v6`J-qgJ#{ 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 QJPC@y)78&qol`;+03C47`2YX_ diff --git a/src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png b/src/main/resources/assets/createindustry/textures/item/molten_steel_bucket.png index efdf27089cf24561c1ffe9dca4c2150e17457f85..3fa5d17ac9f158987fc495f36ab67243e2e64ce5 100644 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ydu{YLn`97PB_cSWGK+OUBPx4 zQ@&j8fo55jjZ;D%C~nY=Xc1Su>$0yka-N~R(ys@OlPW(OPR{(*KBsu+Go$Zn+;;1B z+sx-*oxl9-BfXBM*7q-WNC<2*HZ=<6=x5pD=*X4Hl+^Qc)BSx7B}(TMTg()eZgIN8 z_T^qbV^+cpH3fzp{ERQO8IFoE@H4VRF=XAfcX(<)MZ0A7#C3@bvh^GeTo*suXPF7E e*?H!#i@%zF{<6-G;%9*lXYh3Ob6Mw<&;$T8npN`v literal 19028 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 QJPC@y)78&qol`;+03C47`2YX_