From 4ff02250d6783888cbdc155295ab866d7f85e13f Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Fri, 27 Oct 2023 22:42:00 +0200 Subject: [PATCH] idk anymore --- .../9047e4e94996e73e9dfde3738763637fb609e07e | 4 +- .../ad795fb8576279849034d802e60366ec43bb396a | 22 +- .../blockstates/diesel_engine_expansion.json | 30 +++ .../resources/assets/tfmg/lang/en_ud.json | 10 + .../resources/assets/tfmg/lang/en_us.json | 21 ++ .../tfmg/models/item/charcoal_dust.json | 6 + .../models/item/diesel_engine_expansion.json | 3 + .../assets/tfmg/models/item/nitrate_dust.json | 6 + .../assets/tfmg/models/item/rebar.json | 6 + .../tfmg/models/item/steel_mechanism.json | 6 + .../assets/tfmg/models/item/sulfur_dust.json | 6 + .../item/unfinished_gasoline_engine.json | 3 + .../models/item/unfinished_lpg_engine.json | 3 + .../item/unfinished_steel_mechanism.json | 6 + .../item/unfinished_turbine_engine.json | 3 + .../tags/blocks/mineable/pickaxe.json | 1 + .../tags/blocks/needs_iron_tool.json | 3 +- .../blocks/diesel_engine_expansion.json | 20 ++ .../diesel/DieselEngineBlockEntity.java | 228 ++++++------------ .../engines/diesel/DieselEngineInstance.java | 5 +- .../DieselEngineExpansionBlock.java | 44 ++++ .../DieselEngineExpansionBlockEntity.java | 101 ++++++++ .../engines/intake/AirIntakeBlockEntity.java | 56 +++-- .../small/AbstractEngineTileEntity.java | 124 +++++++--- .../machines/TFMGMachineBlockEntity.java | 15 ++ .../tfmg/registry/TFMGBlockEntities.java | 6 + .../drmangotea/tfmg/registry/TFMGBlocks.java | 25 +- .../drmangotea/tfmg/registry/TFMGItems.java | 34 +++ .../assets/tfmg/lang/default/interface.json | 11 +- .../models/block/air_intake/block_large.json | 20 +- .../models/block/air_intake/block_medium.json | 20 +- .../models/block/diesel_engine/block.json | 146 +---------- .../tfmg/models/block/diesel_engine/item.json | 146 +---------- .../models/block/diesel_engine_expansion.json | 23 ++ .../block/diesel_engine_expansion/block.json | 22 ++ .../block/diesel_engine_expansion/item.json | 22 ++ .../models/block/gasoline_engine/block.json | 117 ++++----- .../models/block/gasoline_engine/item.json | 133 ++++------ .../block/gasoline_engine_back/block.json | 110 ++++----- .../block/gasoline_engine_back/item.json | 110 ++++----- .../block/steel_mechanical_pump/block.json | 6 +- .../block/steel_mechanical_pump/item.json | 6 +- .../tfmg/models/item/unfinished_engine.json | 49 ++++ .../block/air_intake/air_intake_medium.png | Bin 494 -> 2381 bytes .../block/air_intake/inside_large.png | Bin 216 -> 545 bytes .../block/air_intake/inside_medium.png | Bin 165 -> 405 bytes .../block/air_intake/inside_small.png | Bin 153 -> 261 bytes .../textures/block/diesel_engine_back.png | Bin 0 -> 414 bytes .../block/diesel_engine_expansion.png | Bin 0 -> 397 bytes .../textures/block/diesel_engine_front.png | Bin 0 -> 402 bytes .../textures/block/diesel_engine_side.png | Bin 0 -> 515 bytes .../tfmg/textures/block/engines/gasoline.png | Bin 0 -> 993 bytes .../tfmg/textures/block/steel_pipes.png | Bin 536 -> 493 bytes .../item/{saltpeter.png => nitrate_dust.png} | Bin .../{sulfur_powder.png => sulfur_dust.png} | Bin ...ism.png => unfinished_steel_mechanism.png} | Bin 56 files changed, 941 insertions(+), 797 deletions(-) create mode 100644 src/generated/resources/assets/tfmg/blockstates/diesel_engine_expansion.json create mode 100644 src/generated/resources/assets/tfmg/models/item/charcoal_dust.json create mode 100644 src/generated/resources/assets/tfmg/models/item/diesel_engine_expansion.json create mode 100644 src/generated/resources/assets/tfmg/models/item/nitrate_dust.json create mode 100644 src/generated/resources/assets/tfmg/models/item/rebar.json create mode 100644 src/generated/resources/assets/tfmg/models/item/steel_mechanism.json create mode 100644 src/generated/resources/assets/tfmg/models/item/sulfur_dust.json create mode 100644 src/generated/resources/assets/tfmg/models/item/unfinished_gasoline_engine.json create mode 100644 src/generated/resources/assets/tfmg/models/item/unfinished_lpg_engine.json create mode 100644 src/generated/resources/assets/tfmg/models/item/unfinished_steel_mechanism.json create mode 100644 src/generated/resources/assets/tfmg/models/item/unfinished_turbine_engine.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/diesel_engine_expansion.json create mode 100644 src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlock.java create mode 100644 src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java create mode 100644 src/main/resources/assets/tfmg/models/block/diesel_engine_expansion.json create mode 100644 src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/block.json create mode 100644 src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/item.json create mode 100644 src/main/resources/assets/tfmg/models/item/unfinished_engine.json create mode 100644 src/main/resources/assets/tfmg/textures/block/diesel_engine_back.png create mode 100644 src/main/resources/assets/tfmg/textures/block/diesel_engine_expansion.png create mode 100644 src/main/resources/assets/tfmg/textures/block/diesel_engine_front.png create mode 100644 src/main/resources/assets/tfmg/textures/block/diesel_engine_side.png create mode 100644 src/main/resources/assets/tfmg/textures/block/engines/gasoline.png rename src/main/resources/assets/tfmg/textures/item/{saltpeter.png => nitrate_dust.png} (100%) rename src/main/resources/assets/tfmg/textures/item/{sulfur_powder.png => sulfur_dust.png} (100%) rename src/main/resources/assets/tfmg/textures/item/{unprocessed_steel_mechanism.png => unfinished_steel_mechanism.png} (100%) diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index 516ee5dd..7f8ea1f5 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-10-26T22:51:36.2504125 Create: The Factory Must Grow's lang merger -3640a34be4ad81c84851611b91c9dbb8652b9e26 assets/tfmg/lang/en_us.json +// 1.19.2 2023-10-27T21:47:47.1044045 Create: The Factory Must Grow's lang merger +95a719fd28dbeb2111aaa82df44727ab8847bb27 assets/tfmg/lang/en_us.json diff --git a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a index 86ff4847..fe7999dc 100644 --- a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a +++ b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a @@ -1,4 +1,4 @@ -// 1.19.2 2023-10-26T22:51:36.2574132 Registrate Provider for tfmg [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-10-27T21:47:47.0823966 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] e982a263b6af75821042107fdeff7bd809436d08 assets/tfmg/blockstates/air_intake.json e7f63aadfc892e337d9f87b5e50af8b1c7e4103f assets/tfmg/blockstates/aluminum_bars.json b7f5146505c40c08cdea7ad01fa99048b7ac5451 assets/tfmg/blockstates/aluminum_block.json @@ -68,6 +68,7 @@ e11a6159da224e69f12e11a594c20bb2bd8c0e68 assets/tfmg/blockstates/cut_bauxite_bri 085577a70a50fcde799996e8b153a65735d778bc assets/tfmg/blockstates/cyan_concrete_wall.json 03983ce3de10310cd75b98f17c9161653b7034cd assets/tfmg/blockstates/diesel.json 7c567b9feab72955e4f0860a6fe829733ad0b2ab assets/tfmg/blockstates/diesel_engine.json +4afb3cba60d265071b13a90ee95023e8600d24c7 assets/tfmg/blockstates/diesel_engine_expansion.json 08007e8e0e57b4ad322e9125fd05b010aa9a5a0b assets/tfmg/blockstates/exhaust.json 41ad3bce75918278f4f48ca3ecf23b1980f9963d assets/tfmg/blockstates/factory_floor.json 10f47e08c249406dd1f2122d1e209998c45d848d assets/tfmg/blockstates/factory_floor_slab.json @@ -190,8 +191,8 @@ a91a739eb2fe9a2d24c409d2be93501503f87090 assets/tfmg/blockstates/white_concrete_ 98c9aa212e82100d7fc47354760940cc946594d4 assets/tfmg/blockstates/yellow_concrete_slab.json a1988ec6a98f23cad8321b46345fbf1c5fd20489 assets/tfmg/blockstates/yellow_concrete_stairs.json c58fa20c091e5ecddfb7164cba45538a8f911431 assets/tfmg/blockstates/yellow_concrete_wall.json -8910f7cd1b74825adfce5279357f33706b67601c assets/tfmg/lang/en_ud.json -a084c6512874b3c3f2de726a1d98dcdadcf455a9 assets/tfmg/lang/en_us.json +09facbb04f3ca3e7802cd90934687c5d96d249c0 assets/tfmg/lang/en_ud.json +7e16c9c1a702b75e4bfacf9bf74660c88026b268 assets/tfmg/lang/en_us.json 9e6a6b62f5e7528c4e4d4f72f3510edcd8f0c078 assets/tfmg/models/block/aluminum_block.json da469bf3233944085f07d4ef437827061e408838 assets/tfmg/models/block/aluminum_cap.json 4344f14c42bb7a9f90120b5f75927015c0edc3bc assets/tfmg/models/block/aluminum_cap_alt.json @@ -654,6 +655,7 @@ da2c28e98d0ddf7166bdf7214c06e81ad8581b90 assets/tfmg/models/item/cast_iron_ingot 55e71185e7ba0cb136bc332d5c95efc18425f975 assets/tfmg/models/item/cast_iron_pipe.json 84da535b10e09a52d2bb7cdc29a4b4ccb0b484d7 assets/tfmg/models/item/cast_iron_smart_fluid_pipe.json fc135ddd710b7a867de7d8952896350274960d23 assets/tfmg/models/item/caution_block.json +a4b6caad4a55c2f9758a58d566ffcd45d601e9aa assets/tfmg/models/item/charcoal_dust.json d45fc5511b4c4027889afd3088cd91ba1d8b0501 assets/tfmg/models/item/coal_coke.json 3789a9d72a7ba5daf8c39cccaa665057e63302c6 assets/tfmg/models/item/coal_coke_block.json cf3c486158a27cbd3a4ef9fdd79dc93f3cc12b45 assets/tfmg/models/item/coal_coke_dust.json @@ -680,6 +682,7 @@ e6bf52c7a969b26d65cc36353a6a3e2a91752e42 assets/tfmg/models/item/cut_bauxite_sta 36ddfc344417e445c751af930d937cab41e81d6c assets/tfmg/models/item/cyan_concrete_wall.json 3497bcbaee50b2f766de659043bf3c36823b570d assets/tfmg/models/item/diesel_bucket.json 5f6af846bfb652587c5cf2b7431a6025335e4f9d assets/tfmg/models/item/diesel_engine.json +b0223d07e15448b6e8a5a4565b379d1a91f159b3 assets/tfmg/models/item/diesel_engine_expansion.json 941e9eac84bd6bfce1f801ea6a9c98d79d8a7c9d assets/tfmg/models/item/exhaust.json 05059dfd2577f195a3c401b3e2a4c247371f5f67 assets/tfmg/models/item/factory_floor.json 1ad0fcaf5dedf28d9bf9e57b1e4a5e3171128b50 assets/tfmg/models/item/factory_floor_slab.json @@ -732,6 +735,7 @@ b380ae21f3274a48806976f58647150028a8df63 assets/tfmg/models/item/magenta_concret afac1fce0904a0df4e68d731b897ff1be6c68766 assets/tfmg/models/item/napalm_bomb.json b41853a4ae8b890f924058e57d274e956e6f4e37 assets/tfmg/models/item/napalm_bucket.json aa94f1afebb7c458e85849d8ddff76c27efefb80 assets/tfmg/models/item/naphtha_bucket.json +266bb5df7f514458dc90bf32f46efa31475ff7cc assets/tfmg/models/item/nitrate_dust.json 9907695c674afea00d3affefdc2ede9e68aa5667 assets/tfmg/models/item/oil_deposit.json 3670762634f4e4b1366b6a19253453ad3667655f assets/tfmg/models/item/orange_concrete.json c4d486b71f966ee9019ed124e1b84914386386dd assets/tfmg/models/item/orange_concrete_slab.json @@ -757,6 +761,7 @@ a6da50f604abf3b381b447c494a217cdac2a9b65 assets/tfmg/models/item/pumpjack_base.j fcc22d0322de977957e8353c7b9108e79fdca094 assets/tfmg/models/item/purple_concrete_stairs.json 3e797f9092ecfb4472a44c35e31c22528548930e assets/tfmg/models/item/purple_concrete_wall.json 3cfdbac1c06b4e75416fcd24a93616d98f59d6e3 assets/tfmg/models/item/quad_potato_cannon.json +78bf4984da7f4d6bbd51e8654a0d9185c30f22c9 assets/tfmg/models/item/rebar.json 94dd27526967032c1ab4f94d19ad24a60a03c278 assets/tfmg/models/item/rebar_concrete.json e3b67501716b8e2dd5b4043c95a55e08e10c3322 assets/tfmg/models/item/rebar_concrete_slab.json f34c9b5f7396d6250df8956178a83f0a55c7c119 assets/tfmg/models/item/rebar_concrete_stairs.json @@ -784,15 +789,21 @@ fa25fce00275dd2abdfe47ccf041c590bf558b8c assets/tfmg/models/item/steel_flywheel. 61e64ad93db0bd29dec2221633c4552f37026784 assets/tfmg/models/item/steel_ingot.json c986ff3f4535131aa6cb406a4db89eab5cb9ba8e assets/tfmg/models/item/steel_ladder.json 4cea5b158cc0789fcdc8808250b993160bc62268 assets/tfmg/models/item/steel_mechanical_pump.json +b4915579bbf366920e542f6c8014707771dd334f assets/tfmg/models/item/steel_mechanism.json 4fb5ba811196a402c750a379145aa0a14471ddc3 assets/tfmg/models/item/steel_pipe.json ee8c3438bbd74eaaa5d0423695365d2a5b1c4bb1 assets/tfmg/models/item/steel_scaffolding.json 76289628b3e2bc6373737731cfb7b41a7c01119b assets/tfmg/models/item/steel_sheetmetal.json 2badc90d08a4fd5f54c5e836ae2613b2e233f702 assets/tfmg/models/item/steel_smart_fluid_pipe.json 0bb5e8ab7b0162883ee43fee2b8869275f26adb1 assets/tfmg/models/item/steel_truss.json +bfc09955fa8b4b02ba2145ccf4b68dcb4d72e775 assets/tfmg/models/item/sulfur_dust.json e2fb504cbb8808de330d4ea87030f0d089921e23 assets/tfmg/models/item/surface_scanner.json 72da5f91f1992b502e90c8fc84d654e075163eb7 assets/tfmg/models/item/thermite_grenade.json 513398ed9f251ca092e818a3f9279641096687e7 assets/tfmg/models/item/turbine_engine.json 480c6573a04c2e3bf756ea8ab5801b1875e31df1 assets/tfmg/models/item/turbine_engine_back.json +b878e027796260734bb9cb3d799b58d9e26fd8eb assets/tfmg/models/item/unfinished_gasoline_engine.json +b878e027796260734bb9cb3d799b58d9e26fd8eb assets/tfmg/models/item/unfinished_lpg_engine.json +108b74837387c74cbcfe24bdd4dc0cb5c0ee2b93 assets/tfmg/models/item/unfinished_steel_mechanism.json +b878e027796260734bb9cb3d799b58d9e26fd8eb assets/tfmg/models/item/unfinished_turbine_engine.json 3364d43896991c64fd99480fdb7f5f9af1ab17a2 assets/tfmg/models/item/white_concrete.json eed7ac8dbb27b6af5ca4037db1e2b4949ea7c16a assets/tfmg/models/item/white_concrete_slab.json 4e02717d5f18da45095a831b81e55335f686ab31 assets/tfmg/models/item/white_concrete_stairs.json @@ -840,10 +851,10 @@ ec0bfe5dc43ffc30aeec49a1171fab05e6344514 data/forge/tags/items/rebar_concrete.js 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/dripstone_replaceable_blocks.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/lush_ground_replaceable.json 78dd479c02a4d74f7f2e94a49b5f69c7c44e0a22 data/minecraft/tags/blocks/mineable/axe.json -d5635a0e318b09e2f5d9c5b7fe70f250e9ed5b23 data/minecraft/tags/blocks/mineable/pickaxe.json +fc602664307417957284d3fdead179ea1ccd36fd data/minecraft/tags/blocks/mineable/pickaxe.json 63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/moss_replaceable.json 308629590ea6d2511f33b1f6f145273d6d8512a1 data/minecraft/tags/blocks/needs_diamond_tool.json -4faa86094bcb398aac8f593c4f344c7dfe91b179 data/minecraft/tags/blocks/needs_iron_tool.json +d9b7c5a1ade3877bde041b493a182a2f892f61cf data/minecraft/tags/blocks/needs_iron_tool.json 50009287611dd20dd887f9b0ce926773267658d6 data/minecraft/tags/blocks/needs_stone_tool.json 193c8b45d804216ca5fe2035fa8dfc4567303500 data/minecraft/tags/blocks/slabs.json 64778c41570f87475b2f624f752895b50e5e2338 data/minecraft/tags/blocks/stairs.json @@ -960,6 +971,7 @@ bca6aaf5cb5543625303de1f9c959b8abb758d62 data/tfmg/loot_tables/blocks/cyan_concr 53065cde698eebebf76700cabd3cb509ee7b1f1a data/tfmg/loot_tables/blocks/cyan_concrete_stairs.json 46482c07a16b5926ee907dc9a8b709108e507cab data/tfmg/loot_tables/blocks/cyan_concrete_wall.json 0eae2cf277b9e7c8c90df8c922b7aa28b69a552b data/tfmg/loot_tables/blocks/diesel_engine.json +548c48147eb2d0bb1b19a718a12489fba719f947 data/tfmg/loot_tables/blocks/diesel_engine_expansion.json 57e1ddc8ea284f25cb4c2b91e09e1212c9d9dcd2 data/tfmg/loot_tables/blocks/exhaust.json a011f9ced3ba9a599e363e07ff7fe277a4deeab1 data/tfmg/loot_tables/blocks/factory_floor.json 7a7a54755d6ee6ed1cb44e01843151220ca5407a data/tfmg/loot_tables/blocks/factory_floor_slab.json diff --git a/src/generated/resources/assets/tfmg/blockstates/diesel_engine_expansion.json b/src/generated/resources/assets/tfmg/blockstates/diesel_engine_expansion.json new file mode 100644 index 00000000..cd4e241d --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/diesel_engine_expansion.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "tfmg:block/diesel_engine_expansion", + "x": 180 + }, + "facing=east": { + "model": "tfmg:block/diesel_engine_expansion", + "x": 90, + "y": 90 + }, + "facing=north": { + "model": "tfmg:block/diesel_engine_expansion", + "x": 90 + }, + "facing=south": { + "model": "tfmg:block/diesel_engine_expansion", + "x": 90, + "y": 180 + }, + "facing=up": { + "model": "tfmg:block/diesel_engine_expansion" + }, + "facing=west": { + "model": "tfmg:block/diesel_engine_expansion", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index b5b537b2..1fa6638c 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -68,6 +68,7 @@ "block.tfmg.cyan_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uɐʎƆ", "block.tfmg.diesel": "ןǝsǝıᗡ", "block.tfmg.diesel_engine": "ǝuıbuƎ ןǝsǝıᗡ", + "block.tfmg.diesel_engine_expansion": "uoısuɐdxƎ ǝuıbuƎ ןǝsǝıᗡ", "block.tfmg.exhaust": "ʇsnɐɥxƎ", "block.tfmg.factory_floor": "ɹooןℲ ʎɹoʇɔɐℲ", "block.tfmg.factory_floor_slab": "qɐןS ɹooןℲ ʎɹoʇɔɐℲ", @@ -219,6 +220,7 @@ "item.tfmg.aluminum_ingot": "ʇobuI ɯnuıɯnןⱯ", "item.tfmg.block_mold": "pןoW ʞɔoןᗺ", "item.tfmg.cast_iron_ingot": "ʇobuI uoɹI ʇsɐƆ", + "item.tfmg.charcoal_dust": "ʇsnᗡ ןɐoɔɹɐɥƆ", "item.tfmg.coal_coke": "ǝʞoƆ ןɐoƆ", "item.tfmg.coal_coke_dust": "ʇsnᗡ ǝʞoƆ ןɐoƆ", "item.tfmg.cooling_fluid_bucket": "ʇǝʞɔnᗺ pınןℲ buıןooƆ", @@ -235,9 +237,17 @@ "item.tfmg.lubrication_oil_bucket": "ʇǝʞɔnᗺ ןıO uoıʇɐɔıɹqnꞀ", "item.tfmg.napalm_bucket": "ʇǝʞɔnᗺ ɯןɐdɐN", "item.tfmg.naphtha_bucket": "ʇǝʞɔnᗺ ɐɥʇɥdɐN", + "item.tfmg.nitrate_dust": "ʇsnᗡ ǝʇɐɹʇıN", "item.tfmg.quad_potato_cannon": "uouuɐƆ oʇɐʇoԀ pɐnὉ", + "item.tfmg.rebar": "ɹɐqǝᴚ", "item.tfmg.screwdriver": "ɹǝʌıɹpʍǝɹɔS", "item.tfmg.steel_ingot": "ʇobuI ןǝǝʇS", + "item.tfmg.steel_mechanism": "ɯsıuɐɥɔǝW ןǝǝʇS", + "item.tfmg.sulfur_dust": "ʇsnᗡ ɹnɟןnS", "item.tfmg.thermite_grenade": "ǝpɐuǝɹ⅁ ǝʇıɯɹǝɥ⟘", + "item.tfmg.unfinished_gasoline_engine": "ǝuıbuƎ ǝuıןosɐ⅁ pǝɥsıuıɟu∩", + "item.tfmg.unfinished_lpg_engine": "ǝuıbuƎ bdꞀ pǝɥsıuıɟu∩", + "item.tfmg.unfinished_steel_mechanism": "ɯsıuɐɥɔǝW ןǝǝʇS pǝɥsıuıɟu∩", + "item.tfmg.unfinished_turbine_engine": "ǝuıbuƎ ǝuıqɹn⟘ pǝɥsıuıɟu∩", "item.tfmg.zinc_grenade": "ǝpɐuǝɹ⅁ ɔuıZ" } \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index aebef5dc..02f6fe9d 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -71,6 +71,7 @@ "block.tfmg.cyan_concrete_wall": "Cyan Concrete Wall", "block.tfmg.diesel": "Diesel", "block.tfmg.diesel_engine": "Diesel Engine", + "block.tfmg.diesel_engine_expansion": "Diesel Engine Expansion", "block.tfmg.exhaust": "Exhaust", "block.tfmg.factory_floor": "Factory Floor", "block.tfmg.factory_floor_slab": "Factory Floor Slab", @@ -225,6 +226,7 @@ "item.tfmg.aluminum_ingot": "Aluminum Ingot", "item.tfmg.block_mold": "Block Mold", "item.tfmg.cast_iron_ingot": "Cast Iron Ingot", + "item.tfmg.charcoal_dust": "Charcoal Dust", "item.tfmg.coal_coke": "Coal Coke", "item.tfmg.coal_coke_dust": "Coal Coke Dust", "item.tfmg.cooling_fluid_bucket": "Cooling Fluid Bucket", @@ -241,10 +243,18 @@ "item.tfmg.lubrication_oil_bucket": "Lubrication Oil Bucket", "item.tfmg.napalm_bucket": "Napalm Bucket", "item.tfmg.naphtha_bucket": "Naphtha Bucket", + "item.tfmg.nitrate_dust": "Nitrate Dust", "item.tfmg.quad_potato_cannon": "Quad Potato Cannon", + "item.tfmg.rebar": "Rebar", "item.tfmg.screwdriver": "Screwdriver", "item.tfmg.steel_ingot": "Steel Ingot", + "item.tfmg.steel_mechanism": "Steel Mechanism", + "item.tfmg.sulfur_dust": "Sulfur Dust", "item.tfmg.thermite_grenade": "Thermite Grenade", + "item.tfmg.unfinished_gasoline_engine": "Unfinished Gasoline Engine", + "item.tfmg.unfinished_lpg_engine": "Unfinished Lpg Engine", + "item.tfmg.unfinished_steel_mechanism": "Unfinished Steel Mechanism", + "item.tfmg.unfinished_turbine_engine": "Unfinished Turbine Engine", "item.tfmg.zinc_grenade": "Zinc Grenade", @@ -288,6 +298,17 @@ "create.goggles.coke_oven.invalid": "Coke Oven Invalid", "create.goggles.coke_oven.tank_full": "One of Internal Tanks Is Full", "create.goggles.coke_oven.progress": "Progress: %1$s", + "create.goggles.engine_stats": "Engine Stats:", + "create.goggles.engine_exhaust_stats": "Engine Exhaust Stats:", + "create.goggles.fuel_container": "Fluid Storage", + "create.goggles.engine.backpartmissing": "Back Part Missing:", + "create.goggles.engine_redstone_input": "Speed:", + "create.goggles.engine.efficiency": "Efficiency:", + + "create.tooltip.engine_analog_strength": "%1$s/15", + + "create.goggles.get_engine_efficiency": "%1$s", + "create.goggles.engine.stress": "%1$ssu", "_": "Thank you for translating Create: The Factory Must Grow!" diff --git a/src/generated/resources/assets/tfmg/models/item/charcoal_dust.json b/src/generated/resources/assets/tfmg/models/item/charcoal_dust.json new file mode 100644 index 00000000..e27351af --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/charcoal_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/charcoal_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/diesel_engine_expansion.json b/src/generated/resources/assets/tfmg/models/item/diesel_engine_expansion.json new file mode 100644 index 00000000..2cb9fdbb --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/diesel_engine_expansion.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/diesel_engine_expansion" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/nitrate_dust.json b/src/generated/resources/assets/tfmg/models/item/nitrate_dust.json new file mode 100644 index 00000000..d82be54b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/nitrate_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/nitrate_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/rebar.json b/src/generated/resources/assets/tfmg/models/item/rebar.json new file mode 100644 index 00000000..c80fde9a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/rebar.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/rebar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/steel_mechanism.json b/src/generated/resources/assets/tfmg/models/item/steel_mechanism.json new file mode 100644 index 00000000..f0d7edac --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/steel_mechanism.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/steel_mechanism" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/sulfur_dust.json b/src/generated/resources/assets/tfmg/models/item/sulfur_dust.json new file mode 100644 index 00000000..436517cc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/sulfur_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/sulfur_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/unfinished_gasoline_engine.json b/src/generated/resources/assets/tfmg/models/item/unfinished_gasoline_engine.json new file mode 100644 index 00000000..31f0c8b1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/unfinished_gasoline_engine.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:item/unfinished_engine" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/unfinished_lpg_engine.json b/src/generated/resources/assets/tfmg/models/item/unfinished_lpg_engine.json new file mode 100644 index 00000000..31f0c8b1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/unfinished_lpg_engine.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:item/unfinished_engine" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/unfinished_steel_mechanism.json b/src/generated/resources/assets/tfmg/models/item/unfinished_steel_mechanism.json new file mode 100644 index 00000000..e24f8d7b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/unfinished_steel_mechanism.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfmg:item/unfinished_steel_mechanism" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/unfinished_turbine_engine.json b/src/generated/resources/assets/tfmg/models/item/unfinished_turbine_engine.json new file mode 100644 index 00000000..31f0c8b1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/unfinished_turbine_engine.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:item/unfinished_engine" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 87a509fb..3058f468 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -48,6 +48,7 @@ "tfmg:turbine_engine", "tfmg:turbine_engine_back", "tfmg:diesel_engine", + "tfmg:diesel_engine_expansion", "tfmg:steel_pipe", "tfmg:copper_encased_steel_pipe", "tfmg:glass_steel_pipe", diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index dcd611d1..0edc2ca3 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -3,6 +3,7 @@ "tfmg:steel_block", "tfmg:cast_iron_block", "tfmg:aluminum_block", - "tfmg:steel_sheetmetal" + "tfmg:steel_sheetmetal", + "tfmg:diesel_engine_expansion" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/diesel_engine_expansion.json b/src/generated/resources/data/tfmg/loot_tables/blocks/diesel_engine_expansion.json new file mode 100644 index 00000000..3bb7d597 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/diesel_engine_expansion.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:diesel_engine_expansion" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java index abb22850..56d543af 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineBlockEntity.java @@ -16,6 +16,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOptionBehaviour; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; +import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.utility.*; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -23,10 +24,12 @@ import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.NbtUtils; import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; import net.minecraft.world.phys.AABB; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -35,6 +38,7 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.templates.FluidTank; import net.minecraftforge.fml.DistExecutor; import javax.annotation.Nonnull; @@ -50,30 +54,18 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo public WeakReference target; /////////// - public SmartFluidTankBehaviour inputTank; - protected SmartFluidTankBehaviour exhaustTank; + public FluidTank fuelTank; + protected FluidTank exhaustTank; + + protected FluidTank airTank; private boolean contentsChanged; private int consumptionTimer=0; public float engineStrength = 0; - private Couple tanks; - - public boolean connectionVerticalX=false; - public boolean connectionVerticalZ=false; - - public boolean connectionX=false; - public boolean connectionX2=false; - - public boolean connectionZ=false; - public boolean connectionZ2=false; - - protected LazyOptional fluidCapability; + private Couple tanks; - - - - List> visualizedOutputFluids; + protected LazyOptional fluidCapability; public DieselEngineBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { super(type, pos, state); @@ -84,14 +76,18 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo contentsChanged = true; + fuelTank = createInventory(TFMGFluids.DIESEL.getSource(),false); - tanks = Couple.create(inputTank, exhaustTank); - tanks.get(true).forbidExtraction(); - tanks.get(false).forbidInsertion(); + exhaustTank = createInventory(TFMGFluids.CARBON_DIOXIDE.getSource(),true); + airTank = createInventory(TFMGFluids.AIR.getSource(),false); + tanks = Couple.create(fuelTank, exhaustTank); + + fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(fuelTank,airTank, exhaustTank)); + } @@ -111,21 +107,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo behaviours.add(new DirectBeltInputBehaviour(this)); - - inputTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.INPUT, this, 1, 1000, true) - .whenFluidUpdates(() -> contentsChanged = true); - - exhaustTank = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 1, 1000, true) - .whenFluidUpdates(() -> contentsChanged = true) - .forbidInsertion(); - behaviours.add(inputTank); - behaviours.add(exhaustTank); - - fluidCapability = LazyOptional.of(() -> { - LazyOptional inputCap = inputTank.getCapability(); - LazyOptional outputCap = exhaustTank.getCapability(); - return new CombinedTankWrapper(outputCap.orElse(null), inputCap.orElse(null)); - }); } private void onDirectionChanged() {} @@ -135,17 +116,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo super.tick(); - spawnConnections(); - - - - if(!level.isClientSide()){ - - - - } - - PoweredShaftBlockEntity shaft = getShaft(); @@ -165,7 +135,8 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo shaft.update(worldPosition, 0, 0); return; } - engineProcess(); + if(!level.isClientSide) + engineProcess(); boolean verticalTarget = false; BlockState shaftState = shaft.getBlockState(); Axis targetAxis = Axis.X; @@ -181,9 +152,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo facing = blockState.getValue(DieselEngineBlock.FACING); - //if (engineStrength > 0) - - // award(AllAdvancements.STEAM_ENGINE); int conveyedSpeedLevel = engineStrength == 0 ? 1 : verticalTarget ? 1 : (int) GeneratingKineticBlockEntity.convertToDirection(1, facing)*2; @@ -237,86 +205,37 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo prevAngle = angle; } - private void spawnConnections(){ - if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.UP|| - ((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.DOWN){ - - if( - level.getBlockState(this.getBlockPos().north()).is(TFMGBlocks.DIESEL_ENGINE.get())|| - level.getBlockState(this.getBlockPos().south()).is(TFMGBlocks.DIESEL_ENGINE.get()) - ){ - connectionVerticalZ=true; - } else connectionVerticalZ=false; - if( - level.getBlockState(this.getBlockPos().west()).is(TFMGBlocks.DIESEL_ENGINE.get())|| - level.getBlockState(this.getBlockPos().east()).is(TFMGBlocks.DIESEL_ENGINE.get()) - ){ - connectionVerticalX=true; - } else connectionVerticalX=false; - - - - } - if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.WEST|| - ((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.EAST){ - - if( - level.getBlockState(this.getBlockPos().north()).is(TFMGBlocks.DIESEL_ENGINE.get())|| - level.getBlockState(this.getBlockPos().south()).is(TFMGBlocks.DIESEL_ENGINE.get()) - ){ - connectionZ=true; - } else connectionZ=false; - if( - level.getBlockState(this.getBlockPos().above()).is(TFMGBlocks.DIESEL_ENGINE.get())|| - level.getBlockState(this.getBlockPos().below()).is(TFMGBlocks.DIESEL_ENGINE.get()) - ){ - connectionZ2=true; - } else connectionZ2=false; - - - - } - if(((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.NORTH|| - ((DieselEngineBlock)this.getBlockState().getBlock()).getConnectedDirection(this.getBlockState()) == Direction.SOUTH){ - - if( - level.getBlockState(this.getBlockPos().west()).is(TFMGBlocks.DIESEL_ENGINE.get())|| - level.getBlockState(this.getBlockPos().east()).is(TFMGBlocks.DIESEL_ENGINE.get()) - ){ - connectionX=true; - } else connectionX=false; - if( - level.getBlockState(this.getBlockPos().above()).is(TFMGBlocks.DIESEL_ENGINE.get())|| - level.getBlockState(this.getBlockPos().below()).is(TFMGBlocks.DIESEL_ENGINE.get()) - ){ - connectionX2=true; - } else connectionX2=false; - - - - } - } private void engineProcess() { - if(tanks.get(true).getPrimaryHandler().isEmpty()||tanks.get(true).getPrimaryHandler().isEmpty()) { + if(tanks.get(true).isEmpty()||tanks.get(true).isEmpty()) { engineStrength=0; return; } - if(tanks.get(false).getPrimaryHandler().getFluidAmount()+5>1000) { + if(airTank.isEmpty()){ engineStrength = 0; return; } - if(tanks.get(true).getPrimaryHandler().getFluid().getFluid().isSame(TFMGFluids.DIESEL.getSource())) { - - - if(consumptionTimer>=3) { - //if(signal!=0) - tanks.get(true).getPrimaryHandler().drain(3, IFluidHandler.FluidAction.EXECUTE); - tanks.get(false) .getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), tanks.get(false).getPrimaryHandler().getFluidAmount()+1)); - consumptionTimer=0; + if(tanks.get(false).getFluidAmount()+5>1000) { + engineStrength = 0; + return; } + if(tanks.get(true).getFluid().getFluid().isSame(TFMGFluids.DIESEL.getSource())) { + + + + if(consumptionTimer>=10) { + //if(signal!=0) + fuelTank.setFluid(new FluidStack(TFMGFluids.DIESEL.getSource(),airTank.getFluidAmount()-1)); + consumptionTimer=0; + } + //airTank.drain(1, IFluidHandler.FluidAction.EXECUTE); + + airTank.setFluid(new FluidStack(TFMGFluids.AIR.getSource(),airTank.getFluidAmount()-5)); + exhaustTank.fill(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),3), IFluidHandler.FluidAction.EXECUTE); + //tanks.get(false).setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(), tanks.get(false).getFluidAmount()+1)); + consumptionTimer++; engineStrength=40; @@ -396,28 +315,28 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo //////////////////////////////////// @Override - protected void read(CompoundTag compound, boolean clientPacket) { - super.read(compound, clientPacket); + public void write(CompoundTag compound, boolean clientPacket) { + + compound.put("Fuel", fuelTank.writeToNBT(new CompoundTag())); + compound.put("Air", airTank.writeToNBT(new CompoundTag())); + + compound.put("Exhaust", exhaustTank.writeToNBT(new CompoundTag())); - if (!clientPacket) - return; - // tanks.get(true).getPrimaryHandler().readFromNBT(compound.getCompound("Fuel")); - // tanks.get(true).getPrimaryHandler().readFromNBT(compound.getCompound("Exhaust")); - + super.write(compound, clientPacket); } @Override - public void write(CompoundTag compound, boolean clientPacket) { - super.write(compound, clientPacket); + protected void read(CompoundTag compound, boolean clientPacket) { + fuelTank.readFromNBT(compound.getCompound("Fuel")); + + airTank.readFromNBT(compound.getCompound("Air")); + + exhaustTank.readFromNBT(compound.getCompound("Exhaust")); - if (!clientPacket) - return; - // compound.put("Fuel", tanks.get(true).getPrimaryHandler().writeToNBT(new CompoundTag())); - // compound.put("Exhaust", tanks.get(false).getPrimaryHandler().writeToNBT(new CompoundTag())); - + super.read(compound, clientPacket); } @@ -430,6 +349,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo @Nonnull @Override + @SuppressWarnings("removal") public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) @@ -447,7 +367,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo - public Couple getTanks() { + public Couple getTanks() { return tanks; } @@ -460,6 +380,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo @Override + @SuppressWarnings("removal") public boolean addToGoggleTooltip(List tooltip, boolean isPlayerSneaking) { @@ -523,23 +444,34 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo } + protected void onFluidStackChanged(FluidStack newFluidStack) { + sendData(); + } + protected SmartFluidTank createInventory(Fluid validFluid,boolean extractionAllowed) { + return new SmartFluidTank(1000, this::onFluidStackChanged) { + @Override + public boolean isFluidValid(FluidStack stack) { + return stack.getFluid().isSame(validFluid); + } -/* - class BasinValueBox extends ValueBoxTransform.Sided { - @Override - protected Vec3 getSouthLocation() { - return VecHelper.voxelSpace(8, 12, 15.75); - } - @Override - protected boolean isSideActive(BlockState state, Direction direction) { - return direction.getAxis() - .isHorizontal(); - } + @Override + public FluidStack drain(FluidStack resource, FluidAction action) { + if (!extractionAllowed) + return FluidStack.EMPTY; + return super.drain(resource, action); + } + @Override + public FluidStack drain(int maxDrain, FluidAction action) { + if (!extractionAllowed) + return FluidStack.EMPTY; + return super.drain(maxDrain, action); + } + + + }; } - */ - } diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java index b74ceb0e..6c385bb7 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/DieselEngineInstance.java @@ -11,6 +11,7 @@ import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; import com.simibubi.create.foundation.utility.AngleHelper; +import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.util.Mth; @@ -131,7 +132,9 @@ public class DieselEngineInstance extends BlockEntityInstance, IWrenchable { + + + + public DieselEngineExpansionBlock(Properties p_52591_) { + super(p_52591_); + this.registerDefaultState(this.stateDefinition.any().setValue(FACING, Direction.DOWN)); + } + protected void createBlockStateDefinition(StateDefinition.Builder p_55125_) { + p_55125_.add(FACING); + } + + + @Override + public Class getBlockEntityClass() { + return DieselEngineExpansionBlockEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.DIESEL_ENGINE_EXPANSION.get(); + } + + public BlockState getStateForPlacement(BlockPlaceContext p_55087_) { + return this.defaultBlockState().setValue(FACING, p_55087_.getNearestLookingDirection().getOpposite().getOpposite()); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java new file mode 100644 index 00000000..ad328d4d --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/diesel/engine_expansion/DieselEngineExpansionBlockEntity.java @@ -0,0 +1,101 @@ +package com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion; + +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; +import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import com.simibubi.create.foundation.fluid.CombinedTankWrapper; +import com.simibubi.create.foundation.fluid.SmartFluidTank; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.templates.FluidTank; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; + +public class DieselEngineExpansionBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { + + protected LazyOptional fluidCapability; + protected FluidTank coolantTank; + protected FluidTank lubricationOilTank; + protected FluidTank airTank; + + + + + public DieselEngineExpansionBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + + airTank = createUpgradeTankInventory(TFMGFluids.AIR.get()); + coolantTank = createUpgradeTankInventory(TFMGFluids.COOLING_FLUID.get()); + lubricationOilTank = createUpgradeTankInventory(TFMGFluids.LUBRICATION_OIL.get()); + + fluidCapability = LazyOptional.of(() -> new CombinedTankWrapper(airTank,lubricationOilTank,coolantTank)); + + + } + + + @Nonnull + @Override + @SuppressWarnings("removal") + public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { + + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) + return fluidCapability.cast(); + return super.getCapability(cap, side); + } + @Override + public void invalidate() { + super.invalidate(); + fluidCapability.invalidate(); + } + @Override + public void write(CompoundTag compound, boolean clientPacket) { + + compound.put("LubricationOil", lubricationOilTank.writeToNBT(new CompoundTag())); + compound.put("Air", airTank.writeToNBT(new CompoundTag())); + + compound.put("Coolant", coolantTank.writeToNBT(new CompoundTag())); + + + super.write(compound, clientPacket); + } + + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + lubricationOilTank.readFromNBT(compound.getCompound("LubricationOil")); + + airTank.readFromNBT(compound.getCompound("Air")); + + coolantTank.readFromNBT(compound.getCompound("Coolant")); + + + + super.read(compound, clientPacket); + } + + @Override + public void addBehaviours(List behaviours) {} + protected void onFluidStackChanged(FluidStack newFluidStack) { + sendData(); + } + protected SmartFluidTank createUpgradeTankInventory(Fluid validFluid) { + return new SmartFluidTank(1000, this::onFluidStackChanged){ + @Override + public boolean isFluidValid(FluidStack stack) { + return stack.getFluid().isSame(validFluid); + } + }; + } +} diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java index eb68dc7d..bf0dd044 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/intake/AirIntakeBlockEntity.java @@ -75,11 +75,18 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha public void tick(){ super.tick(); - - int production = ((int)maxShaftSpeed*((diameter*diameter)))/60; - if(tankInventory.getFluidAmount()+production <= tankInventory.getCapacity()) - tankInventory.fill(new FluidStack(TFMGFluids.AIR.getSource(),production), IFluidHandler.FluidAction.EXECUTE); -//////////////// + //if(!level.isClientSide) { + int production = ((int) maxShaftSpeed * ((diameter * diameter))) / 60; + 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())); + if(controller!=null) { + ((AirIntakeBlockEntity) level.getBlockEntity(controller)).setChanged(); + ((AirIntakeBlockEntity) level.getBlockEntity(controller)).sendData(); + } + } + // } + //////////////// if(diameter == 3){ @@ -232,8 +239,8 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha - if(controller!=null) - refreshCapability(); + //if(controller!=null) + // refreshCapability(); @@ -251,6 +258,7 @@ public class AirIntakeBlockEntity extends KineticBlockEntity implements IWrencha } + LazyOptional oldFluidCapability = fluidCapability; if(diameter==1&&!isUsedByController){ @@ -344,13 +352,13 @@ if(diameter==1&&!isUsedByController){ //if(checkedBE.diameter<3) // ((AirIntakeBlockEntity) level.getBlockEntity(pos)).isController = false; - if(pos!=this.getBlockPos()) - if(checkedBE.isController) { - - - canBeLarge = false; - break; - } + // if(pos!=this.getBlockPos()) + // if(checkedBE.isController) { +// +// + // canBeLarge = false; + // break; + // } @@ -518,24 +526,20 @@ if(diameter==1&&!isUsedByController){ public boolean isFluidValid(FluidStack stack) { return stack.getFluid().isSame(TFMGFluids.AIR.getSource()); } - @Override - public FluidStack drain(FluidStack resource, FluidAction action) { - return FluidStack.EMPTY; - } + // @Override + // public FluidStack drain(FluidStack resource, FluidAction action) { + // return FluidStack.EMPTY; + // } }; } protected void onFluidStackChanged(FluidStack newFluidStack) { - if (!hasLevel()) - return; - - - - if (!level.isClientSide) { setChanged(); sendData(); - } - + if(controller!=null) { + ((AirIntakeBlockEntity) level.getBlockEntity(controller)).setChanged(); + ((AirIntakeBlockEntity) level.getBlockEntity(controller)).sendData(); + } } diff --git a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java index d0bce311..01cc1be4 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/engines/small/AbstractEngineTileEntity.java @@ -5,10 +5,13 @@ import com.drmangotea.tfmg.blocks.engines.small.turbine.TurbineEngineTileEntity; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGFluids; import com.simibubi.create.AllSoundEvents; +import com.simibubi.create.Create; import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; +import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.LangBuilder; @@ -41,11 +44,15 @@ import java.util.Optional; import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING; +@SuppressWarnings("removal") public abstract class AbstractEngineTileEntity extends GeneratingKineticBlockEntity implements IHaveGoggleInformation, IWrenchable { protected LazyOptional fluidCapability; protected FluidTank tankInventory; + protected FluidTank lubricationOilTank; + + protected FluidTank coolantTank; protected int soundTimer=0; @@ -69,6 +76,12 @@ public abstract class AbstractEngineTileEntity extends GeneratingKineticBlockEnt protected int syncCooldown; protected boolean queuedSync; + public Fluid lubricationOil = TFMGFluids.LUBRICATION_OIL.get(); + public Fluid coolant = TFMGFluids.COOLING_FLUID.get(); + + public float powerModifier=1; + public float efficiencyModifier = 1.4f; + // int signal; boolean signalChanged; @@ -80,15 +93,25 @@ boolean signalChanged; super(type, pos, state); tankInventory = createInventory(); - fluidCapability = LazyOptional.of(() -> tankInventory); + lubricationOilTank = createUpgradeTankInventory(lubricationOil); + coolantTank = createUpgradeTankInventory(coolant); + + + //fluidCapability = LazyOptional.of(() -> tankInventory); + fluidCapability = LazyOptional.of(() -> { + return new CombinedTankWrapper(tankInventory,lubricationOilTank,coolantTank ); + }); signal = 0; setLazyTickRate(40); - refreshCapability(); + } @Override public void addBehaviours(List behaviours) { + + + } @Override @@ -121,7 +144,7 @@ boolean signalChanged; fuelConsumption=0; if(!tankInventory.isEmpty()) { - if(consumptionTimer>=10) { + if(consumptionTimer>=17) { if(signal!=0) tankInventory.drain(fuelConsumption, IFluidHandler.FluidAction.EXECUTE); consumptionTimer=0; @@ -131,7 +154,7 @@ boolean signalChanged; - return convertToDirection(signal * signal, getBlockState().getValue(FACING)); + return convertToDirection((signal * signal)*powerModifier, getBlockState().getValue(FACING)); }} return 0; @@ -156,12 +179,12 @@ boolean signalChanged; } efficiency=100; - if(signal>idealSpeed){ - efficiency=(100-(signal-idealSpeed)*5); + if(signal>=idealSpeed){ + efficiency= (int) ((100-(signal-idealSpeed)*5)/efficiencyModifier); } if(signal0) { + newPowerModifier+=.3f; + newEfficiencyModifier-=.1f; + } + if(coolantTank.getFluidAmount()>0) { + newPowerModifier+=.1f; + newEfficiencyModifier-=.3f; + } + + //////// + + + //// + + powerModifier=newPowerModifier; + efficiencyModifier = newEfficiencyModifier; + } + + + + @OnlyIn(Dist.CLIENT) private void makeSound(){ soundTimer=0; @@ -501,6 +572,14 @@ public void write(CompoundTag compound, boolean clientPacket) { } }; } + protected SmartFluidTank createUpgradeTankInventory(Fluid validFluid) { + return new SmartFluidTank(1000, this::onFluidStackChanged){ + @Override + public boolean isFluidValid(FluidStack stack) { + return stack.getFluid().isSame(validFluid); + } + }; + } @@ -534,27 +613,6 @@ public void write(CompoundTag compound, boolean clientPacket) { - - - private void refreshCapability() { - LazyOptional oldCap = fluidCapability; - fluidCapability = LazyOptional.of(() -> handlerForCapability()); - oldCap.invalidate(); - } - - private IFluidHandler handlerForCapability() { - return tankInventory; - } - - - - - - - - - - public float getFillState() { return (float) tankInventory.getFluidAmount() / tankInventory.getCapacity(); } @@ -564,8 +622,7 @@ public void write(CompoundTag compound, boolean clientPacket) { @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { - if (!fluidCapability.isPresent()) - refreshCapability(); + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluidCapability.cast(); return super.getCapability(cap, side); @@ -574,6 +631,7 @@ public void write(CompoundTag compound, boolean clientPacket) { @Override public void invalidate() { super.invalidate(); + fluidCapability.invalidate(); } diff --git a/src/main/java/com/drmangotea/tfmg/blocks/machines/TFMGMachineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/blocks/machines/TFMGMachineBlockEntity.java index e0bdffa2..bfea4790 100644 --- a/src/main/java/com/drmangotea/tfmg/blocks/machines/TFMGMachineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/blocks/machines/TFMGMachineBlockEntity.java @@ -5,6 +5,7 @@ import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; +import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.utility.Couple; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.LangBuilder; @@ -50,14 +51,26 @@ public class TFMGMachineBlockEntity extends SmartBlockEntity implements IHaveGo tank2 = new SmartFluidTankBehaviour(SmartFluidTankBehaviour.OUTPUT, this, 1, 1000, true) .whenFluidUpdates(() -> contentsChanged = true); + + + + behaviours.add(tank1); behaviours.add(tank2); + + + fluidCapability = LazyOptional.of(() -> { LazyOptional inputCap = tank1.getCapability(); LazyOptional outputCap = tank2.getCapability(); return new CombinedTankWrapper(outputCap.orElse(null), inputCap.orElse(null)); }); + + + } + protected void onFluidStackChanged(FluidStack newFluidStack) { + sendData(); } @Override @@ -70,6 +83,8 @@ public class TFMGMachineBlockEntity extends SmartBlockEntity implements IHaveGo @Override public LazyOptional getCapability(@Nonnull Capability cap, Direction side) { + + if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) return fluidCapability.cast(); return super.getCapability(cap, side); diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java index 95688760..ccebf160 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java @@ -14,6 +14,7 @@ import com.drmangotea.tfmg.blocks.deposits.surface_scanner.SurfaceScannerRendere import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlockEntity; import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineInstance; import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineRenderer; +import com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion.DieselEngineExpansionBlockEntity; import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlockEntity; import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeInstance; import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeRenderer; @@ -202,6 +203,11 @@ public class TFMGBlockEntities { .renderer(() -> DieselEngineRenderer::new) .register(); + public static final BlockEntityEntry DIESEL_ENGINE_EXPANSION = REGISTRATE + .blockEntity("diesel_engine_expansion", DieselEngineExpansionBlockEntity::new) + .validBlocks(TFMGBlocks.DIESEL_ENGINE_EXPANSION) + .register(); + public static final BlockEntityEntry GASOLINE_ENGINE = REGISTRATE .blockEntity("gasoline_engine", GasolineEngineTileEntity::new) .instance(() -> HalfShaftInstance::new, false) diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index 4f9aa84e..51d3da02 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -12,6 +12,7 @@ import com.drmangotea.tfmg.blocks.decoration.doors.TFMGSlidingDoorBlock; import com.drmangotea.tfmg.blocks.decoration.flywheels.TFMGFlywheelBlock; import com.drmangotea.tfmg.blocks.deposits.FluidDepositBlock; import com.drmangotea.tfmg.blocks.engines.diesel.DieselEngineBlock; +import com.drmangotea.tfmg.blocks.engines.diesel.engine_expansion.DieselEngineExpansionBlock; import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeBlock; import com.drmangotea.tfmg.blocks.engines.intake.AirIntakeGenerator; import com.drmangotea.tfmg.blocks.engines.small.EngineGenerator; @@ -682,7 +683,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .blockstate(new EngineGenerator()::generate) - .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setCapacity(66.0)) .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) .item() .properties(p -> p.rarity(Rarity.UNCOMMON)) @@ -697,7 +698,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .blockstate(new EngineGenerator()::generate) - .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setCapacity(66.0)) .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) .item() .properties(p -> p.rarity(Rarity.UNCOMMON)) @@ -713,7 +714,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .blockstate(new EngineGenerator()::generate) - .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setCapacity(66.0)) .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) .item() .properties(p -> p.rarity(Rarity.UNCOMMON)) @@ -743,7 +744,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .blockstate(new EngineGenerator()::generate) - .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setCapacity(66.0)) .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) .item() .properties(p -> p.rarity(Rarity.UNCOMMON)) @@ -758,7 +759,7 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .blockstate(new EngineGenerator()::generate) - .transform(BlockStressDefaults.setCapacity(60.0)) + .transform(BlockStressDefaults.setCapacity(66.0)) .transform(BlockStressDefaults.setGeneratorSpeed(() -> Couple.create(0, 256))) .item() .properties(p -> p.rarity(Rarity.UNCOMMON)) @@ -772,12 +773,24 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU .initialProperties(SharedProperties::copperMetal) .transform(pickaxeOnly()) .blockstate((c, p) -> p.horizontalFaceBlock(c.get(), AssetLookup.partialBaseModel(c, p))) - .transform(BlockStressDefaults.setCapacity(14.0)) + .transform(BlockStressDefaults.setCapacity(15.0)) .transform(BlockStressDefaults.setGeneratorSpeed(DieselEngineBlock::getSpeedRange)) .item() .transform(customItemModel()) .register(); + public static final BlockEntry DIESEL_ENGINE_EXPANSION = REGISTRATE.block("diesel_engine_expansion", DieselEngineExpansionBlock::new) + .initialProperties(() -> Blocks.IRON_BLOCK) + .properties(p -> p.color(MaterialColor.TERRACOTTA_CYAN)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(BlockStateGen.directionalBlockProvider(false)) + .tag(BlockTags.NEEDS_IRON_TOOL) + .item() + .build() + .lang("Diesel Engine Expansion") + .register(); + //----------------------PIPES-------------------------------// //STEEL diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java index 027c28cc..aa31b0f7 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java @@ -1,5 +1,6 @@ package com.drmangotea.tfmg.registry; +import com.drmangotea.tfmg.CreateTFMG; import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ChemicalColor; import com.drmangotea.tfmg.items.gadgets.explosives.thermite_grenades.ThermiteGrenadeItem; import com.drmangotea.tfmg.items.gadgets.quad_potato_cannon.QuadPotatoCannonItem; @@ -7,6 +8,8 @@ import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.Castin import com.drmangotea.tfmg.blocks.machines.metal_processing.casting_basin.CastingMoldItem; import com.drmangotea.tfmg.items.CoalCokeItem; import com.drmangotea.tfmg.items.ScrewdriverItem; +import com.simibubi.create.Create; +import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.foundation.data.AssetLookup; import com.tterrag.registrate.util.entry.ItemEntry; import net.minecraft.tags.TagKey; @@ -32,6 +35,33 @@ public class TFMGItems { // LEAD_INGOT = taggedIngredient("lead_ingot", forgeItemTag("ingots/lead"), CREATE_INGOTS.tag) ; + public static final ItemEntry + REBAR = REGISTRATE.item("rebar", Item::new).register(); + + + public static final ItemEntry + + STEEL_MECHANISM = REGISTRATE.item("steel_mechanism", Item::new).register(), + CHARCOAL_DUST = REGISTRATE.item("charcoal_dust", Item::new).register(), + NITRATE_DUST = REGISTRATE.item("nitrate_dust", Item::new).register(), + SULFUR_DUST = REGISTRATE.item("sulfur_dust", Item::new).register(); + + + public static final ItemEntry + + UNFINISHED_STEEL_MECHANISM = sequencedIngredient("unfinished_steel_mechanism"); + + public static final ItemEntry + UNFINISHED_GASOLINE_ENGINE = REGISTRATE.item("unfinished_gasoline_engine", SequencedAssemblyItem::new) + .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine"))) + .register(), + UNFINISHED_LPG_ENGINE = REGISTRATE.item("unfinished_lpg_engine", SequencedAssemblyItem::new) + .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine"))) + .register(), + UNFINISHED_TURBINE_ENGINE = REGISTRATE.item("unfinished_turbine_engine", SequencedAssemblyItem::new) + .model((c, p) -> p.withExistingParent(c.getName(), CreateTFMG.asResource("item/unfinished_engine"))) + .register(); + public static final ItemEntry COAL_COKE_DUST = taggedIngredient("coal_coke_dust", forgeItemTag("dusts/coal_coke")); @@ -65,6 +95,10 @@ public class TFMGItems { .tag(tags) .register(); } + private static ItemEntry sequencedIngredient(String name) { + return REGISTRATE.item(name, SequencedAssemblyItem::new) + .register(); + } private static ItemEntry thermiteGrenade(String name, ChemicalColor color) { return REGISTRATE.item(name, p -> new ThermiteGrenadeItem(p, color)) diff --git a/src/main/resources/assets/tfmg/lang/default/interface.json b/src/main/resources/assets/tfmg/lang/default/interface.json index a5a40723..ab8a5221 100644 --- a/src/main/resources/assets/tfmg/lang/default/interface.json +++ b/src/main/resources/assets/tfmg/lang/default/interface.json @@ -35,5 +35,14 @@ "create.goggles.coke_oven.item_count": "Item Count In Internal Storage: %1$s", "create.goggles.coke_oven.invalid": "Coke Oven Invalid", "create.goggles.coke_oven.tank_full": "One of Internal Tanks Is Full", - "create.goggles.coke_oven.progress": "Progress: %1$s" + "create.goggles.coke_oven.progress": "Progress: %1$s", + "create.goggles.engine_stats": "Engine Stats:", + "create.goggles.engine_exhaust_stats": "Engine Exhaust Stats:", + "create.goggles.fuel_container": "Fluid Storage", + "create.goggles.engine.backpartmissing": "Back Part Missing:", + "create.goggles.engine_redstone_input" : "Speed:", + "create.goggles.engine.efficiency" : "Efficiency:", + "create.tooltip.engine_analog_strength": "%1$s/15", + "create.goggles.get_engine_efficiency": "%1$s", + "create.goggles.engine.stress": "%1$ssu" } \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json b/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json index 904b9041..15d56f80 100644 --- a/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json +++ b/src/main/resources/assets/tfmg/models/block/air_intake/block_large.json @@ -8,8 +8,8 @@ }, "elements": [ { - "from": [-16, -16, 1], - "to": [32, 32, 1], + "from": [-16, -16, 9], + "to": [32, 32, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "east": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#1"}, @@ -20,8 +20,8 @@ } }, { - "from": [31.999, -16, 1], - "to": [31.999, 32, 16], + "from": [29.999, -16, 1], + "to": [29.999, 32, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, @@ -32,8 +32,8 @@ } }, { - "from": [-16, -15.999, 1], - "to": [32, -15.999, 16], + "from": [-16, -13.999, 1], + "to": [32, -13.999, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"}, @@ -44,8 +44,8 @@ } }, { - "from": [-16, 31.99, 1], - "to": [32, 31.99, 16], + "from": [-16, 29.99, 1], + "to": [32, 29.99, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 0, 16], "rotation": 90, "texture": "#0"}, @@ -56,8 +56,8 @@ } }, { - "from": [-15.999, -16, 1], - "to": [-15.999, 32, 16], + "from": [-13.999, -16, 1], + "to": [-13.999, 32, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 0, 16], "texture": "#0"}, diff --git a/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json b/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json index 1a30d1c9..e1beaa3d 100644 --- a/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json +++ b/src/main/resources/assets/tfmg/models/block/air_intake/block_medium.json @@ -21,8 +21,8 @@ } }, { - "from": [-16, 0, 1], - "to": [16, 32, 1], + "from": [-16, 0, 8.5], + "to": [16, 32, 8.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "east": {"uv": [0, 0, 16, 0], "rotation": 270, "texture": "#2"}, @@ -33,8 +33,8 @@ } }, { - "from": [-15.99, 0, 1], - "to": [-15.99, 32, 15], + "from": [-13.99, 0, 2], + "to": [-13.99, 32, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"}, @@ -45,8 +45,8 @@ } }, { - "from": [15.99, 0, 1], - "to": [15.99, 32, 15], + "from": [13.99, 0, 2], + "to": [13.99, 32, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 16, 0], "rotation": 90, "texture": "#0"}, @@ -57,8 +57,8 @@ } }, { - "from": [-16, 31.999, 1], - "to": [16, 31.999, 15], + "from": [-16, 29.999, 2], + "to": [16, 29.999, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, @@ -69,8 +69,8 @@ } }, { - "from": [-16, 0.001, 1], - "to": [16, 0.001, 15], + "from": [-16, 2.001, 2], + "to": [16, 2.001, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 16, 0], "texture": "#0"}, diff --git a/src/main/resources/assets/tfmg/models/block/diesel_engine/block.json b/src/main/resources/assets/tfmg/models/block/diesel_engine/block.json index 8dd3ab9b..a8bd8291 100644 --- a/src/main/resources/assets/tfmg/models/block/diesel_engine/block.json +++ b/src/main/resources/assets/tfmg/models/block/diesel_engine/block.json @@ -2,145 +2,23 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "0": "tfmg:block/diesel_engine_back", + "1": "tfmg:block/diesel_engine_front", + "2": "tfmg:block/diesel_engine_side", + "particle": "tfmg:block/diesel_engine_back" }, "elements": [ { - "name": "middle", - "from": [4, 4, 4], - "to": [12, 12, 12], - "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, + "from": [0, 0, 0], + "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "south": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "west": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "up": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "back", - "from": [2, 0, 2], - "to": [14, 5, 14], - "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, - "faces": { - "north": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "east": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "south": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "west": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#4"} - } - }, - { - "name": "front", - "from": [3, 11, 3], - "to": [13, 16, 13], - "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, - "faces": { - "north": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "east": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "south": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "west": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "up": {"uv": [11, 11, 16, 16], "texture": "#2"}, - "down": {"uv": [6, 11, 11, 16], "texture": "#2"} - } - }, - { - "from": [5.85355, 13.25, 1.75], - "to": [9.85355, 15.25, 13.75], - "rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [16, 0, 12, 2], "texture": "#4"}, - "east": {"uv": [15, 0, 16, 2], "texture": "#4"}, - "south": {"uv": [12, 0, 16, 2], "texture": "#4"}, - "west": {"uv": [12, 0, 13, 2], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 1], "texture": "#4"}, - "down": {"uv": [12, 1, 16, 2], "texture": "#4"} - } - }, - { - "from": [7.85355, 11.25, 1.75], - "to": [9.85355, 13.25, 13.75], - "rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [16, 2, 14, 4], "texture": "#4"}, - "east": {"uv": [15, 2, 16, 4], "texture": "#4"}, - "south": {"uv": [14, 2, 16, 4], "texture": "#4"}, - "west": {"uv": [14, 2, 15, 4], "texture": "#4"}, - "down": {"uv": [14, 3, 16, 4], "texture": "#4"} - } - }, - { - "from": [2.35355, 10.75, 7.75], - "to": [14.35355, 12.75, 9.75], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [14, 2, 15, 4], "texture": "#4"}, - "east": {"uv": [16, 2, 14, 4], "texture": "#4"}, - "south": {"uv": [15, 2, 16, 4], "texture": "#4"}, - "west": {"uv": [14, 2, 16, 4], "texture": "#4"}, - "down": {"uv": [14, 3, 16, 4], "rotation": 270, "texture": "#4"} - } - }, - { - "from": [2.35355, 12.75, 5.75], - "to": [14.35355, 14.75, 9.75], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [12, 0, 13, 2], "texture": "#4"}, - "east": {"uv": [16, 0, 12, 2], "texture": "#4"}, - "south": {"uv": [15, 0, 16, 2], "texture": "#4"}, - "west": {"uv": [12, 0, 16, 2], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 1], "rotation": 90, "texture": "#4"}, - "down": {"uv": [12, 1, 16, 2], "rotation": 270, "texture": "#4"} + "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} } } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "pump", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2] - }, - 3, - 4, - 5, - 6 ] } \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/diesel_engine/item.json b/src/main/resources/assets/tfmg/models/block/diesel_engine/item.json index 8dd3ab9b..a8bd8291 100644 --- a/src/main/resources/assets/tfmg/models/block/diesel_engine/item.json +++ b/src/main/resources/assets/tfmg/models/block/diesel_engine/item.json @@ -2,145 +2,23 @@ "credit": "Made with Blockbench", "parent": "create:block/block", "textures": { - "2": "create:block/pipes", - "4": "create:block/pump", - "particle": "create:block/pump" + "0": "tfmg:block/diesel_engine_back", + "1": "tfmg:block/diesel_engine_front", + "2": "tfmg:block/diesel_engine_side", + "particle": "tfmg:block/diesel_engine_back" }, "elements": [ { - "name": "middle", - "from": [4, 4, 4], - "to": [12, 12, 12], - "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, + "from": [0, 0, 0], + "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "east": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "south": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "west": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "up": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"}, - "down": {"uv": [0, 6.5, 4, 2.5], "rotation": 90, "texture": "#2"} - } - }, - { - "name": "back", - "from": [2, 0, 2], - "to": [14, 5, 14], - "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, - "faces": { - "north": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "east": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "south": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "west": {"uv": [13.5, 2, 16, 8], "rotation": 270, "texture": "#2"}, - "up": {"uv": [0, 0, 12, 12], "rotation": 180, "texture": "#4"}, - "down": {"uv": [0, 0, 12, 12], "texture": "#4"} - } - }, - { - "name": "front", - "from": [3, 11, 3], - "to": [13, 16, 13], - "rotation": {"angle": 0, "axis": "z", "origin": [8.33333, 8.5, 8]}, - "faces": { - "north": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "east": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "south": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "west": {"uv": [10.5, 2.5, 13, 7.5], "rotation": 90, "texture": "#2"}, - "up": {"uv": [11, 11, 16, 16], "texture": "#2"}, - "down": {"uv": [6, 11, 11, 16], "texture": "#2"} - } - }, - { - "from": [5.85355, 13.25, 1.75], - "to": [9.85355, 15.25, 13.75], - "rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [16, 0, 12, 2], "texture": "#4"}, - "east": {"uv": [15, 0, 16, 2], "texture": "#4"}, - "south": {"uv": [12, 0, 16, 2], "texture": "#4"}, - "west": {"uv": [12, 0, 13, 2], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 1], "texture": "#4"}, - "down": {"uv": [12, 1, 16, 2], "texture": "#4"} - } - }, - { - "from": [7.85355, 11.25, 1.75], - "to": [9.85355, 13.25, 13.75], - "rotation": {"angle": 45, "axis": "z", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [16, 2, 14, 4], "texture": "#4"}, - "east": {"uv": [15, 2, 16, 4], "texture": "#4"}, - "south": {"uv": [14, 2, 16, 4], "texture": "#4"}, - "west": {"uv": [14, 2, 15, 4], "texture": "#4"}, - "down": {"uv": [14, 3, 16, 4], "texture": "#4"} - } - }, - { - "from": [2.35355, 10.75, 7.75], - "to": [14.35355, 12.75, 9.75], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [14, 2, 15, 4], "texture": "#4"}, - "east": {"uv": [16, 2, 14, 4], "texture": "#4"}, - "south": {"uv": [15, 2, 16, 4], "texture": "#4"}, - "west": {"uv": [14, 2, 16, 4], "texture": "#4"}, - "down": {"uv": [14, 3, 16, 4], "rotation": 270, "texture": "#4"} - } - }, - { - "from": [2.35355, 12.75, 5.75], - "to": [14.35355, 14.75, 9.75], - "rotation": {"angle": -45, "axis": "x", "origin": [8.35355, 13.25, 7.75]}, - "faces": { - "north": {"uv": [12, 0, 13, 2], "texture": "#4"}, - "east": {"uv": [16, 0, 12, 2], "texture": "#4"}, - "south": {"uv": [15, 0, 16, 2], "texture": "#4"}, - "west": {"uv": [12, 0, 16, 2], "texture": "#4"}, - "up": {"uv": [12, 0, 16, 1], "rotation": 90, "texture": "#4"}, - "down": {"uv": [12, 1, 16, 2], "rotation": 270, "texture": "#4"} + "north": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#2"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} } } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 135, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - { - "name": "pump", - "origin": [8, 8, 8], - "color": 0, - "children": [0, 1, 2] - }, - 3, - 4, - 5, - 6 ] } \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion.json b/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion.json new file mode 100644 index 00000000..338dad99 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "tfmg:block/diesel_engine_back", + "1": "tfmg:block/diesel_engine_expansion", + "particle": "tfmg:block/diesel_engine_back" + }, + "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": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/block.json b/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/block.json new file mode 100644 index 00000000..cf844d14 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/block.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/diesel_engine_back", + "1": "tfmg:block/diesel_engine_expansion", + "particle": "tfmg:block/diesel_engine_back" + }, + "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": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/item.json b/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/item.json new file mode 100644 index 00000000..cf844d14 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/block/diesel_engine_expansion/item.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "tfmg:block/diesel_engine_back", + "1": "tfmg:block/diesel_engine_expansion", + "particle": "tfmg:block/diesel_engine_back" + }, + "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": "#1"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/models/block/gasoline_engine/block.json b/src/main/resources/assets/tfmg/models/block/gasoline_engine/block.json index d886d7ef..a5bdbebe 100644 --- a/src/main/resources/assets/tfmg/models/block/gasoline_engine/block.json +++ b/src/main/resources/assets/tfmg/models/block/gasoline_engine/block.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "1": "tfmg:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "2": "tfmg:block/engines/gasoline", + "particle": "tfmg:block/engines/gasoline" }, "elements": [ { @@ -11,12 +11,12 @@ "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": "#2"}, + "east": {"uv": [3.5, 12.25, 0, 15.25], "texture": "#2"}, + "south": {"uv": [5.5, 0, 8, 3], "texture": "#2"}, + "west": {"uv": [0, 12.25, 3.5, 15.25], "texture": "#2"}, + "up": {"uv": [1, 7, 3.5, 10.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [5.5, 3.5, 8, 7], "rotation": 180, "texture": "#2"} } }, { @@ -24,12 +24,11 @@ "to": [8.08658, 16.3806, 15], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [13.75, 0, 12.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -37,12 +36,11 @@ "to": [11.91342, 16.3806, 9], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [15.5, 1.375, 16, 1.875], "texture": "#1"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -50,12 +48,11 @@ "to": [11.91342, 16.3806, 15], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [9.5, 4.75, 10, 5.25], "texture": "#1"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -63,12 +60,11 @@ "to": [8.08658, 16.3806, 9], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -76,12 +72,11 @@ "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"} + "north": {"uv": [3.5, 1.25, 4.25, 3], "texture": "#2"}, + "south": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#2"}, + "west": {"uv": [0, 13.75, 3.5, 15.5], "texture": "#2"}, + "up": {"uv": [0, 3.5, 0.75, 7], "texture": "#2"}, + "down": {"uv": [8.625, 7, 8, 3.5], "texture": "#2"} } }, { @@ -89,12 +84,11 @@ "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": "#2"}, + "east": {"uv": [3.5, 13.75, 0, 15.5], "texture": "#2"}, + "south": {"uv": [8, 1.25, 8.75, 3], "texture": "#2"}, + "up": {"uv": [3.75, 3.5, 4.5, 7], "texture": "#2"}, + "down": {"uv": [5.5, 3.5, 4.75, 7], "texture": "#2"} } }, { @@ -102,12 +96,11 @@ "to": [3, 10, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "east": {"uv": [11.625, 0, 13.625, 3], "texture": "#1"}, - "south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "west": {"uv": [14.5, 0.125, 14.75, 0.5], "texture": "#1"}, - "up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"}, - "down": {"uv": [14.25, 0, 15.25, 2], "texture": "#1"} + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "west": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"}, + "down": {"uv": [14.25, 0, 15.25, 2], "texture": "#2"} } }, { @@ -115,25 +108,11 @@ "to": [14, 10, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "east": {"uv": [14.375, 0, 14.625, 0.375], "texture": "#1"}, - "south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "west": {"uv": [10.875, 0, 12.875, 3], "texture": "#1"}, - "up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"}, - "down": {"uv": [15, 0.125, 16, 2.125], "texture": "#1"} - } - }, - { - "from": [6, 12, 2], - "to": [10, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, - "faces": { - "north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"}, - "east": {"uv": [12.25, 7.25, 14, 7.125], "texture": "#1"}, - "south": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"}, - "west": {"uv": [12.25, 7.125, 14, 7.25], "texture": "#1"}, - "up": {"uv": [15.125, 2.125, 14.625, 3.75], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 15], "texture": "#1"} + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "east": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"}, + "down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/tfmg/models/block/gasoline_engine/item.json b/src/main/resources/assets/tfmg/models/block/gasoline_engine/item.json index 4d412d91..a5bdbebe 100644 --- a/src/main/resources/assets/tfmg/models/block/gasoline_engine/item.json +++ b/src/main/resources/assets/tfmg/models/block/gasoline_engine/item.json @@ -2,10 +2,8 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "1": "tfmg:block/gasoline_engine", - "4": "create:block/axis", - "5": "create:block/axis_top", - "particle": "block/anvil" + "2": "tfmg:block/engines/gasoline", + "particle": "tfmg:block/engines/gasoline" }, "elements": [ { @@ -13,12 +11,12 @@ "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": "#2"}, + "east": {"uv": [3.5, 12.25, 0, 15.25], "texture": "#2"}, + "south": {"uv": [5.5, 0, 8, 3], "texture": "#2"}, + "west": {"uv": [0, 12.25, 3.5, 15.25], "texture": "#2"}, + "up": {"uv": [1, 7, 3.5, 10.5], "rotation": 180, "texture": "#2"}, + "down": {"uv": [5.5, 3.5, 8, 7], "rotation": 180, "texture": "#2"} } }, { @@ -26,12 +24,11 @@ "to": [8.08658, 16.3806, 15], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [13.75, 0, 12.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -39,12 +36,11 @@ "to": [11.91342, 16.3806, 9], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [15.5, 1.375, 16, 1.875], "texture": "#1"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -52,12 +48,11 @@ "to": [11.91342, 16.3806, 15], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [9.5, 4.75, 10, 5.25], "texture": "#1"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -65,12 +60,11 @@ "to": [8.08658, 16.3806, 9], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 5, 8]}, "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": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#2"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#2"} } }, { @@ -78,12 +72,11 @@ "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"} + "north": {"uv": [3.5, 1.25, 4.25, 3], "texture": "#2"}, + "south": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#2"}, + "west": {"uv": [0, 13.75, 3.5, 15.5], "texture": "#2"}, + "up": {"uv": [0, 3.5, 0.75, 7], "texture": "#2"}, + "down": {"uv": [8.625, 7, 8, 3.5], "texture": "#2"} } }, { @@ -91,12 +84,11 @@ "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": "#2"}, + "east": {"uv": [3.5, 13.75, 0, 15.5], "texture": "#2"}, + "south": {"uv": [8, 1.25, 8.75, 3], "texture": "#2"}, + "up": {"uv": [3.75, 3.5, 4.5, 7], "texture": "#2"}, + "down": {"uv": [5.5, 3.5, 4.75, 7], "texture": "#2"} } }, { @@ -104,12 +96,11 @@ "to": [3, 10, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "east": {"uv": [11.625, 0, 13.625, 3], "texture": "#1"}, - "south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "west": {"uv": [14.5, 0.125, 14.75, 0.5], "texture": "#1"}, - "up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"}, - "down": {"uv": [14.25, 0, 15.25, 2], "texture": "#1"} + "north": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "west": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"}, + "down": {"uv": [14.25, 0, 15.25, 2], "texture": "#2"} } }, { @@ -117,39 +108,11 @@ "to": [14, 10, 4], "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, "faces": { - "north": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "east": {"uv": [14.375, 0, 14.625, 0.375], "texture": "#1"}, - "south": {"uv": [14.375, 0, 14.5, 0.375], "texture": "#1"}, - "west": {"uv": [10.875, 0, 12.875, 3], "texture": "#1"}, - "up": {"uv": [14.375, 0, 14.5, 0.25], "texture": "#1"}, - "down": {"uv": [15, 0.125, 16, 2.125], "texture": "#1"} - } - }, - { - "from": [6, 12, 2], - "to": [10, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 5, 8]}, - "faces": { - "north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"}, - "east": {"uv": [12.25, 7.25, 14, 7.125], "texture": "#1"}, - "south": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#1"}, - "west": {"uv": [12.25, 7.125, 14, 7.25], "texture": "#1"}, - "up": {"uv": [15.125, 2.125, 14.625, 3.75], "texture": "#1"}, - "down": {"uv": [0, 0, 4, 15], "texture": "#1"} - } - }, - { - "name": "Axis", - "from": [6, 6, 0], - "to": [10, 10, 10], - "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 8, 8]}, - "faces": { - "north": {"uv": [6, 6, 10, 10], "texture": "#5"}, - "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": [14, 1, 14.25, 1.75], "texture": "#2"}, + "east": {"uv": [14, 1, 14.5, 1.75], "texture": "#2"}, + "south": {"uv": [14, 1, 14.25, 1.75], "texture": "#2"}, + "up": {"uv": [14, 1.25, 14.5, 1.5], "texture": "#2"}, + "down": {"uv": [14.25, 0.125, 15.25, 2.125], "texture": "#2"} } } ] diff --git a/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/block.json b/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/block.json index 9cbc994b..2270fa5a 100644 --- a/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/block.json +++ b/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/block.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "tfmg:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "1": "tfmg:block/engines/gasoline", + "particle": "tfmg:block/engines/gasoline" }, "elements": [ { @@ -11,25 +11,11 @@ "to": [13, 12, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [7.375, 0.375, 8.625, 1.875], "texture": "#0"}, - "east": {"uv": [6.125, 2.125, 7.875, 3.625], "texture": "#0"}, - "south": {"uv": [5.4875, 5.375, 6.75, 7.2625], "texture": "#0"}, - "west": {"uv": [7.875, 2.125, 9.625, 3.625], "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.5, 5.625, 6.75, 7.375], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [6, 12, 0], - "to": [10, 13, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, - "faces": { - "north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#0"}, - "east": {"uv": [13.375, 6.875, 15.125, 7], "texture": "#0"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#0"}, - "west": {"uv": [12.375, 7.275, 14.125, 7.15], "texture": "#0"}, - "up": {"uv": [14.5, 2.25, 14, 4], "texture": "#0"}, - "down": {"uv": [1, 0, 5, 14], "rotation": 180, "texture": "#0"} + "north": {"uv": [5.5, 0, 8, 3], "texture": "#1"}, + "east": {"uv": [7, 12.25, 3.5, 15.25], "texture": "#1"}, + "west": {"uv": [3.5, 12.25, 7, 15.25], "texture": "#1"}, + "up": {"uv": [1, 10.5, 3.5, 7], "rotation": 180, "texture": "#1"}, + "down": {"uv": [5.5, 7, 8, 10.5], "rotation": 180, "texture": "#1"} } }, { @@ -37,12 +23,12 @@ "to": [16, 13, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [11.5, 2.125, 13.5, 3.75], "texture": "#0"}, - "east": {"uv": [16, 6, 15.75, 7.625], "texture": "#0"}, - "south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "west": {"uv": [15.75, 3.75, 16, 5.375], "texture": "#0"}, - "up": {"uv": [11.5, 2.625, 13.5, 2.875], "texture": "#0"}, - "down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"} + "north": {"uv": [11.25, 7, 15.25, 10.25], "texture": "#1"}, + "east": {"uv": [10.5, 3.75, 11, 7], "texture": "#1"}, + "south": {"uv": [11.25, 3.75, 15.25, 6.75], "texture": "#1"}, + "west": {"uv": [15.5, 3.75, 16, 7], "texture": "#1"}, + "up": {"uv": [11.25, 9.5, 15.25, 9], "texture": "#1"}, + "down": {"uv": [4.75, 10.5, 8.75, 11], "rotation": 180, "texture": "#1"} } }, { @@ -50,12 +36,12 @@ "to": [10, 16, 11], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -63,12 +49,12 @@ "to": [10, 16, 11], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -76,12 +62,12 @@ "to": [10, 16, 5], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -89,12 +75,12 @@ "to": [10, 16, 5], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -102,12 +88,11 @@ "to": [3, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [8.625, 1, 9, 1.875], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 7], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 7], "texture": "#0"}, - "west": {"uv": [13.75, 4.5, 15.5, 5.375], "texture": "#0"}, - "up": {"uv": [8.625, 3.75, 9, 5.5], "texture": "#0"}, - "down": {"uv": [6.75, 5.625, 7.125, 7.375], "rotation": 180, "texture": "#0"} + "north": {"uv": [8, 1.25, 8.75, 3], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [3.5, 13.75, 7, 15.5], "texture": "#1"}, + "up": {"uv": [0, 7, 0.75, 10.5], "texture": "#1"}, + "down": {"uv": [8, 7, 8.75, 10.5], "rotation": 180, "texture": "#1"} } }, { @@ -115,12 +100,11 @@ "to": [16, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [7, 1, 7.375, 1.875], "texture": "#0"}, - "east": {"uv": [13.625, 7.625, 15.375, 6.75], "rotation": 180, "texture": "#0"}, - "south": {"uv": [0, 0, 3, 7], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 7], "texture": "#0"}, - "up": {"uv": [9, 3.75, 8.625, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.5, 7.375, 5.125, 5.625], "texture": "#0"} + "north": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#1"}, + "east": {"uv": [3.5, 15.5, 7, 13.75], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "up": {"uv": [4.5, 10.5, 3.75, 7], "rotation": 180, "texture": "#1"}, + "down": {"uv": [5.5, 7, 4.75, 10.5], "texture": "#1"} } } ] diff --git a/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/item.json b/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/item.json index 9cbc994b..2270fa5a 100644 --- a/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/item.json +++ b/src/main/resources/assets/tfmg/models/block/gasoline_engine_back/item.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/block", "textures": { - "0": "tfmg:block/gasoline_engine", - "particle": "minecraft:block/anvil" + "1": "tfmg:block/engines/gasoline", + "particle": "tfmg:block/engines/gasoline" }, "elements": [ { @@ -11,25 +11,11 @@ "to": [13, 12, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [7.375, 0.375, 8.625, 1.875], "texture": "#0"}, - "east": {"uv": [6.125, 2.125, 7.875, 3.625], "texture": "#0"}, - "south": {"uv": [5.4875, 5.375, 6.75, 7.2625], "texture": "#0"}, - "west": {"uv": [7.875, 2.125, 9.625, 3.625], "texture": "#0"}, - "up": {"uv": [9.875, 2.125, 11.125, 3.875], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.5, 5.625, 6.75, 7.375], "rotation": 180, "texture": "#0"} - } - }, - { - "from": [6, 12, 0], - "to": [10, 13, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, - "faces": { - "north": {"uv": [12.25, 0.5, 12.75, 0.625], "texture": "#0"}, - "east": {"uv": [13.375, 6.875, 15.125, 7], "texture": "#0"}, - "south": {"uv": [0, 0, 4, 1], "texture": "#0"}, - "west": {"uv": [12.375, 7.275, 14.125, 7.15], "texture": "#0"}, - "up": {"uv": [14.5, 2.25, 14, 4], "texture": "#0"}, - "down": {"uv": [1, 0, 5, 14], "rotation": 180, "texture": "#0"} + "north": {"uv": [5.5, 0, 8, 3], "texture": "#1"}, + "east": {"uv": [7, 12.25, 3.5, 15.25], "texture": "#1"}, + "west": {"uv": [3.5, 12.25, 7, 15.25], "texture": "#1"}, + "up": {"uv": [1, 10.5, 3.5, 7], "rotation": 180, "texture": "#1"}, + "down": {"uv": [5.5, 7, 8, 10.5], "rotation": 180, "texture": "#1"} } }, { @@ -37,12 +23,12 @@ "to": [16, 13, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [11.5, 2.125, 13.5, 3.75], "texture": "#0"}, - "east": {"uv": [16, 6, 15.75, 7.625], "texture": "#0"}, - "south": {"uv": [9.125, 0.25, 11.125, 1.875], "texture": "#0"}, - "west": {"uv": [15.75, 3.75, 16, 5.375], "texture": "#0"}, - "up": {"uv": [11.5, 2.625, 13.5, 2.875], "texture": "#0"}, - "down": {"uv": [5.125, 7.25, 7.125, 7.5], "rotation": 180, "texture": "#0"} + "north": {"uv": [11.25, 7, 15.25, 10.25], "texture": "#1"}, + "east": {"uv": [10.5, 3.75, 11, 7], "texture": "#1"}, + "south": {"uv": [11.25, 3.75, 15.25, 6.75], "texture": "#1"}, + "west": {"uv": [15.5, 3.75, 16, 7], "texture": "#1"}, + "up": {"uv": [11.25, 9.5, 15.25, 9], "texture": "#1"}, + "down": {"uv": [4.75, 10.5, 8.75, 11], "rotation": 180, "texture": "#1"} } }, { @@ -50,12 +36,12 @@ "to": [10, 16, 11], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -63,12 +49,12 @@ "to": [10, 16, 11], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -76,12 +62,12 @@ "to": [10, 16, 5], "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [12, 0, 16, 4], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -89,12 +75,12 @@ "to": [10, 16, 5], "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 0]}, "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], "texture": "#0"}, - "down": {"uv": [15.5, 1.375, 16, 1.875], "texture": "#0"} + "north": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "east": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "south": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "west": {"uv": [12.75, 0, 13.75, 2.25], "texture": "#1"}, + "up": {"uv": [12.75, 2.25, 13.75, 3.25], "texture": "#1"}, + "down": {"uv": [0, 0, 0, 0], "texture": "#1"} } }, { @@ -102,12 +88,11 @@ "to": [3, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [8.625, 1, 9, 1.875], "texture": "#0"}, - "east": {"uv": [0, 0, 16, 7], "texture": "#0"}, - "south": {"uv": [0, 0, 3, 7], "texture": "#0"}, - "west": {"uv": [13.75, 4.5, 15.5, 5.375], "texture": "#0"}, - "up": {"uv": [8.625, 3.75, 9, 5.5], "texture": "#0"}, - "down": {"uv": [6.75, 5.625, 7.125, 7.375], "rotation": 180, "texture": "#0"} + "north": {"uv": [8, 1.25, 8.75, 3], "texture": "#1"}, + "east": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [3.5, 13.75, 7, 15.5], "texture": "#1"}, + "up": {"uv": [0, 7, 0.75, 10.5], "texture": "#1"}, + "down": {"uv": [8, 7, 8.75, 10.5], "rotation": 180, "texture": "#1"} } }, { @@ -115,12 +100,11 @@ "to": [16, 7, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, "faces": { - "north": {"uv": [7, 1, 7.375, 1.875], "texture": "#0"}, - "east": {"uv": [13.625, 7.625, 15.375, 6.75], "rotation": 180, "texture": "#0"}, - "south": {"uv": [0, 0, 3, 7], "texture": "#0"}, - "west": {"uv": [0, 0, 16, 7], "texture": "#0"}, - "up": {"uv": [9, 3.75, 8.625, 5.5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [5.5, 7.375, 5.125, 5.625], "texture": "#0"} + "north": {"uv": [4.75, 1.25, 5.5, 3], "texture": "#1"}, + "east": {"uv": [3.5, 15.5, 7, 13.75], "rotation": 180, "texture": "#1"}, + "west": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "up": {"uv": [4.5, 10.5, 3.75, 7], "rotation": 180, "texture": "#1"}, + "down": {"uv": [5.5, 7, 4.75, 10.5], "texture": "#1"} } } ] diff --git a/src/main/resources/assets/tfmg/models/block/steel_mechanical_pump/block.json b/src/main/resources/assets/tfmg/models/block/steel_mechanical_pump/block.json index 8dd3ab9b..c9f1a643 100644 --- a/src/main/resources/assets/tfmg/models/block/steel_mechanical_pump/block.json +++ b/src/main/resources/assets/tfmg/models/block/steel_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": "tfmg:block/steel_pipes", + "4": "tfmg:block/steel_pump", + "particle": "tfmg:block/steel_pump" }, "elements": [ { diff --git a/src/main/resources/assets/tfmg/models/block/steel_mechanical_pump/item.json b/src/main/resources/assets/tfmg/models/block/steel_mechanical_pump/item.json index 161c4910..c72f6015 100644 --- a/src/main/resources/assets/tfmg/models/block/steel_mechanical_pump/item.json +++ b/src/main/resources/assets/tfmg/models/block/steel_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": "tfmg:block/steel_pipes", + "4": "tfmg:block/steel_pump", "5": "create:block/millstone", - "particle": "create:block/pump" + "particle": "tfmg:block/steel_pump" }, "elements": [ { diff --git a/src/main/resources/assets/tfmg/models/item/unfinished_engine.json b/src/main/resources/assets/tfmg/models/item/unfinished_engine.json new file mode 100644 index 00000000..8f593216 --- /dev/null +++ b/src/main/resources/assets/tfmg/models/item/unfinished_engine.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/block", + "textures": { + "1": "createindustry:block/gasoline_engine", + "particle": "minecraft:block/anvil" + }, + "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"} + } + }, + { + "from": [13, 0, 2], + "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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_medium.png b/src/main/resources/assets/tfmg/textures/block/air_intake/air_intake_medium.png index 4d30dd4130d44ec100e05a221d0849602a9ea808..9ef0715c211d9655d4d2ca228b7a422813e5221e 100644 GIT binary patch delta 2353 zcmV-13C{NJ1I-eU83+ad0063Kao&+3Ab$yPNLh0L01m$Z01m$aI0aKA000Q$Nkl6nwqU?jmAZjWhGfDZqsR^c8PYYvNmcF(6Y#?lybcS0$$!OoIT&?p6A?$bAQj< zJs06#w~u*pp7(oxzvuUR-VS;wHk2eDG6Av^@X z9f(x{Y?wXtnY?^b6ose7Gg*mQ0i)d^HFkU8L;)CL#h1U3hn9}_Su$(|vK#mc7V&zz zknq?l;LSbX<^h7I+?}fCD)gzpgMV)J_fS*Q8Ja)8g8EZ>C_gt>tN-Sn@2GVX8#@Ik z{ed3p4|LPsUpz^58P|E{iN7D@&&=sr{E7TyIpG0E-EinaGU2Tt<~iVY!*VU#_LC=- zZ+>H`nj$Kweoc)TQ`#P)BZt4QridPx`#c^Aycz)LUJ(wWis)RZ$&e}C`wIyIH} z*t)>^o=>|DxOGS>?SCs=I#09Ey<@8rmCl_+tqAi=Cte`I{c!b%34dU4WC6iuKYtg<4zJhCM!t!MWWkXFJT%IK6ONVS@Q^GxHBqH%*)lra z(o7Y;5;}PDB-`q4VAuvIVu9)WCS4c1Z<_UW3*Y8qjBt$p5Z-3CAPo1J?*RJOE zuKNT0u#}y9589aiPSx6{locx;Q&aZz-n>bDJ-u|-%o%Dc4svdfXpY>(oWgwiBy8tKxFsm{AEh7csWg(3G(hyokR)Cq{dZB^nr{_j5{o~Y0 zV+F90=aQKTA1hFToqqxj9XhJ!MDR|(Lyg79z|A2w7NMxP$XWrWBhUUR*z2&C9)-m{ zEG`UzS;h6vYle!0>oB5zPgVe4YG&4W(-tGGw}6WuU8H$)=0(K?X6-QYZI|0L1sJUY zhQebM5d!{e;drMSXHQWE;enBBi21|{2!HnMdH(Vu2t*p?0)M$2$ZZ88jev5YVDWUk z6LjhhsAqIx>a_iW1*K7=CbR6}$mtZw!s^Rp&?ov9h;~s55VN=u5W-9l08@Tf_(#vL|^&|7Nn_9jn3YF`sOu%1?|tfH@1E~UR6KSo2L5t=qFla!Gm@}#G;mML`cLL<%l!WU^Q7$grn7mSUK z(b`8IrR==0YrwtK)xZ=?RI;xMgkW+x@?=GcGJU=P<$sv{Wuj)QuU0Nqf&&9II5R{PiR9;TCfB0iW0m|r@ z(%AGN&42#vEb`9CVrimpY$2~_rT{C9%o&K01^USiBW>0WT=~z{=$#-FK57R81+ZC+`Ef2bdXYQ^d>cDM zBTxs+qJB@H-w{FqdcOpA0vMq;^@&peL-u1U1;EsihdOc_8QBVO93CEu&AbJpBg5pq z^M5Xir@beh^LRYqEDp}R_wINNPBI>G7_mc~!v&bM?#;{R@z2j6e-JT3-yR%3bZE*I zz; zjveGy37QKSnW!0J$(eP3A%BY78??vFYk${|XpdPqUKfA`tXj2-E?>S(b#--g;J|^{ z`kPD_kjv25M7RJ({@l59N_~C3QeIvjbAMCj0f_;7c zYAkl56yS6sbi=Le+bvNFxRt({D1I-)mqDw`L_6G$DwKiaXgtfHm;(ZVE*7rQ_J8f$ zsiC1ErvCUD7ec)9;uhWz%ae%fu__Z_soV7YcWv97Etgo=TU%SzlsPf4_a;oL3)lhS zOG`^>&6+i~A)f8840i$Co`{2u9k15>(o*yC21$?DIRbGW7cKySYHDhzqoaeDTM-Nf zsk5__@BG%UUr$|KUG8>)41OG5RDWKf3Fg#<&9G`OmqAf_1>mV?*REY^EJ9yjAGNi$ zQCV3T?cTkc&Yur|EoyG&f0h%4)x3~46?XwfSd5;jMZsNaYis#osH7zPr#VJE{`iV< zeUy}xXus$9K0r|Y>@%j?1oF8+PkVdBym6m^@AGa}0qps=Zrw^nMMbo8=YLKS|dU_zp{@|P*6adHf_=rpxtx|!R%Z>jhcc}p%WK^3qS#}B7`q2ETq}9XY)KP zf5^k!UVw|Z#@z?F!Ocb}p8EhymN0pr&qp~q zIka)(MyvV5o@BcZfC6y#Z+~fNQ38QLT-RY>%3R?8_W=n)(kfuc<;M^`Q3^<=`+&G7 zKt_}T{-^H)Vi_S>m{_mH0qVKA4-m^>adC0frp6UefV{j}?e^p{{gS3eV`}gAS{zF7 z`~7h*fndU2U^2`cqrQ3bW;GQbruP9(zOM^9{T;5_PsEp@c;WW}ZXUm{PXtq|0HXf_ Xl|KzTyl6>O00000NkvXXu0mjfvX+iW delta 431 zcmV;g0Z{(U67B<#83+Ra005o0f$WhXAT=0JOjJcMFfdwLT2xe200030001~RIDmkF z0002InE8$X000PdQchF<|NsC0|Nj8qgS}aiJ{NxhOG!jQR9Hvtmf3QHFbqY3w(K=atCP+Y#CIoP`XJa9Wq$)*kPR1|(TbYzlY)Z-_MV?*h`h6U3v0 zz_KXH{dxkccVTS;Y4$r%htT4fKn{=vT7f|D8BEaQ7~OG!(*=4)UGIKc09=4i!36qY zr!_FtxFkRicflGMXbp>!z&hDrk=867ygXxpLqSm917};17#p}C8-m}4?~z@m>En=! zptXlAcs=y$;m-@^nG5F@+ydpF2>9**{BuU6c!?nMM>jEZ3vPk(ZNY#D4k-vuVBZd{ ZeF6^+J_Vx*^1A>4002ovPDHLkV1j&_wuJxy diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inside_large.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_large.png index 610a230e8321a5e6c0bbec48f3e6365a34f01340..f9058242974adb7446842051417600bc0b800636 100644 GIT binary patch delta 471 zcmV;|0Vw|10igttK_?ziOjJcYKSEGbSXo|QaCCS!I6IA#lp`Z29UC2hgN8FRHB;Z+ zlaWvte*uh1L_t(I%bk?Lii0o^hTXCcuqr~1t+n7DV_L`q^wMLy4CD#gH|Uw>;=$9Ek6~ssFM{psq`wMjc0@YG+?rsFM-6_bI ze_oJ`O7GOuPa799fLPp7uVM`Zs|5NH7$eaSp{Ia+B7lA%Km#50vF*WI*$^=3xiglY zQ5o|^(?ForU+!@52pkxJV8AJn$*3@JZX7r=s#PpWBU+{f_NtW&L(O2}Gw3+u`NQdc z%MeR77%XQL!ag4WB^y;occ!t)ig3EnB{{R@cMI#T$=;7ar^k3a{QysKJ|=4`>ZU4zYmRI)<<{G+ zST85Cp*!Yxt4D$04jq%#JQ6I@t~O^`x3O-|UD1ACV#|~cX5nm?e=D-=P5|v;@O1Ta JS?83{1OR-^IFSGV diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inside_medium.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_medium.png index d65a191c596a860e7172ede103422d698e7c8e56..4d2a57bb32418c815464c50651c5b4b5a3b27172 100644 GIT binary patch delta 349 zcmV-j0iyn;0hI%gL4O`lOjJcYKSEGbSXo|QaCCS!I6IA#lp`Z29UC2hgN8FRHB;Z+ zlK=n!32;bRa{vGizW@LZzX3P}QzQTY0RTxvK~yNuZIQ8V!ypibN!17N9a6+tjH6~H zFz^6gGBy$tYo_iU>e)p|Ja+G>6IrM?{74@^$Il@S05Gup>3<;5xyv{9{=Wz7jao_M>3+1ojTg0PtbZV0*{KcRd<#RMI)iD+3ims4C<&Q#DXxjHeiH zDVEAPG~aSSJ+!nOtWX`lKkwv7Eoq4*zAwvHqN5+af!F{o@%BF`+YxH=;{~c`(+$A> zTJ+*Yvg6FbQdTPKn~_^Bz_72(gK-D=A vu>B%!ljupH*?yafetQzH^E_W!n$Fi>KfZkZp&X2{00000NkvXXu0mjf*Tk5I delta 107 zcmbQryp(Z*V+vb0sJ2{0^W&CpU%@L*tZorYRPeCzo);1djS(08$;9!>DkY>`h)Z^c)I$ztaD0e F0stoJ9l8Jj diff --git a/src/main/resources/assets/tfmg/textures/block/air_intake/inside_small.png b/src/main/resources/assets/tfmg/textures/block/air_intake/inside_small.png index 994fddd196012826560c3c2fb967d197a2e9403b..043d5f4f265b9a445198854b0692005694c33bbb 100644 GIT binary patch delta 184 zcmV;p07w6s0fhpPK_?ziOjJcYKSEGbSXo|QaCCS!I6IA#lpPx#fP;o3BPTO6HFLKr ze34KXe{e}eK~xyi9gVvUfG`Y1jl=-h2vX;R=o3bup#+HmXi(ZPMCQhqtDf#zXX?0R zAW11j?*fhDoMl#6=J|Pw!iuVFG+J}t1!_HWo|?MqyIdRK%>XfHt>#l;9E+;97@;r- mV2dh{_~`X*pnga8;|Eng7te1zQ)U1F002ov22Mn-LSTX$cuWxh delta 95 zcmZo=n#nl9F@i0?C&bmjz#s|;u0@D5FfecyctjR6F!1dMVMYtqU=^UCjHioZh{WaO t24*)$M@B~lwcdja;tMax7$hVxFs#pD{cl*F@&Krg!PC{xWt~$(69AbG8QA~; diff --git a/src/main/resources/assets/tfmg/textures/block/diesel_engine_back.png b/src/main/resources/assets/tfmg/textures/block/diesel_engine_back.png new file mode 100644 index 0000000000000000000000000000000000000000..7e36da979ba7327d4b6201b609cb04a0f1b611e4 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WChCUdAc};Solw!yfKT(QK0Sm1T~4HPM;(kCzNC6<)Ljid&$%#n*`Qz zsPHRP_9O_}9KH0T_xt?f=~E~0_x;WPp7(72&AU`bHb%_5}ZhLu(;{xOA;t!j%QohVGz2mU> z>Xwh;3<^d!S4?Gpn_Inzaf;~f!w>gno?R)vNMymT7qiQ|f*7u7S!JkxxA8MJ_G4j=}BOTm*tl&7no%Q~lo FCIF$^uOI*b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/diesel_engine_expansion.png b/src/main/resources/assets/tfmg/textures/block/diesel_engine_expansion.png new file mode 100644 index 0000000000000000000000000000000000000000..a688c04336b1634d8e11fd588888c605e7a9dca6 GIT binary patch literal 397 zcmV;80doF{P)Px#1ZP1_K>z@;j|==^1poj69Z5t%R5(wilFv#4Q543{%q~oE8$O2F6U;WyXcdG( zn|c^m1qzZHL9581?Yxe-on{o5}}u^>K63t0B8XE@oZ)L7GSWc)c};}nSpJ# zz#YK00m6r`@wcbUIt!ZXd+mq822<^W<4xD-4YM0vXUxvXfb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/diesel_engine_side.png b/src/main/resources/assets/tfmg/textures/block/diesel_engine_side.png new file mode 100644 index 0000000000000000000000000000000000000000..6b418c48d8cc971ecbb3cf111a3547450a7b19ea GIT binary patch literal 515 zcmV+e0{s1nP)Px#1ZP1_K>z@;j|==^1poj6lSxEDR5(wakUvO5Q543{3l|}MLK1|DX>%=VAQgex z&=iGhxV1-9V_RDkH5ru!O;N3ZwbanRsXu5zikW0(sZYfvc=4UQ^0E}^2bXi+ch0%@ zyif8^&8k*|O#k8bF-bH%Gp}ApBI;ZAgU{k}P^|}Qq7O58yahKs#FLaxzwiM!(I`hP zLKA(M0TMRovbRw_UuL0MWLZzgS25Dz!{)G2x82Hxqr(&aPQ(%%fyfcP!vm~g1HJ%8 zB=_?yg27$~^?O|0JT^MQ+S1BuRhwJbWDO`;g`|NYuNnwURwSZ>)B8&HH=Z6#B_rD2 z2oakILZK~6rJgB$cgE-QJ^teeJ(+l-y`5d2(YG4DJpewRj|?Uw=i~kfD&!Q-1*l=r zYU?DEY^>J#0;N=SRFO=h+!Z( zoo*HXQcJxJw3Lell7egND$KK3I@m<4*T@6BE_xAl`2Sp9;RZy|$OCOJV$}mJjXbEO zt_RIfE*9tu#5D#Uhwe$_0000EWmrjOO-%qQ00008000000002eQPx#1ZP1_K>z@;j|==^1poj5Gf+%aMNm^%W@&GBczuF}idkG>?d|Q^+1W`;P$45E zC@L&GKSD7yHo(BZv9Ym9LNzcfCjbBdLYLk&0000HbW%=J|NsC0|NsC0|NsC0|NsC0 z041%NVgLXD32;bRa{vGi!vFvd!vV){sAK>D0~$$0K~z{r?U&(pDj^Jn2}MzC)%Sne z&P>8CRl2UH_viiUaRUppA%tvAcaSW9fNW}!RDz{v;BY(~!o)~@)pR+^WOUhmi2_2vRr&lEUU(*RJ~rCiSCG8K>qw;MiP zAe#$V)&Nk_#V+`yslf5z9$e8#_k<8;UqVJ0q1X~)=mLmhYCdg6L6iq*K%iPSV-O7n z$mD-Rx6E><%3G0Q+0%<8&?YD-``642uTJ!lCLhx=AiqX+0=5YLDsjCF52 zpCHT-V8WO&c~*hGjT3<*2$KTJms(S*RVHH45K-A~#L$H!^Pr<$@JwbdBk0&eVnSvN zT{wJwJ!ImWU>E-;@Ph=#)2JrHsq-jf`x!WPiX(+^VcP`|Rm61^sFkN&!h|;Z5J5vO zDTZ(XNo4X083Cl*1>{>>4?1pYDE2woN9G@wz$SZrl>Ar)lo(5f;HYZovw&tZGyEC? z@Qn$&9CV&_q+e3xJ|sb(JdokN5^NMmI9~mj@vK9jX2fO{@TSjwhyj9#S;btyU={|^ zXXJk(z-kf#vn6Z_m|+o%z&wZ)c#Hubpr}zm^(=xo+eQlbE_kKjE(`*!XM?~mF`z)t zgC7Do4Wj@uRnLA*WtLu*h%hKnO;PIt-t<)WuTkKMw*)}1Gmc8l8%qF;OXX_-^`D?C z1St3_hyeL9!aIw=>um(QvEX;!NF)G1V>UnoU2mi^cp>oOFab>*KvxLtInHw;hIJ0KcP=A9vf0$oh;UvfA; zt{EUB*hiqt_Hz<95)|gvw~eFygQEhl%MFMw+s_GxoX|`}s9)60W`JOf5{FDH0_#d9 zVAdes3xQk$vwzkbfu&7IO)!kinxHf1i+ZAU^SVHKPc@i_kIDLHa~w7B7v9%)^IEV?Q>w^I;qA!2N%St<@XB}30SLj z2;gHG0c=L&lSu)YfM2Y22r$oq=Lp~wSZ5Y!Mq$1Ay-W&$)+JEk=KNj*Z^)`m$b4xN zGT|LC5DT6HmXf4}y46FQNwz9tA-U z(v$w*$P2tMog}8AX1g#X+1a)2{%FiKjVL;cDTps33OOb~ zpgHDH8{L^S8?YVH~Oz&}^P(Wn7(3XFg$$PUMj3}Do(y}bY5 zM^1rJD+VxFgye*ck*v?g)WpWc>jL3n!gGqTDLVI94gp}iD{!CHDNxL+%wLUpQX)Wh zrey%~zqfy|X3V*#`I8UkJR!kX)Zn*CW^LwBc6znw1vn5%67@G%6yo*4}X z%K-jjZ3Dn_7H$F9aLh9cHYFPqj<_EKuyG2U@a5dEF;B?YBIJ3n2zj6nD8zzaff)(g zvjTaa(aQiannu+78X$J8O)P$8AArI(oWB~;FPR}0`!d2otN;K207*qoM6N<$f;HjX A4gdfE diff --git a/src/main/resources/assets/tfmg/textures/item/saltpeter.png b/src/main/resources/assets/tfmg/textures/item/nitrate_dust.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/item/saltpeter.png rename to src/main/resources/assets/tfmg/textures/item/nitrate_dust.png diff --git a/src/main/resources/assets/tfmg/textures/item/sulfur_powder.png b/src/main/resources/assets/tfmg/textures/item/sulfur_dust.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/item/sulfur_powder.png rename to src/main/resources/assets/tfmg/textures/item/sulfur_dust.png diff --git a/src/main/resources/assets/tfmg/textures/item/unprocessed_steel_mechanism.png b/src/main/resources/assets/tfmg/textures/item/unfinished_steel_mechanism.png similarity index 100% rename from src/main/resources/assets/tfmg/textures/item/unprocessed_steel_mechanism.png rename to src/main/resources/assets/tfmg/textures/item/unfinished_steel_mechanism.png