From 34331772fa127706394af342eff5aa31e49f04e5 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Tue, 14 Nov 2023 15:57:19 +0100 Subject: [PATCH] coke oven fixes + cast iron rebalance --- .../2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 | 44 +----- .../9047e4e94996e73e9dfde3738763637fb609e07e | 4 +- .../heavy_casing_encased_cogwheel.json | 56 ------- .../heavy_casing_encased_large_cogwheel.json | 56 ------- .../heavy_casing_encased_shaft.json | 20 --- .../blockstates/steel_encased_cogwheel.json | 56 ------- .../steel_encased_large_cogwheel.json | 56 ------- .../blockstates/steel_encased_shaft.json | 20 --- .../assets/createindustry/lang/en_ud.json | 6 - .../assets/createindustry/lang/en_us.json | 138 ------------------ .../block/heavy_casing_encased_cogwheel.json | 10 -- .../heavy_casing_encased_cogwheel_bottom.json | 10 -- .../heavy_casing_encased_cogwheel_top.json | 10 -- ...vy_casing_encased_cogwheel_top_bottom.json | 10 -- .../heavy_casing_encased_large_cogwheel.json | 10 -- ..._casing_encased_large_cogwheel_bottom.json | 10 -- ...avy_casing_encased_large_cogwheel_top.json | 10 -- ...ing_encased_large_cogwheel_top_bottom.json | 10 -- .../models/block/steel_encased_cogwheel.json | 10 -- .../block/steel_encased_cogwheel_bottom.json | 10 -- .../block/steel_encased_cogwheel_top.json | 10 -- .../steel_encased_cogwheel_top_bottom.json | 10 -- .../block/steel_encased_large_cogwheel.json | 10 -- .../steel_encased_large_cogwheel_bottom.json | 10 -- .../steel_encased_large_cogwheel_top.json | 10 -- ...eel_encased_large_cogwheel_top_bottom.json | 10 -- .../item/heavy_casing_encased_cogwheel.json | 9 -- .../heavy_casing_encased_large_cogwheel.json | 9 -- .../item/heavy_casing_encased_shaft.json | 3 - .../models/item/steel_encased_cogwheel.json | 9 -- .../item/steel_encased_large_cogwheel.json | 9 -- .../models/item/steel_encased_shaft.json | 3 - .../blocks/heavy_casing_encased_cogwheel.json | 20 --- .../heavy_casing_encased_large_cogwheel.json | 20 --- .../blocks/heavy_casing_encased_shaft.json | 20 --- .../blocks/steel_encased_cogwheel.json | 20 --- .../blocks/steel_encased_large_cogwheel.json | 20 --- .../blocks/steel_encased_shaft.json | 20 --- .../minecraft/tags/blocks/mineable/axe.json | 8 +- .../tags/blocks/mineable/pickaxe.json | 6 - .../coke_oven/CokeOvenBlockEntity.java | 28 ++-- .../registry/TFMGBlockEntities.java | 6 +- .../createindustry/registry/TFMGBlocks.java | 120 +++++++-------- .../textures/block/pumpjack_hammer.png | Bin 789 -> 789 bytes .../recipes/coking/coal_coke.json | 4 +- .../recipes/crafting/coke_oven.json | 23 +++ .../recipes/item_application/coke_oven.json | 17 --- .../recipes/mixing/cast_iron_ingot.json | 8 +- 48 files changed, 111 insertions(+), 887 deletions(-) delete mode 100644 src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_large_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_shaft.json delete mode 100644 src/generated/resources/assets/createindustry/blockstates/steel_encased_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/blockstates/steel_encased_large_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/blockstates/steel_encased_shaft.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top.json delete mode 100644 src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top_bottom.json delete mode 100644 src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_large_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_shaft.json delete mode 100644 src/generated/resources/assets/createindustry/models/item/steel_encased_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/item/steel_encased_large_cogwheel.json delete mode 100644 src/generated/resources/assets/createindustry/models/item/steel_encased_shaft.json delete mode 100644 src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_cogwheel.json delete mode 100644 src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_large_cogwheel.json delete mode 100644 src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_shaft.json delete mode 100644 src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_cogwheel.json delete mode 100644 src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_large_cogwheel.json delete mode 100644 src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_shaft.json create mode 100644 src/main/resources/data/createindustry/recipes/crafting/coke_oven.json delete mode 100644 src/main/resources/data/createindustry/recipes/item_application/coke_oven.json diff --git a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 index 57a5b778..d1e62aca 100644 --- a/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 +++ b/src/generated/resources/.cache/2d06ea55ee27bcb1f7f87fa8ec3e037afa7e1ad9 @@ -1,4 +1,4 @@ -// 1.19.2 2023-11-09T21:41:54.0040392 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2023-11-12T13:28:07.3334941 Registrate Provider for createindustry [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 50db526af77cf0ead08cadfd3f7daa8b84a40312 assets/createindustry/blockstates/air_intake.json 429437419b2ec98bd716e7ba15583b84da7488d5 assets/createindustry/blockstates/aluminum_bars.json 9e2417e479011e42ebf00685068e6b6f515f0b11 assets/createindustry/blockstates/aluminum_block.json @@ -99,9 +99,6 @@ a00b1a62ac48d461e6df44a25bf5e71d01c592ba assets/createindustry/blockstates/green f052043e59444d20616a9984360d05fb2edc0d7d assets/createindustry/blockstates/green_concrete_wall.json ccfb75a61bbc66bc5a5d56d4dfa8ff4267652bfa assets/createindustry/blockstates/hardened_planks.json af9bed28b8bd7912e439912d59cb59dd41c61b10 assets/createindustry/blockstates/heavy_casing_door.json -605024d8361c108c021bbcb6ab2bd254b45f0cb3 assets/createindustry/blockstates/heavy_casing_encased_cogwheel.json -3d1a41294dc3540cefe507674ebd613cbd843111 assets/createindustry/blockstates/heavy_casing_encased_large_cogwheel.json -152f6e9fc29d4e4f96771be7f258ba106d9accb2 assets/createindustry/blockstates/heavy_casing_encased_shaft.json a418d47559d0981dd7da1441e56d3eea026bce99 assets/createindustry/blockstates/heavy_machinery_casing.json 5d6b14700e8f04cbd4308c83b0451b5443e4cf91 assets/createindustry/blockstates/heavy_oil.json 2d0d439047ff77b031930aa39db7ac742e4d42cf assets/createindustry/blockstates/industrial_pipe.json @@ -183,9 +180,6 @@ f6758defb35319cd27e9ebef307f23d58d79505a assets/createindustry/blockstates/steel f1fcbc33836ee794684dc715131e184f588515e9 assets/createindustry/blockstates/steel_distillation_controller.json 0d9f0847a584e7aaa111a50aa44ca471ec58f524 assets/createindustry/blockstates/steel_distillation_output.json e67bfac13d06829552862e60ddc8ba8bfc129228 assets/createindustry/blockstates/steel_door.json -7c5560de0a94fc9a2fa5a21942dd37c83e2f555f assets/createindustry/blockstates/steel_encased_cogwheel.json -a6ca9ac046c8901f1ba1ba6181efb2ff592a1acd assets/createindustry/blockstates/steel_encased_large_cogwheel.json -40a8702813b48c1b62aafaa8a91426d668550ffd assets/createindustry/blockstates/steel_encased_shaft.json 5886babd046ad3259f77a7a3a4e641e702ffcd6b assets/createindustry/blockstates/steel_fluid_tank.json 137a8b1fc60285bc033dbdf12778ec7bbc394079 assets/createindustry/blockstates/steel_fluid_valve.json ae1eeb60729d163fc4892866cad74c57cea962cf assets/createindustry/blockstates/steel_flywheel.json @@ -207,8 +201,8 @@ b78c8d250e7ebaf757ee7c52828be3c265d2f872 assets/createindustry/blockstates/white d7114f093ed9d4700045f04469b7e83ea91f46bb assets/createindustry/blockstates/yellow_concrete_slab.json a3376853404f164207006a3e6797872b39748966 assets/createindustry/blockstates/yellow_concrete_stairs.json cf86260011f9890489b886d2f29eec92ca423f94 assets/createindustry/blockstates/yellow_concrete_wall.json -e8967a048f5e9bca203adc25c88efd0169b5181a assets/createindustry/lang/en_ud.json -f7b62b6db95bb04013ba46554030d50f2f10eb8b assets/createindustry/lang/en_us.json +af8d031afe8f743b21f6c6709106f22625fb489c assets/createindustry/lang/en_ud.json +cdac5149ca89cad620f5beaf15f6ed53f5692c88 assets/createindustry/lang/en_us.json c97ace9182228ac09c3decbeae4a1c5f19bf2729 assets/createindustry/models/block/aluminum_block.json eadb8c93c688022b4f6e9d928a09f6e3da7d1ff8 assets/createindustry/models/block/aluminum_cap.json 57d4ce9c693d61ef313079fc379649847b0a226a assets/createindustry/models/block/aluminum_cap_alt.json @@ -420,14 +414,6 @@ c231aaaeaf829c6e3dc89b75d50ca2ae22b770a7 assets/createindustry/models/block/gree 772f0a37d30f055e9d5e368773ee08376bfe31ac assets/createindustry/models/block/green_concrete_wall_side.json 4792f36ccfb07338434e4e2ec4d2602fa46b7a16 assets/createindustry/models/block/green_concrete_wall_side_tall.json d8ee1eb6c101f05b891f97cfa95e146c546b400d assets/createindustry/models/block/hardened_planks.json -760c39e36467df83e279f66d03749d4c2861ae2b assets/createindustry/models/block/heavy_casing_encased_cogwheel.json -16a5012855457fcbb7bfdab06b5f83be27a4b496 assets/createindustry/models/block/heavy_casing_encased_cogwheel_bottom.json -0587c4a9b7d2805e0a3045cda1c18746ff1816f7 assets/createindustry/models/block/heavy_casing_encased_cogwheel_top.json -8211e7f7cdcf1461c6d62d2bff23c4155e991ce8 assets/createindustry/models/block/heavy_casing_encased_cogwheel_top_bottom.json -bf4543cca753c5fe370b60711eae9b4d66b28048 assets/createindustry/models/block/heavy_casing_encased_large_cogwheel.json -04c42e0cdd979b90bf614effd335229d804816bd assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_bottom.json -8cb49501ec99cbea7776c42ff83f06027e435cab assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top.json -b73ca9be56239ad58b40d19e8b4e5c6eff36c476 assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top_bottom.json 2a45d057b1f65b6f317987233f999280cea75f86 assets/createindustry/models/block/heavy_machinery_casing.json cbff84083f277898f53279510a4bb2ab95790716 assets/createindustry/models/block/heavy_oil.json 80d385a00efb3aa680bdffd18a7ca9a83d7d9cc9 assets/createindustry/models/block/kerosene.json @@ -579,14 +565,6 @@ cb9f4d6f8aa0999acec517cf854bbdd8ed86e21a assets/createindustry/models/block/smal bd806021e77979d7c26da7a9d05a6216d28b853a assets/createindustry/models/block/steel_cap.json 488c8a24f90b5d2c8f3d2a0475350edf634ceab3 assets/createindustry/models/block/steel_cap_alt.json cbb5472e27ec5293e917bab19b74c8e821c512a3 assets/createindustry/models/block/steel_casing.json -1f05f3ff6abf74026aa43967e1756d4b793f03df assets/createindustry/models/block/steel_encased_cogwheel.json -68058b33c5d3fd221401e693023e2f53d7e51a45 assets/createindustry/models/block/steel_encased_cogwheel_bottom.json -1be0171626c53474ecbbe0a666d21a0ffeea34e9 assets/createindustry/models/block/steel_encased_cogwheel_top.json -571f4f1178c9b319a6fab8f298d09571504b37ce assets/createindustry/models/block/steel_encased_cogwheel_top_bottom.json -0b96c98405a7426420633050595a33eb5e022abb assets/createindustry/models/block/steel_encased_large_cogwheel.json -86b8ab624856cbad47f7cc229c37560e59106f9b assets/createindustry/models/block/steel_encased_large_cogwheel_bottom.json -2b83eb8208a5ec92d70839efb1d671fb2c87816b assets/createindustry/models/block/steel_encased_large_cogwheel_top.json -826d5630f53c2fa8af790fd6ea7f8d6218544a1f assets/createindustry/models/block/steel_encased_large_cogwheel_top_bottom.json 63646b0593fc11776f1e4022b79b838ad17cc165 assets/createindustry/models/block/steel_ladder.json f5b9f682a2b9cb1577f4e89e67618e0f2344bbb6 assets/createindustry/models/block/steel_pipe/d_x.json ae83363f1b0512cb50c164186844fd153c704dc6 assets/createindustry/models/block/steel_pipe/d_y.json @@ -746,9 +724,6 @@ f2e482ff0d0b555b4581c15edb4e01b9c7935820 assets/createindustry/models/item/gray_ 54e1b1c148e2a5f3235ed472d7386324fad82163 assets/createindustry/models/item/green_concrete_wall.json 05529b1cd0b8e6f5ae54440f59bdf33b0e3a50b7 assets/createindustry/models/item/hardened_planks.json 3ea2174152c3617010a278e23923c08917da844e assets/createindustry/models/item/heavy_casing_door.json -e8c4d2eb1eba75a042a07210c237c9eb380370d0 assets/createindustry/models/item/heavy_casing_encased_cogwheel.json -d5f317b48f46b37fa65afb3d76c1c729438b08ac assets/createindustry/models/item/heavy_casing_encased_large_cogwheel.json -74eaea168a32e0e6b4c7544b2f9ecb9fe81e5fa7 assets/createindustry/models/item/heavy_casing_encased_shaft.json 3350ad95bdea61d3cc059f47071c890f0972fb3d assets/createindustry/models/item/heavy_machinery_casing.json bb21d0a35fad1c88f62c53a4cec1c2015570357b assets/createindustry/models/item/heavy_oil_bucket.json f5fb667375a46af9fe0c912dbf17e7ab3ab1e359 assets/createindustry/models/item/heavy_plate.json @@ -839,9 +814,6 @@ f1ccc71e7bec0435a40c062f9fd2b5decdf46d2f assets/createindustry/models/item/steel 5f831c7585810fe28aeb8939ee01a725bfbac7c6 assets/createindustry/models/item/steel_distillation_controller.json b2e00aeba06f4dc6ef642668a71558c809a05216 assets/createindustry/models/item/steel_distillation_output.json 3ced9a065e2c9c21ed7dfbfc8ca5d2feabcc43d9 assets/createindustry/models/item/steel_door.json -6a14d9bbb3059659c692cda11c6f12d77662b101 assets/createindustry/models/item/steel_encased_cogwheel.json -707afcdc82b1f4ada0c98f24db1c2b2208db5abf assets/createindustry/models/item/steel_encased_large_cogwheel.json -cd8ad31f7aebd2d87eb32bea8d07c9ba0307a266 assets/createindustry/models/item/steel_encased_shaft.json 75e956841c1ae5d1e7787f2921f625d44693635c assets/createindustry/models/item/steel_fluid_tank.json a5f60256e5878ffc0ed8fb117e05ac20cb385905 assets/createindustry/models/item/steel_fluid_valve.json c1d40f4d0737b4c3040cb5ecda04f74f602807f0 assets/createindustry/models/item/steel_flywheel.json @@ -1011,9 +983,6 @@ b42f09a8a5dc4124b049c3721d12d79cbd4d64fc data/createindustry/loot_tables/blocks/ 23263cb24d57318cf5185ec4e99159124dd64678 data/createindustry/loot_tables/blocks/green_concrete_wall.json ef182f11c2e4a4452350cee98c2aa6d99b5ce8ff data/createindustry/loot_tables/blocks/hardened_planks.json 7e723e2728a3e83ea86ce73fbfd08e795d3b3aba data/createindustry/loot_tables/blocks/heavy_casing_door.json -13267c1251e76ae6271f7de72db60bde86aa0bfa data/createindustry/loot_tables/blocks/heavy_casing_encased_cogwheel.json -9d010fc3c8d0821d69b550ff0bcbf117be9a7005 data/createindustry/loot_tables/blocks/heavy_casing_encased_large_cogwheel.json -658d76088e3926c72da86a75b4b14946bd809239 data/createindustry/loot_tables/blocks/heavy_casing_encased_shaft.json 2d52ad6c125ad6b0aff1f43296dcfab4445b958f data/createindustry/loot_tables/blocks/heavy_machinery_casing.json b98b84953f7591fab77725714125f48962ef4306 data/createindustry/loot_tables/blocks/industrial_pipe.json 36202757724a9230f132621bfea48a0c1ad16dc8 data/createindustry/loot_tables/blocks/layered_bauxite.json @@ -1084,9 +1053,6 @@ eb2925c4fab05db57c5920f54c00185a21e92e0b data/createindustry/loot_tables/blocks/ 9b5d76d721c63dd61d072af2cd19271f02dc2c35 data/createindustry/loot_tables/blocks/steel_distillation_controller.json a52d0c8c33106e7f2ea3342ee3f26e4457c6c008 data/createindustry/loot_tables/blocks/steel_distillation_output.json 44b3ea53e91dd1c288ba7715611e5e60340d14ad data/createindustry/loot_tables/blocks/steel_door.json -13267c1251e76ae6271f7de72db60bde86aa0bfa data/createindustry/loot_tables/blocks/steel_encased_cogwheel.json -9d010fc3c8d0821d69b550ff0bcbf117be9a7005 data/createindustry/loot_tables/blocks/steel_encased_large_cogwheel.json -658d76088e3926c72da86a75b4b14946bd809239 data/createindustry/loot_tables/blocks/steel_encased_shaft.json 581627e80dfff55451940f5ba16f0a0a276d941e data/createindustry/loot_tables/blocks/steel_fluid_tank.json 731e5c53f236e83d1eadff24845b9d93fefb2d3a data/createindustry/loot_tables/blocks/steel_fluid_valve.json c5e7e815ddeaf8ed3a5a588b2569bd39318dd55a data/createindustry/loot_tables/blocks/steel_flywheel.json @@ -1193,8 +1159,8 @@ c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/azalea_root_ 23cf02cfaf4f4efd7feb2a328e623fc63523216b data/minecraft/tags/blocks/doors.json c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/lush_ground_replaceable.json -f91f07f2ed349d6176021ccf3d6ce1cbc858418d data/minecraft/tags/blocks/mineable/axe.json -81a661b25dd555619db23b4e0a7f5cd90330a750 data/minecraft/tags/blocks/mineable/pickaxe.json +97796d300c6a1759abe459ae9175556a17a7e568 data/minecraft/tags/blocks/mineable/axe.json +320d34c446d48da3b1c279110605bfbdefac98db data/minecraft/tags/blocks/mineable/pickaxe.json c93e03d746cae5143427d5605bebd2b2a4006219 data/minecraft/tags/blocks/moss_replaceable.json 8a3dfd27452a21f14ee2a9936ddc357c3dbb9ae4 data/minecraft/tags/blocks/needs_diamond_tool.json c0d6e4e469f0314abef1f5221459942b0ea29558 data/minecraft/tags/blocks/needs_iron_tool.json diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index fe63fe79..da061295 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-11-09T21:10:53.1545746 Create: The Factory Must Grow's lang merger -265ab9cffd38eed60d9f2641d98d6e3cd46ff4fa assets/createindustry/lang/en_us.json +// 1.19.2 2023-11-12T13:28:07.3272281 Create: The Factory Must Grow's lang merger +022087a489e1759aa814291b8fcb1d396cd3e41a assets/createindustry/lang/en_us.json diff --git a/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_cogwheel.json b/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_cogwheel.json deleted file mode 100644 index 010ca475..00000000 --- a/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_cogwheel.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "axis=x,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_cogwheel", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_top", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_bottom", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_top_bottom", - "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_cogwheel" - }, - "axis=y,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_top" - }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_bottom" - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_top_bottom" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_cogwheel", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_top", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_cogwheel_top_bottom", - "x": 90, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_large_cogwheel.json b/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_large_cogwheel.json deleted file mode 100644 index 9a1433a2..00000000 --- a/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_large_cogwheel.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "axis=x,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_top", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_bottom", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_top_bottom", - "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel" - }, - "axis=y,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_top" - }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_bottom" - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_top_bottom" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_top", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/heavy_casing_encased_large_cogwheel_top_bottom", - "x": 90, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_shaft.json b/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_shaft.json deleted file mode 100644 index 82e41f60..00000000 --- a/src/generated/resources/assets/createindustry/blockstates/heavy_casing_encased_shaft.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "createindustry:block/encased_shaft/block_heavy_casing", - "uvlock": true, - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "createindustry:block/encased_shaft/block_heavy_casing", - "uvlock": true - }, - "axis=z": { - "model": "createindustry:block/encased_shaft/block_heavy_casing", - "uvlock": true, - "x": 90, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/blockstates/steel_encased_cogwheel.json b/src/generated/resources/assets/createindustry/blockstates/steel_encased_cogwheel.json deleted file mode 100644 index 6006a082..00000000 --- a/src/generated/resources/assets/createindustry/blockstates/steel_encased_cogwheel.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "axis=x,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/steel_encased_cogwheel", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/steel_encased_cogwheel_top", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/steel_encased_cogwheel_bottom", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/steel_encased_cogwheel_top_bottom", - "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/steel_encased_cogwheel" - }, - "axis=y,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/steel_encased_cogwheel_top" - }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/steel_encased_cogwheel_bottom" - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/steel_encased_cogwheel_top_bottom" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/steel_encased_cogwheel", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/steel_encased_cogwheel_top", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/steel_encased_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/steel_encased_cogwheel_top_bottom", - "x": 90, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/blockstates/steel_encased_large_cogwheel.json b/src/generated/resources/assets/createindustry/blockstates/steel_encased_large_cogwheel.json deleted file mode 100644 index 768f7ad4..00000000 --- a/src/generated/resources/assets/createindustry/blockstates/steel_encased_large_cogwheel.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "variants": { - "axis=x,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/steel_encased_large_cogwheel", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/steel_encased_large_cogwheel_top", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/steel_encased_large_cogwheel_bottom", - "x": 90, - "y": 90 - }, - "axis=x,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/steel_encased_large_cogwheel_top_bottom", - "x": 90, - "y": 90 - }, - "axis=y,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/steel_encased_large_cogwheel" - }, - "axis=y,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/steel_encased_large_cogwheel_top" - }, - "axis=y,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/steel_encased_large_cogwheel_bottom" - }, - "axis=y,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/steel_encased_large_cogwheel_top_bottom" - }, - "axis=z,bottom_shaft=false,top_shaft=false": { - "model": "createindustry:block/steel_encased_large_cogwheel", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=false,top_shaft=true": { - "model": "createindustry:block/steel_encased_large_cogwheel_top", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=false": { - "model": "createindustry:block/steel_encased_large_cogwheel_bottom", - "x": 90, - "y": 180 - }, - "axis=z,bottom_shaft=true,top_shaft=true": { - "model": "createindustry:block/steel_encased_large_cogwheel_top_bottom", - "x": 90, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/blockstates/steel_encased_shaft.json b/src/generated/resources/assets/createindustry/blockstates/steel_encased_shaft.json deleted file mode 100644 index e11bb634..00000000 --- a/src/generated/resources/assets/createindustry/blockstates/steel_encased_shaft.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "variants": { - "axis=x": { - "model": "createindustry:block/encased_shaft/block_steel", - "uvlock": true, - "x": 90, - "y": 90 - }, - "axis=y": { - "model": "createindustry:block/encased_shaft/block_steel", - "uvlock": true - }, - "axis=z": { - "model": "createindustry:block/encased_shaft/block_steel", - "uvlock": true, - "x": 90, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/lang/en_ud.json b/src/generated/resources/assets/createindustry/lang/en_ud.json index b2679c29..7f0d8692 100644 --- a/src/generated/resources/assets/createindustry/lang/en_ud.json +++ b/src/generated/resources/assets/createindustry/lang/en_ud.json @@ -99,9 +99,6 @@ "block.createindustry.green_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uǝǝɹ⅁", "block.createindustry.hardened_planks": "sʞuɐןԀ pǝuǝpɹɐH", "block.createindustry.heavy_casing_door": "ɹooᗡ buısɐƆ ʎʌɐǝH", - "block.createindustry.heavy_casing_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ buısɐƆ ʎʌɐǝH", - "block.createindustry.heavy_casing_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ buısɐƆ ʎʌɐǝH", - "block.createindustry.heavy_casing_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ buısɐƆ ʎʌɐǝH", "block.createindustry.heavy_machinery_casing": "buısɐƆ ʎɹǝuıɥɔɐW ʎʌɐǝH", "block.createindustry.heavy_oil": "ןıO ʎʌɐǝH", "block.createindustry.industrial_pipe": "ǝdıԀ ןɐıɹʇsnpuI", @@ -183,9 +180,6 @@ "block.createindustry.steel_distillation_controller": "ɹǝןןoɹʇuoƆ uoıʇɐןןıʇsıᗡ ןǝǝʇS", "block.createindustry.steel_distillation_output": "ʇndʇnO uoıʇɐןןıʇsıᗡ ןǝǝʇS", "block.createindustry.steel_door": "ɹooᗡ ןǝǝʇS", - "block.createindustry.steel_encased_cogwheel": "ןǝǝɥʍboƆ pǝsɐɔuƎ ןǝǝʇS", - "block.createindustry.steel_encased_large_cogwheel": "ןǝǝɥʍboƆ ǝbɹɐꞀ pǝsɐɔuƎ ןǝǝʇS", - "block.createindustry.steel_encased_shaft": "ʇɟɐɥS pǝsɐɔuƎ ןǝǝʇS", "block.createindustry.steel_fluid_tank": "ʞuɐ⟘ pınןℲ ןǝǝʇS", "block.createindustry.steel_fluid_valve": "ǝʌןɐΛ pınןℲ ןǝǝʇS", "block.createindustry.steel_flywheel": "ןǝǝɥʍʎןℲ ןǝǝʇS", diff --git a/src/generated/resources/assets/createindustry/lang/en_us.json b/src/generated/resources/assets/createindustry/lang/en_us.json index a30f268b..cb214b17 100644 --- a/src/generated/resources/assets/createindustry/lang/en_us.json +++ b/src/generated/resources/assets/createindustry/lang/en_us.json @@ -102,9 +102,6 @@ "block.createindustry.green_concrete_wall": "Green Concrete Wall", "block.createindustry.hardened_planks": "Hardened Planks", "block.createindustry.heavy_casing_door": "Heavy Casing Door", - "block.createindustry.heavy_casing_encased_cogwheel": "Heavy Casing Encased Cogwheel", - "block.createindustry.heavy_casing_encased_large_cogwheel": "Heavy Casing Encased Large Cogwheel", - "block.createindustry.heavy_casing_encased_shaft": "Heavy Casing Encased Shaft", "block.createindustry.heavy_machinery_casing": "Heavy Machinery Casing", "block.createindustry.heavy_oil": "Heavy Oil", "block.createindustry.industrial_pipe": "Industrial Pipe", @@ -186,9 +183,6 @@ "block.createindustry.steel_distillation_controller": "Steel Distillation Controller", "block.createindustry.steel_distillation_output": "Steel Distillation Output", "block.createindustry.steel_door": "Steel Door", - "block.createindustry.steel_encased_cogwheel": "Steel Encased Cogwheel", - "block.createindustry.steel_encased_large_cogwheel": "Steel Encased Large Cogwheel", - "block.createindustry.steel_encased_shaft": "Steel Encased Shaft", "block.createindustry.steel_fluid_tank": "Steel Fluid Tank", "block.createindustry.steel_fluid_valve": "Steel Fluid Valve", "block.createindustry.steel_flywheel": "Steel Flywheel", @@ -293,138 +287,6 @@ "item.createindustry.unprocessed_heavy_plate": "Unprocessed Heavy Plate", "item.createindustry.zinc_grenade": "Zinc Grenade", - "itemGroup.createindustry.base": "Create: The Factory Must Grow", - "itemGroup.createindustry.building": "Create: TFMG Building Blocks", - - "create.goggles.misc.number": "%1$s", - "create.goggles.misc.percent_symbol": "%", - "create.goggles.misc.dot_one": ".", - "create.goggles.misc.dot_two": "..", - "create.goggles.misc.dot_three": "...", - "create.goggles.misc.storage_info": "Storage Info:", - "create.goggles.fluid_in_tank": "Tank Contents:", - "create.goggles.surface_scanner.no_rotation": "Machine Unpowered", - "create.goggles.surface_scanner.no_deposit": "No Deposit Found", - "create.goggles.surface_scanner.deposit_found": "Deposit Located!", - "create.goggles.surface_scanner.distance": "Distance: %1$s Blocks", - "create.goggles.surface_scanner.scanning_surface": "Scanning The Surface...", - "create.goggles.distillation_tower.status": "Distillation Tower Info:", - "create.goggles.distillation_tower.tank_not_found": "Steel Fluid Tank Not Found", - "create.goggles.distillation_tower.not_tall_enough": "The Fluid Tank is Too Short", - "create.goggles.distillation_tower.level": "Distillation Tower Level: %1$s", - "create.goggles.distillation_tower.found_outputs": "Number of Outputs: %1$s", - "create.goggles.distillation_tower.no_outputs": "No Output Blocks Found", - "create.goggles.blast_furnace.stats": "Blast Furnace:", - "create.goggles.blast_furnace.size_stats": "Size:", - "create.goggles.blast_furnace.fuel_amount": "Fuel Amount: %1$s", - "create.goggles.blast_furnace.item_count": "Item Count: %1$s", - "create.goggles.blast_furnace.height": "Height: %1$s", - "create.goggles.blast_furnace.nothing_lol": "", - "create.goggles.blast_furnace.status.off": "Status: Idle", - "create.goggles.blast_furnace.status.running": "Status: Running", - "create.goggles.blast_furnace.diameter.one": "Diameter: 1", - "create.goggles.blast_furnace.diameter.two": "Diameter: 2", - "create.goggles.blast_furnace.invalid": "Blast Furnace Invalid", - "create.goggles.coke_oven.status": "Coke Oven:", - "create.goggles.coke_oven.fluid_amount_output": "Internal Tank Contents: %1$s mb", - "create.goggles.coke_oven.fluid_amount_exhaust": "Carbon Dioxide: %1$s mb", - "create.goggles.coke_oven.item_count": "Internal Storage Item Count: %1$s", - "create.goggles.coke_oven.invalid": "Coke Oven Invalid", - "create.goggles.coke_oven.tank_full": "An Internal Tank 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", - "create.goggles.diesel_engine.info": "Diesel Engine:", - "create.goggles.pumpjack_info": "Pumpjack Info:", - "create.goggles.pumpjack.part_missing": "Hammer or Crank Missing", - "create.goggles.pumpjack.wrong_rotation1": "The Pumpjack Base is oriented incorrectly, the red marker must", - "create.goggles.pumpjack.wrong_rotation2": "face away from the Pumpjack Hammer Holder", - "create.goggles.pumpjack_fluid_storage": "Fluid Tank Info:", - - "create.pumpjack_deposit_amount": "%1$s Buckets", - - "create.goggles.pumpjack.deposit_info": "Deposit Info:", - "create.goggles.zero": "No Deposit Found", - "create.goggles.pumpjack.fluid_amount": "Fluid Amount:", - "create.goggles.machine_input.info": "Machine Input Info", - "create.goggles.machine_input.no_rot": "No Rotation Provided!", - "create.goggles.machine_input.power_level": "Power Level: ", - - "create.recipe.distillation": "Distillation", - "create.recipe.advanced_distillation": "Advanced Distillation", - "create.recipe.industrial_blasting": "Industrial Blasting", - "create.recipe.casting": "Casting", - "create.recipe.coking": "Coking", - - "createindustry.ponder.small_engines.text_1": "To create a small engine, place the front and back parts adjacent to eachother", - "createindustry.ponder.small_engines.text_2": "Fuel is inputted into the front part, and exhaust must be removed from the back part using pipes and an exhaust block", - "createindustry.ponder.small_engines.text_3": "Applying a redstone signal to the front part starts the engine", - "createindustry.ponder.small_engines.text_4": "Small engines include LPG, kerosene and gasoline engines", - "createindustry.ponder.diesel_engine.text_1": "Diesel Engines are assembled by placing a shaft infront of a Diesel Engine block", - "createindustry.ponder.diesel_engine.text_2": "The engine produces exhaust gas which has to be removed with pipes and an exhaust block", - "createindustry.ponder.diesel_engine.text_3": "Air is needed for the engine to run, so an Air Intake is required", - "createindustry.ponder.diesel_engine_expansion.text_1": "Diesel Engine Expansions can give a Diesel Engine two new input slots, for lubrication and radiator fluids", - "createindustry.ponder.surface_scanner.text_1": "The Surface Scanner is used to locate crude oil deposits", - "createindustry.ponder.surface_scanner.text_2": "Providing the machine with rotational power makes it scan for the nearest deposit", - "createindustry.ponder.surface_scanner.text_3": "If a deposit is found, the compass will point towards its location", - "createindustry.ponder.pumpjack.text_1": "To start extracting Oil, you must first build a pipeline on top of a deposit using Industrial Pipes", - "createindustry.ponder.pumpjack.text_2": "Then, construct a Pumpjack on top of the pipeline by first placing down a Pumpjack Base...", - "createindustry.ponder.pumpjack.text_3": "Placing the Pumpjack Hammer behind it...", - "createindustry.ponder.pumpjack.text_4": "And finally, placing the Machine Input with a Pumpjack Crank above it, as shown in the scene", - "createindustry.ponder.distillation_tower.text_1": "A sufficiently large Steel Fluid Tank can be turned into a Distillation Tower", - "createindustry.ponder.distillation_tower.text_2": "The tower is assembled by first placing a Steel Distillation Tower Controller next to the tank...", - "createindustry.ponder.distillation_tower.text_3": "And placing up to 6 Distillation Tower Outputs, all connected with Industrial Pipes", - "createindustry.ponder.distillation_tower.text_4": "Blaze Burners are required to run the Distillation Tower. The dial displays current power levels", - "createindustry.ponder.distillation_tower.text_5": "To input Crude Oil, it must be pumped into the controller block", - "createindustry.ponder.distillation_tower.text_6": "Each output block provides one of the Oil byproducts", - "createindustry.ponder.distillation_tower.text_7": "LPG", - "createindustry.ponder.distillation_tower.text_8": "Gasoline", - "createindustry.ponder.distillation_tower.text_9": "Naphtha", - "createindustry.ponder.distillation_tower.text_10": "Kerosene", - "createindustry.ponder.distillation_tower.text_11": "Diesel", - "createindustry.ponder.distillation_tower.text_12": "Heavy Oil", - "createindustry.ponder.blast_furnace.text_1": "The base of the Blast Furnace is a Blast Furnace Output block", - "createindustry.ponder.blast_furnace.text_2": "To assemble a Blast Furnace, construct a chimney using Fireproof Bricks as shown in the scene", - "createindustry.ponder.blast_furnace.text_3": "The bottom half of the chimney requires to be reinforced", - "createindustry.ponder.blast_furnace.text_4": "Fuel and other items are inserted through the opening at the top", - "createindustry.ponder.coke_oven.text_1": "The Coke Oven is built by placing Coke Oven blocks as shown in the scene, and clicking its side with a wrench", - "createindustry.ponder.coke_oven.text_2": "The process of coking is slow, so it is more efficient to have long arrays of ovens working simultaneously", - "createindustry.ponder.coke_oven.text_3": "Coal can be inputted from any side", - "createindustry.ponder.coke_oven.text_4": "While running, the oven produces Creosote and CO2 which have to be pumped out for it to function", - "createindustry.ponder.coke_oven.text_5": "Once done, Coal Coke will drop out of the opening", - "createindustry.ponder.casting.text_1": "Casting is the process of pouring liquid metal into a Casting Basin using a Casting Spout", - "createindustry.ponder.casting.text_2": "The Casting Basin, obviously, requires a mold to function", - - "createindustry.ponder.distillation_tower.header": "Distillation Tower Setup", - - "createindustry.ponder.pumpjack.header": "Building Pumpjacks", - - "createindustry.ponder.surface_scanner.header": "Locating Oil", - - "createindustry.ponder.diesel_engine.header": "Building a Diesel Engine", - - "createindustry.ponder.diesel_engine_expansion.header": "Expanding Diesel Engines", - - "createindustry.ponder.small_engines.header": "Building Small Engines", - - "createindustry.ponder.coke_oven.header": "Building a Coke Oven", - "createindustry.ponder.blast_furnace": "Building a Blast Furnace", - - "createindustry.ponder.casting.header": "Casting Metal", - "createindustry.ponder.tag.oil": "Oil Related Machines", - "createindustry.ponder.tag.metallurgy": "Metal Working Machines", - "createindustry.ponder.tag.oil.description": "Machines that extract, process or use Crude Oil and its byproducts", - "createindustry.ponder.tag.metallurgy.description": "Machines that produce, process or use Metal and raw materials as such", - "_": "->------------------------] UI & Messages [------------------------<-", diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel.json deleted file mode 100644 index bebcbafe..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_bottom.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_bottom.json deleted file mode 100644 index 2d099520..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block_bottom", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top.json deleted file mode 100644 index ec40af04..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block_top", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top_bottom.json deleted file mode 100644 index e0494835..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_cogwheel_top_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block_top_bottom", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel.json deleted file mode 100644 index 169a2f09..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_bottom.json deleted file mode 100644 index 16963303..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block_bottom", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top.json deleted file mode 100644 index b81e2c08..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block_top", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top_bottom.json deleted file mode 100644 index 342e3d52..00000000 --- a/src/generated/resources/assets/createindustry/models/block/heavy_casing_encased_large_cogwheel_top_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block_top_bottom", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "4": "createindustry:block/heavy_gearbox", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel.json deleted file mode 100644 index ec6ea4e6..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_bottom.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_bottom.json deleted file mode 100644 index f2b5d7b3..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block_bottom", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top.json deleted file mode 100644 index b42dc6e6..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block_top", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top_bottom.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top_bottom.json deleted file mode 100644 index d13b5217..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_cogwheel_top_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/block_top_bottom", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel.json deleted file mode 100644 index 346690ae..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_bottom.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_bottom.json deleted file mode 100644 index 91386e6c..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block_bottom", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top.json deleted file mode 100644 index e1a12a88..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block_top", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top_bottom.json b/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top_bottom.json deleted file mode 100644 index aa2ed068..00000000 --- a/src/generated/resources/assets/createindustry/models/block/steel_encased_large_cogwheel_top_bottom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/block_top_bottom", - "textures": { - "1": "createindustry:block/steel_casing", - "4": "createindustry:block/steel_gearbox", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_cogwheel.json b/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_cogwheel.json deleted file mode 100644 index a8220108..00000000 --- a/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_cogwheel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/item", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_large_cogwheel.json b/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_large_cogwheel.json deleted file mode 100644 index 0eef222f..00000000 --- a/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_large_cogwheel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/item", - "textures": { - "1": "createindustry:block/heavy_machinery_casing", - "casing": "createindustry:block/heavy_machinery_casing", - "particle": "createindustry:block/heavy_machinery_casing", - "side": "createindustry:block/heavy_machinery_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_shaft.json b/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_shaft.json deleted file mode 100644 index 2e5665e4..00000000 --- a/src/generated/resources/assets/createindustry/models/item/heavy_casing_encased_shaft.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "createindustry:block/encased_shaft/item_heavy_casing" -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/steel_encased_cogwheel.json b/src/generated/resources/assets/createindustry/models/item/steel_encased_cogwheel.json deleted file mode 100644 index 443a0481..00000000 --- a/src/generated/resources/assets/createindustry/models/item/steel_encased_cogwheel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "createindustry:block/encased_cogwheel/item", - "textures": { - "1": "createindustry:block/steel_casing", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/steel_encased_large_cogwheel.json b/src/generated/resources/assets/createindustry/models/item/steel_encased_large_cogwheel.json deleted file mode 100644 index 10580afa..00000000 --- a/src/generated/resources/assets/createindustry/models/item/steel_encased_large_cogwheel.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "createindustry:block/encased_large_cogwheel/item", - "textures": { - "1": "createindustry:block/steel_casing", - "casing": "createindustry:block/steel_casing", - "particle": "createindustry:block/steel_casing", - "side": "createindustry:block/steel_encased_cogwheel_side_large" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/createindustry/models/item/steel_encased_shaft.json b/src/generated/resources/assets/createindustry/models/item/steel_encased_shaft.json deleted file mode 100644 index f99bef83..00000000 --- a/src/generated/resources/assets/createindustry/models/item/steel_encased_shaft.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "createindustry:block/encased_shaft/item_steel" -} \ No newline at end of file diff --git a/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_cogwheel.json b/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_cogwheel.json deleted file mode 100644 index da831950..00000000 --- a/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_cogwheel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "create:cogwheel" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_large_cogwheel.json b/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_large_cogwheel.json deleted file mode 100644 index 0f88c827..00000000 --- a/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_large_cogwheel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "create:large_cogwheel" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_shaft.json b/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_shaft.json deleted file mode 100644 index 30564f2b..00000000 --- a/src/generated/resources/data/createindustry/loot_tables/blocks/heavy_casing_encased_shaft.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "create:shaft" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_cogwheel.json b/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_cogwheel.json deleted file mode 100644 index da831950..00000000 --- a/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_cogwheel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "create:cogwheel" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_large_cogwheel.json b/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_large_cogwheel.json deleted file mode 100644 index 0f88c827..00000000 --- a/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_large_cogwheel.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "create:large_cogwheel" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_shaft.json b/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_shaft.json deleted file mode 100644 index 30564f2b..00000000 --- a/src/generated/resources/data/createindustry/loot_tables/blocks/steel_encased_shaft.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "create:shaft" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json index 186bdd0f..cdfa3a5a 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json @@ -14,12 +14,6 @@ "createindustry:copper_encased_cast_iron_pipe", "createindustry:copper_encased_brass_pipe", "createindustry:copper_encased_plastic_pipe", - "createindustry:copper_encased_aluminum_pipe", - "createindustry:steel_encased_shaft", - "createindustry:heavy_casing_encased_shaft", - "createindustry:steel_encased_cogwheel", - "createindustry:heavy_casing_encased_cogwheel", - "createindustry:steel_encased_large_cogwheel", - "createindustry:heavy_casing_encased_large_cogwheel" + "createindustry:copper_encased_aluminum_pipe" ] } \ 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 ea0dafa0..ec649be5 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -89,12 +89,6 @@ "createindustry:aluminum_mechanical_pump", "createindustry:aluminum_smart_fluid_pipe", "createindustry:aluminum_fluid_valve", - "createindustry:steel_encased_shaft", - "createindustry:heavy_casing_encased_shaft", - "createindustry:steel_encased_cogwheel", - "createindustry:heavy_casing_encased_cogwheel", - "createindustry:steel_encased_large_cogwheel", - "createindustry:heavy_casing_encased_large_cogwheel", "createindustry:black_concrete", "createindustry:black_concrete_wall", "createindustry:black_concrete_stairs", diff --git a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/coke_oven/CokeOvenBlockEntity.java b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/coke_oven/CokeOvenBlockEntity.java index 25fda2fe..b72ab06f 100644 --- a/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/coke_oven/CokeOvenBlockEntity.java +++ b/src/main/java/com/drmangotea/createindustry/blocks/machines/metal_processing/coke_oven/CokeOvenBlockEntity.java @@ -128,7 +128,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren ///// RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory); - if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)) { + if ((lastRecipe == null || !lastRecipe.matches(inventoryIn, level))&&timer==-1) { Optional recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level); if (!recipe.isPresent()) { timer = -1; @@ -194,7 +194,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren )){ timer = lastRecipe.getProcessingDuration(); - inputInventory.setItem(0,new ItemStack(inputInventory.getItem(0).getItem(),inputInventory.getItem(0).getCount()-10)); + inputInventory.setItem(0,new ItemStack(inputInventory.getItem(0).getItem(),inputInventory.getItem(0).getCount()-5)); } // if(lastRecipe != null) @@ -213,7 +213,7 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren ) { timer--; tank1.getPrimaryHandler().setFluid(new FluidStack(lastRecipe.getFluidResults().get(0), tank1.getPrimaryHandler().getFluidAmount()+lastRecipe.getFluidResults().get(0).getAmount())); - tank2.getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),tank2.getPrimaryHandler().getFluidAmount()+CARBON_DIOXIDE_PRODUCTION)); + //tank2.getPrimaryHandler().setFluid(new FluidStack(TFMGFluids.CARBON_DIOXIDE.getSource(),tank2.getPrimaryHandler().getFluidAmount()+CARBON_DIOXIDE_PRODUCTION)); } } @@ -225,13 +225,13 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren return; if(!isController) return; - RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory); - if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)) { - Optional recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level); - if (!recipe.isPresent()) - return; - lastRecipe = recipe.get(); - } + //RecipeWrapper inventoryIn = new RecipeWrapper(inputInventory); + //if (lastRecipe == null || !lastRecipe.matches(inventoryIn, level)) { + // Optional recipe = TFMGRecipeTypes.COKING.find(inventoryIn, level); + // if (!recipe.isPresent()) + // return; + // lastRecipe = recipe.get(); + //} BlockPos toSpawn = getBlockPos().below().relative(this.getBlockState().getValue(FACING)); // ItemEntity itemToSpawn = new ItemEntity(level,toSpawn.getX()+0.5f,toSpawn.getY()+0.5f,toSpawn.getZ()+0.5f, lastRecipe.getResultItem().copy()); @@ -368,10 +368,10 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren // Lang.translate("goggles.surface_scanner.distance",controller.getBlockPos().getY()) // .style(ChatFormatting.DARK_BLUE) // .forGoggles(tooltip,1); - //if(controller !=null) - // Lang.translate("goggles.surface_scanner.distance",controller.getBlockPos().getZ()) - // .style(ChatFormatting.DARK_BLUE) - // .forGoggles(tooltip,1); + // if(controller !=null) + // Lang.translate("goggles.surface_scanner.distance",controller.timer) + // .style(ChatFormatting.DARK_BLUE) + // .forGoggles(tooltip,1); // //if(controller==null){ // Lang.translate("aaaaaaaaaaaaaaaaaaaaaaaaaaa") diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java index 7b7b2e1f..74ca5d74 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlockEntities.java @@ -343,21 +343,21 @@ public class TFMGBlockEntities { public static final BlockEntityEntry TFMG_ENCASED_COGWHEEL = REGISTRATE .blockEntity("tfmg_encased_cogwheel", SimpleKineticBlockEntity::new) .instance(() -> EncasedCogInstance::small, false) - .validBlocks(TFMGBlocks.STEEL_ENCASED_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_COGWHEEL) + // .validBlocks(TFMGBlocks.STEEL_ENCASED_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_COGWHEEL) .renderer(() -> EncasedCogRenderer::small) .register(); public static final BlockEntityEntry TFMG_ENCASED_LARGE_COGWHEEL = REGISTRATE .blockEntity("tfmg_encased_large_cogwheel", SimpleKineticBlockEntity::new) .instance(() -> EncasedCogInstance::large, false) - .validBlocks(TFMGBlocks.STEEL_ENCASED_LARGE_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_LARGE_COGWHEEL) + // .validBlocks(TFMGBlocks.STEEL_ENCASED_LARGE_COGWHEEL, TFMGBlocks.HEAVY_CASING_ENCASED_LARGE_COGWHEEL) .renderer(() -> EncasedCogRenderer::large) .register(); public static final BlockEntityEntry TFMG_ENCASED_SHAFT = REGISTRATE .blockEntity("tfmg_encased_shaft", KineticBlockEntity::new) .instance(() -> ShaftInstance::new, false) - .validBlocks(TFMGBlocks.STEEL_ENCASED_SHAFT, TFMGBlocks.HEAVY_CASING_ENCASED_SHAFT) + // .validBlocks(TFMGBlocks.STEEL_ENCASED_SHAFT, TFMGBlocks.HEAVY_CASING_ENCASED_SHAFT) .renderer(() -> ShaftRenderer::new) .register(); diff --git a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java index a979c868..18b47514 100644 --- a/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/createindustry/registry/TFMGBlocks.java @@ -1333,66 +1333,66 @@ public static final BlockEntry STEEL_DISTILLATION_OUTPU //------------------------ENCASED BLOCKS-----------------// - public static final BlockEntry STEEL_ENCASED_SHAFT = - REGISTRATE.block("steel_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.STEEL_CASING::get)) - .properties(p -> p.color(MaterialColor.PODZOL)) - .transform(TFMGBuilderTransformers.encasedShaft("steel", () -> TFMGSpriteShifts.STEEL_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT)) - .transform(axeOrPickaxe()) - .register(); - - public static final BlockEntry HEAVY_CASING_ENCASED_SHAFT = - REGISTRATE.block("heavy_casing_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.HEAVY_MACHINERY_CASING::get)) - .properties(p -> p.color(MaterialColor.COLOR_GRAY)) - .transform(TFMGBuilderTransformers.encasedShaft("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT)) - .transform(axeOrPickaxe()) - .register(); - - ///////// - - public static final BlockEntry STEEL_ENCASED_COGWHEEL = - REGISTRATE.block("steel_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.STEEL_CASING::get)) - .properties(p -> p.color(MaterialColor.PODZOL)) - .transform(TFMGBuilderTransformers.encasedCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL)) - .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.STEEL_CASING, - Couple.create(TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_SIDE, - TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_OTHERSIDE)))) - .transform(axeOrPickaxe()) - .register(); - - public static final BlockEntry HEAVY_CASING_ENCASED_COGWHEEL = - REGISTRATE.block("heavy_casing_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.HEAVY_MACHINERY_CASING::get)) - .properties(p -> p.color(MaterialColor.COLOR_GRAY)) - .transform(TFMGBuilderTransformers.encasedCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL)) - .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.HEAVY_MACHINERY_CASING, - Couple.create(TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_SIDE, - TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_OTHERSIDE)))) - .transform(axeOrPickaxe()) - .register(); - - ////// - public static final BlockEntry STEEL_ENCASED_LARGE_COGWHEEL = REGISTRATE - .block("steel_encased_large_cogwheel", - p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.STEEL_CASING::get)) - .properties(p -> p.color(MaterialColor.PODZOL)) - .transform(TFMGBuilderTransformers.encasedLargeCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) - .transform(axeOrPickaxe()) - .register(); - - public static final BlockEntry HEAVY_CASING_ENCASED_LARGE_COGWHEEL = REGISTRATE - .block("heavy_casing_encased_large_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.HEAVY_MACHINERY_CASING::get)) - .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN)) - .transform(TFMGBuilderTransformers.encasedLargeCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) - .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) - .transform(axeOrPickaxe()) - .register(); - - - + //public static final BlockEntry STEEL_ENCASED_SHAFT = + // REGISTRATE.block("steel_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.STEEL_CASING::get)) + // .properties(p -> p.color(MaterialColor.PODZOL)) + // .transform(TFMGBuilderTransformers.encasedShaft("steel", () -> TFMGSpriteShifts.STEEL_CASING)) + // .transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT)) + // .transform(axeOrPickaxe()) + // .register(); +// + //public static final BlockEntry HEAVY_CASING_ENCASED_SHAFT = + // REGISTRATE.block("heavy_casing_encased_shaft", p -> new TFMGEncasedShaftBlock(p, TFMGBlocks.HEAVY_MACHINERY_CASING::get)) + // .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + // .transform(TFMGBuilderTransformers.encasedShaft("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) + // .transform(EncasingRegistry.addVariantTo(AllBlocks.SHAFT)) + // .transform(axeOrPickaxe()) + // .register(); +// + /////////// +// + //public static final BlockEntry STEEL_ENCASED_COGWHEEL = + // REGISTRATE.block("steel_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.STEEL_CASING::get)) + // .properties(p -> p.color(MaterialColor.PODZOL)) + // .transform(TFMGBuilderTransformers.encasedCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING)) + // .transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL)) + // .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.STEEL_CASING, + // Couple.create(TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_SIDE, + // TFMGSpriteShifts.STEEL_ENCASED_COGWHEEL_OTHERSIDE)))) + // .transform(axeOrPickaxe()) + // .register(); +// + //public static final BlockEntry HEAVY_CASING_ENCASED_COGWHEEL = + // REGISTRATE.block("heavy_casing_encased_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, false, TFMGBlocks.HEAVY_MACHINERY_CASING::get)) + // .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + // .transform(TFMGBuilderTransformers.encasedCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) + // .transform(EncasingRegistry.addVariantTo(AllBlocks.COGWHEEL)) + // .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCogCTBehaviour(TFMGSpriteShifts.HEAVY_MACHINERY_CASING, + // Couple.create(TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_SIDE, + // TFMGSpriteShifts.HEAVY_CASING_ENCASED_COGWHEEL_OTHERSIDE)))) + // .transform(axeOrPickaxe()) + // .register(); +// + //////// + //public static final BlockEntry STEEL_ENCASED_LARGE_COGWHEEL = REGISTRATE + // .block("steel_encased_large_cogwheel", + // p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.STEEL_CASING::get)) + // .properties(p -> p.color(MaterialColor.PODZOL)) + // .transform(TFMGBuilderTransformers.encasedLargeCogwheel("steel", () -> TFMGSpriteShifts.STEEL_CASING)) + // .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) + // .transform(axeOrPickaxe()) + // .register(); +// + //public static final BlockEntry HEAVY_CASING_ENCASED_LARGE_COGWHEEL = REGISTRATE + // .block("heavy_casing_encased_large_cogwheel", p -> new TFMGEncasedCogwheelBlock(p, true, TFMGBlocks.HEAVY_MACHINERY_CASING::get)) + // .properties(p -> p.color(MaterialColor.TERRACOTTA_BROWN)) + // .transform(TFMGBuilderTransformers.encasedLargeCogwheel("heavy_casing", () -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) + // .transform(EncasingRegistry.addVariantTo(AllBlocks.LARGE_COGWHEEL)) + // .transform(axeOrPickaxe()) + // .register(); +// +// +// //-----------------------CONCRETE---------------------------// static { REGISTRATE.creativeModeTab(() -> TFMGCreativeModeTabs.TFMG_BUILDING_BLOCKS); diff --git a/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer.png b/src/main/resources/assets/createindustry/textures/block/pumpjack_hammer.png index d7bf141e8bf68ab8186850d8416f2e967d6e0ce0..2d4cd76db9380bf53758d1e0f5710184808f91ad 100644 GIT binary patch delta 21 dcmbQrHkEC{M6Lr2415O|v#xb=Zk%1k1OQMn2a5mz delta 21 dcmbQrHkEC{M6QDj415O}cTCKFyK#0E6980~2wVUF diff --git a/src/main/resources/data/createindustry/recipes/coking/coal_coke.json b/src/main/resources/data/createindustry/recipes/coking/coal_coke.json index 8acdd73d..d1016778 100644 --- a/src/main/resources/data/createindustry/recipes/coking/coal_coke.json +++ b/src/main/resources/data/createindustry/recipes/coking/coal_coke.json @@ -2,14 +2,14 @@ "type": "createindustry:coking", "ingredients": [ { - "count": 10, + "count": 5, "item": "minecraft:coal" } ], "processingTime": 1000, "results": [ { - "count": 10, + "count": 5, "item": "createindustry:coal_coke" } , diff --git a/src/main/resources/data/createindustry/recipes/crafting/coke_oven.json b/src/main/resources/data/createindustry/recipes/crafting/coke_oven.json new file mode 100644 index 00000000..bddd48cf --- /dev/null +++ b/src/main/resources/data/createindustry/recipes/crafting/coke_oven.json @@ -0,0 +1,23 @@ + +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " C ", + " I ", + " " + ], + "key": { + "I": { + "item": "create:industrial_iron_block" + }, + "I": { + "tag": "forge:ingots/cast_iron" + } + }, + "result": { + "item": "createindustry:coke_oven", + "count": 3 + + + } +} \ No newline at end of file diff --git a/src/main/resources/data/createindustry/recipes/item_application/coke_oven.json b/src/main/resources/data/createindustry/recipes/item_application/coke_oven.json deleted file mode 100644 index 8cc5ff46..00000000 --- a/src/main/resources/data/createindustry/recipes/item_application/coke_oven.json +++ /dev/null @@ -1,17 +0,0 @@ - -{ - "type": "create:item_application", - "ingredients": [ - { - "item": "create:industrial_iron_block" - }, - { - "tag": "forge:ingots/cast_iron" - } - ], - "results": [ - { - "item": "createindustry:coke_oven" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/createindustry/recipes/mixing/cast_iron_ingot.json b/src/main/resources/data/createindustry/recipes/mixing/cast_iron_ingot.json index b4c4ad1f..18ae0376 100644 --- a/src/main/resources/data/createindustry/recipes/mixing/cast_iron_ingot.json +++ b/src/main/resources/data/createindustry/recipes/mixing/cast_iron_ingot.json @@ -5,12 +5,6 @@ { "item": "minecraft:iron_ingot" }, - { - "item": "minecraft:coal" - }, - { - "item": "minecraft:coal" - }, { "item": "minecraft:coal" } @@ -22,5 +16,5 @@ } ], "heatRequirement": "heated", - "processingTime": 1000 + "processingTime": 100 } \ No newline at end of file