From 70803db5c668c02dd046856d442cf9f42a85192e Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 10 Nov 2021 03:30:55 +0100 Subject: [PATCH] Thanks, Mojang - Removed the Copper Ingot - Removed Copper Ore - Block of Copper -> Copper Plating --- src/generated/resources/.cache/cache | 127 +++++++----------- .../assets/create/blockstates/copper_ore.json | 28 ---- .../resources/assets/create/lang/en_ud.json | 4 +- .../resources/assets/create/lang/en_us.json | 4 +- .../assets/create/lang/unfinished/de_de.json | 2 - .../assets/create/lang/unfinished/es_es.json | 2 - .../assets/create/lang/unfinished/fr_fr.json | 2 - .../assets/create/lang/unfinished/it_it.json | 2 - .../assets/create/lang/unfinished/ja_jp.json | 2 - .../assets/create/lang/unfinished/ko_kr.json | 2 - .../assets/create/lang/unfinished/nl_nl.json | 6 +- .../assets/create/lang/unfinished/pl_pl.json | 2 - .../assets/create/lang/unfinished/pt_br.json | 2 - .../assets/create/lang/unfinished/ru_ru.json | 2 - .../assets/create/lang/unfinished/zh_cn.json | 2 - .../assets/create/lang/unfinished/zh_tw.json | 2 - .../models/block/oxidized/copper_ore_0.json | 6 - .../models/block/oxidized/copper_ore_1.json | 6 - .../models/block/oxidized/copper_ore_2.json | 6 - .../models/block/oxidized/copper_ore_3.json | 6 - .../models/block/oxidized/copper_ore_4.json | 6 - .../models/block/oxidized/copper_ore_5.json | 6 - .../models/block/oxidized/copper_ore_6.json | 6 - .../models/block/oxidized/copper_ore_7.json | 6 - .../create/models/item/copper_ingot.json | 6 - .../assets/create/models/item/copper_ore.json | 3 - .../crafting/appliances/copper_backtank.json | 4 +- .../crafting/appliances/diving_boots.json | 4 +- .../crafting/appliances/diving_helmet.json | 4 +- .../kinetics/copper_valve_handle.json | 4 +- .../copper_valve_handle_from_others.json | 4 +- .../crafting/kinetics/fluid_pipe.json | 4 +- .../crafting/kinetics/fluid_valve.json | 4 +- .../crafting/kinetics/hose_pulley.json | 4 +- .../crafting/kinetics/mechanical_pump.json | 4 +- .../crafting/kinetics/smart_fluid_pipe.json | 4 +- .../crafting/materials/copper_casing.json | 4 +- .../copper_ingot_from_decompacting.json | 34 ----- ...rom_compacting.json => copper_nugget.json} | 6 +- .../copper_nugget_from_decompacting.json | 34 ----- .../palettes/copper_block.json} | 6 +- ...json => copper_shingles_from_plating.json} | 4 +- .../smelting/copper_ingot_from_ore.json | 32 ----- .../blasting/copper_ingot_from_crushed.json | 0 .../crafting/materials/copper_ingot.json} | 4 +- .../smelting/copper_ingot_from_crushed.json | 0 .../create/loot_tables/blocks/copper_ore.json | 21 --- .../blasting/copper_ingot_from_crushed.json | 2 +- .../blasting/copper_ingot_from_ore.json | 9 -- .../crafting/appliances/copper_backtank.json | 4 +- .../crafting/appliances/diving_boots.json | 2 +- .../crafting/appliances/diving_helmet.json | 2 +- .../recipes/crafting/kinetics/fluid_pipe.json | 2 +- .../copper_block_from_compacting.json | 16 --- ...from_compacting.json => copper_ingot.json} | 10 +- ...m_decompacting.json => copper_nugget.json} | 2 +- .../copper_block.json} | 5 +- ...json => copper_shingles_from_plating.json} | 2 +- .../create/recipes/crushing/copper_block.json | 2 +- .../mechanical_crafting/potato_cannon.json | 2 +- .../create/recipes/mixing/brass_ingot.json | 2 +- .../create/recipes/pressing/copper_ingot.json | 2 +- .../smelting/copper_ingot_from_crushed.json | 2 +- .../smelting/copper_ingot_from_ore.json | 9 -- .../data/create/tags/items/create_ingots.json | 1 - .../data/forge/tags/blocks/ores.json | 1 - .../data/forge/tags/blocks/ores/copper.json | 6 - .../forge/tags/blocks/storage_blocks.json | 1 - .../tags/blocks/storage_blocks/copper.json | 6 - .../data/forge/tags/items/ingots/copper.json | 6 - .../resources/data/forge/tags/items/ores.json | 1 - .../data/forge/tags/items/ores/copper.json | 6 - .../data/forge/tags/items/storage_blocks.json | 1 - .../tags/items/storage_blocks/copper.json | 6 - .../tags/blocks/beacon_base_blocks.json | 1 - .../tags/blocks/mineable/pickaxe.json | 1 - .../java/com/simibubi/create/AllBlocks.java | 21 +-- .../java/com/simibubi/create/AllItems.java | 1 - .../curiosities/armor/AllArmorMaterials.java | 4 +- .../data/recipe/CreateRecipeProvider.java | 9 +- .../data/recipe/StandardRecipeGen.java | 56 ++++---- .../foundation/ponder/content/ArmScenes.java | 5 +- .../foundation/ponder/content/BeltScenes.java | 8 +- .../ponder/content/ChuteScenes.java | 4 +- .../ponder/content/DebugScenes.java | 3 +- .../ponder/content/EjectorScenes.java | 12 +- .../ponder/content/MovementActorScenes.java | 3 +- .../ponder/content/ProcessingScenes.java | 10 +- .../ponder/content/TunnelScenes.java | 6 +- .../foundation/worldgen/AllWorldFeatures.java | 2 - 90 files changed, 186 insertions(+), 503 deletions(-) delete mode 100644 src/generated/resources/assets/create/blockstates/copper_ore.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_0.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_1.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_2.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_3.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_4.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_5.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_6.json delete mode 100644 src/generated/resources/assets/create/models/block/oxidized/copper_ore_7.json delete mode 100644 src/generated/resources/assets/create/models/item/copper_ingot.json delete mode 100644 src/generated/resources/assets/create/models/item/copper_ore.json delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_decompacting.json rename src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/{copper_block_from_compacting.json => copper_nugget.json} (73%) delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget_from_decompacting.json rename src/generated/resources/data/create/advancements/recipes/create.base/{blasting/copper_ingot_from_ore.json => crafting/palettes/copper_block.json} (75%) rename src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/{copper_shingles_from_tiles.json => copper_shingles_from_plating.json} (88%) delete mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/smelting/copper_ingot_from_ore.json rename src/generated/resources/data/create/advancements/recipes/{create.base => misc}/blasting/copper_ingot_from_crushed.json (100%) rename src/generated/resources/data/create/advancements/recipes/{create.base/crafting/materials/copper_ingot_from_compacting.json => misc/crafting/materials/copper_ingot.json} (78%) rename src/generated/resources/data/create/advancements/recipes/{create.base => misc}/smelting/copper_ingot_from_crushed.json (100%) delete mode 100644 src/generated/resources/data/create/loot_tables/blocks/copper_ore.json delete mode 100644 src/generated/resources/data/create/recipes/blasting/copper_ingot_from_ore.json delete mode 100644 src/generated/resources/data/create/recipes/crafting/materials/copper_block_from_compacting.json rename src/generated/resources/data/create/recipes/crafting/materials/{copper_ingot_from_compacting.json => copper_ingot.json} (63%) rename src/generated/resources/data/create/recipes/crafting/materials/{copper_nugget_from_decompacting.json => copper_nugget.json} (79%) rename src/generated/resources/data/create/recipes/crafting/{materials/copper_ingot_from_decompacting.json => palettes/copper_block.json} (51%) rename src/generated/resources/data/create/recipes/crafting/palettes/{copper_shingles_from_tiles.json => copper_shingles_from_plating.json} (79%) delete mode 100644 src/generated/resources/data/create/recipes/smelting/copper_ingot_from_ore.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/ores/copper.json delete mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json delete mode 100644 src/generated/resources/data/forge/tags/items/ingots/copper.json delete mode 100644 src/generated/resources/data/forge/tags/items/ores/copper.json delete mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/copper.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1ea4a24c7..00d81fccb 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -64,7 +64,6 @@ e5e3757e99c139d67b2a70288466d8a74d818841 assets/create/blockstates/cogwheel.json 961b615124ea9a5a5735e8a79f81a702de7da2cf assets/create/blockstates/copper_backtank.json f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets/create/blockstates/copper_block.json cabf6b8c59eb0e3d56a0a5a856ca058bb3200882 assets/create/blockstates/copper_casing.json -3355a852cdc717e257ca19b3db836068964733e3 assets/create/blockstates/copper_ore.json dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets/create/blockstates/copper_shingles.json ecf4a72411870bfdbf8a59469b114cd77621c343 assets/create/blockstates/copper_tiles.json 890be245b914c1a9f29f48a8c5d325640b5be160 assets/create/blockstates/copper_valve_handle.json @@ -443,20 +442,20 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -fbbed20d6dedfde8c78d5d62848d98cb510d8dd4 assets/create/lang/en_ud.json -6b44f48cf4d1533cb01ddf82a38a519536822c11 assets/create/lang/en_us.json -c5a66fe2d67dc993ca9141eed8dba846736d8196 assets/create/lang/unfinished/de_de.json -d7bb5f4cfb4823339cd724fdde5c90e19dd7d27c assets/create/lang/unfinished/es_es.json -2937455238cf3938868cb29f214d8cc6fde3a177 assets/create/lang/unfinished/fr_fr.json -b634af1f37a60ac3399b38088859ddc455003eab assets/create/lang/unfinished/it_it.json -d6d614579c94e24471798058b51a827e4afb01b7 assets/create/lang/unfinished/ja_jp.json -f582da6fd78221a03c40978a799e29239ada6660 assets/create/lang/unfinished/ko_kr.json -25ca96301989075b16728c647397b46342a5ac28 assets/create/lang/unfinished/nl_nl.json -b757c697a8ffb16e6ef88c787a031ad2291ede4b assets/create/lang/unfinished/pl_pl.json -0c765991101a752eed7f80ab68e662df82e209b5 assets/create/lang/unfinished/pt_br.json -f3b9816718a30fea39ed34c133dd2c55e5a3b00b assets/create/lang/unfinished/ru_ru.json -59f45830446bb9e544b43f76a33ca7304d9aceed assets/create/lang/unfinished/zh_cn.json -dedec8adbbf24bd0152725441ec397e615fd1fc1 assets/create/lang/unfinished/zh_tw.json +7c31858e6239b72e4da8830fa4cf1748ef2a7ae1 assets/create/lang/en_ud.json +124dd97c100eda3e8078c5e524db74ba91bf206c assets/create/lang/en_us.json +738b1c5391dedb308e2b782d48cf867c8a8bf041 assets/create/lang/unfinished/de_de.json +a987345dd3375ad01fe4900f93941570d374dba9 assets/create/lang/unfinished/es_es.json +9c26f0e9e28c76ef1f5e5e8bf6d0de8eb4d956d6 assets/create/lang/unfinished/fr_fr.json +211c4c8cbd62546a08616b2482319c63d87083a5 assets/create/lang/unfinished/it_it.json +9590169c9c1708af58db1adba3e38e7c58952cfd assets/create/lang/unfinished/ja_jp.json +97eb7f70b3dffea14fc4df5a0147395c3663f321 assets/create/lang/unfinished/ko_kr.json +a9a7bacadde4d6daa4f4ae85da2821c33252442b assets/create/lang/unfinished/nl_nl.json +e8a42aacad3b0b606cf79a30d209dabe6e13a6b3 assets/create/lang/unfinished/pl_pl.json +1a0fa057db601d3aa35c971a9e3d113d3cf61cca assets/create/lang/unfinished/pt_br.json +4d0e6890f838528bed5c7ec58703b4369b10a0b4 assets/create/lang/unfinished/ru_ru.json +6aeaa68280d6fb85aa0e3eabc27d4723a2af4b8b assets/create/lang/unfinished/zh_cn.json +a4b3fceb0d539b6f9cc27d6d81ea1f862f83f3c0 assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json @@ -979,14 +978,6 @@ ee0f11c96fafc164fd9ac64fde0f89cfd527a65a assets/create/models/block/oxidized/cop 4e0fbfc3b61f04f68c6022d6a9a9eabdffdd8673 assets/create/models/block/oxidized/copper_block_5.json e3d374a2e5ceac212bed21b6ec964b4593aa847a assets/create/models/block/oxidized/copper_block_6.json 125966d6e25b601779e3bff4a9da84d85e3984ff assets/create/models/block/oxidized/copper_block_7.json -8f2b2d983c1a0d128dbb1d6465a4eb3a7f98e34c assets/create/models/block/oxidized/copper_ore_0.json -4fd860b564a98869c6450e21446e0e41a8303206 assets/create/models/block/oxidized/copper_ore_1.json -430a115e26a2e95b7a6c04746b10f617212a3091 assets/create/models/block/oxidized/copper_ore_2.json -596fb93cc5f59ccff8e84c07a99398f5ec20d169 assets/create/models/block/oxidized/copper_ore_3.json -d7e94d32a8c739fe8ccfc51b3bf5c1dff038b47f assets/create/models/block/oxidized/copper_ore_4.json -895d3ce98dc576b7396fa309dce69eaeba419c95 assets/create/models/block/oxidized/copper_ore_5.json -578ee4b7b0aaf4f5fbdecc7800f1d8b0d9ea6576 assets/create/models/block/oxidized/copper_ore_6.json -7c4e54d05a8e76e390044099ad02c5dd082f2460 assets/create/models/block/oxidized/copper_ore_7.json 2091e38299cd736320de736b9450e9b5209106cd assets/create/models/block/oxidized/copper_shingles_0.json 3614bcea228962535a048b68b3069a9058156a16 assets/create/models/block/oxidized/copper_shingles_1.json 3d2219e127df9e14109c876ef2e3499a21268209 assets/create/models/block/oxidized/copper_shingles_2.json @@ -1347,9 +1338,7 @@ dcb09deae110077bcddf090996b51cc66e9a7de3 assets/create/models/item/cogwheel.json 10397036fc0bb1e18a767cfd7b19b10d805a83fe assets/create/models/item/copper_backtank.json 965a90a882d85dba93b30af9bce7ecf8e68ce747 assets/create/models/item/copper_block.json 759bcb5fe7dfdd628716f9b4ff19a5ab00393381 assets/create/models/item/copper_casing.json -c2a320162daa2d24cef969d1d14a0cbd55eb574f assets/create/models/item/copper_ingot.json 751324b03f657f4166460eb10a64dae47cb97bd4 assets/create/models/item/copper_nugget.json -51be7da59368681522de870f1e09036dac55aa77 assets/create/models/item/copper_ore.json 177dafb51d70c55ec62036332868efed4e01f353 assets/create/models/item/copper_sheet.json d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets/create/models/item/copper_shingles.json f56bf22324faf8958eaef4d94b958f1108d52e5a assets/create/models/item/copper_tiles.json @@ -1875,14 +1864,12 @@ d63adc5e4cd233a53feb767b9cb09e7bb1a9d4f1 data/create/advancements/recipes/buildi f10041d864bfb1e6f017e442ae85ee9503b3f5a4 data/create/advancements/recipes/building_blocks/smelting/tin_ingot_compat_thermal.json 8887aa51ab368864eb95fdbca0aee24563b1eb0e data/create/advancements/recipes/building_blocks/smelting/uranium_ingot_compat_silents_mechanisms.json ba28efed4ba15c02eac8b0cf3e3420733ad0cc05 data/create/advancements/recipes/create.base/blasting/brass_ingot_from_crushed.json -18d6171548bd5206f812e658f06e1d8835a5dd88 data/create/advancements/recipes/create.base/blasting/copper_ingot_from_crushed.json -c368cadffa9177fefb9e92ff4453b40bc8dd670d data/create/advancements/recipes/create.base/blasting/copper_ingot_from_ore.json ba80332510acab3f60f30d8b802ee2d450fd51b9 data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_crushed.json 4bb60ef5e186f12a9d52e61319db8c78300c64ab data/create/advancements/recipes/create.base/blasting/zinc_ingot_from_ore.json -d1d8cf6e1c95b7d99bf873fa6fee033103f995fd data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json +376bda381f3dedb52b03eb1504b103d8ddd1b672 data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json 265a953eaac909fd2817c6dc3d1a08b376579a25 data/create/advancements/recipes/create.base/crafting/appliances/crafting_blueprint.json -46c04e685ab345a80598176f7ac68a044a76cd76 data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json -5f06b7dcf2af11f30c2e10ade4ac3fd172bc04df data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json +29a77555e4d9eb1c8d4740f95b784fe0e53c72b1 data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json +638f93712e176fa3ef5cd6ecaf8dac4eebe1cd1e data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json e2d4add8b0a015ce8bc4b4c4e2143063d63404c6 data/create/advancements/recipes/create.base/crafting/appliances/dough.json a9b163744b1c494d07ec256d0367884f9601176d data/create/advancements/recipes/create.base/crafting/appliances/linked_controller.json c4769d7ac9c537eb4409b02883e89d0930514a8b data/create/advancements/recipes/create.base/crafting/appliances/tree_fertilizer.json @@ -1911,8 +1898,8 @@ d5e444853f95bcdb3b19d0d222806ac077e2e72d data/create/advancements/recipes/create af678ad65c956f1661173284bbdc7276d8ab1563 data/create/advancements/recipes/create.base/crafting/kinetics/clutch.json f1d8029514853b25356dbdeadd56c4d765fb2a08 data/create/advancements/recipes/create.base/crafting/kinetics/cogwheel.json 261bcfc98cc5ccd25b63776a32e8c0d1075640b4 data/create/advancements/recipes/create.base/crafting/kinetics/controller_rail.json -27930edef02aac6e74bfab62128688ecfb575008 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json -512e4d45657f6df3df2639040e8c5e76f9119f17 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json +70ba0f80929fb60409518d03fbeecd21d5002cb3 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json +cfcb1053b7311aeea03ee9caa66e783801ae74f3 data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json adb639c5e0c2b12c22c29af2218e450ebbe2e07a data/create/advancements/recipes/create.base/crafting/kinetics/crafter_slot_cover.json bb771079e7e814a2a7a854d48bbf270db16a420e data/create/advancements/recipes/create.base/crafting/kinetics/cuckoo_clock.json 44cf4c0a792e8742a030c82f92a529ade059b475 data/create/advancements/recipes/create.base/crafting/kinetics/cyan_seat.json @@ -1924,9 +1911,9 @@ cd1a6ea80663ec9251bb13e27d90e6ccdd10ce3e data/create/advancements/recipes/create 77ee6740d2e0f3ec4bffb298d9d8ce4c77ebff0e data/create/advancements/recipes/create.base/crafting/kinetics/encased_chain_drive.json 3a9aef30af8d9694548da236fe3129c16dba4883 data/create/advancements/recipes/create.base/crafting/kinetics/encased_fan.json 0669da1ba8a761589d14c9b172abd65f8a995bad data/create/advancements/recipes/create.base/crafting/kinetics/filter.json -11d89eca0ccb0f1a8cd27acc9fc0c10d7bf83285 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json +8d4b4ebfe4b7b70dcb34f1b79eda3aee4f5b7abb data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json c227f65c7ef64f7244030354c9a7e87527998531 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_tank.json -a91b11ae44d9b1f479c6dee1f1a4580104059287 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json +5b68a2e467e01d2255c448691ec5b4be20ac35c2 data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json 4049cbeed4452bf6fe7608e06f4a4c90f58d6da0 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_carriage.json 10529af8626e0d60d041aaebeadd4ac6a22cf061 data/create/advancements/recipes/create.base/crafting/kinetics/gantry_shaft.json 60beaa4f519b92eea28a4db11739313da9168beb data/create/advancements/recipes/create.base/crafting/kinetics/gearbox.json @@ -1940,7 +1927,7 @@ c023b9221d7983487d21e5ecc7d92246cfc7e791 data/create/advancements/recipes/create 2ba23f019a110a3e035a49e56ee8156fc11d74c0 data/create/advancements/recipes/create.base/crafting/kinetics/green_seat_from_other_seat.json 9af3d92d11c3f520df3e22f3069042bf34585010 data/create/advancements/recipes/create.base/crafting/kinetics/green_valve_handle_from_other_valve_handle.json f2dadb365c75dd2604ee96e0217cd8024d0d137d data/create/advancements/recipes/create.base/crafting/kinetics/hand_crank.json -21cd686e1f3a4004d8e9bd3d92675bd61fb2b4db data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json +f4e8fd79cb27e0677460f5c260b106338f2a48cc data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json a9f2c8a0b0b322741575ef833a461006ef2f0421 data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json 73433a5cd400ed392796a4e543f15c42dd499fe8 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheel.json eb007bb079bbe6b6aaad2ca90f5af84261e3f8ea data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json @@ -1966,7 +1953,7 @@ c32f74a21df56b67f99366fba747277c40b09935 data/create/advancements/recipes/create 7e483bca3d5d609fcba1f65128e8c20341f03af0 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_piston.json ab3cb22e7cb2469c69a177ba83e29a2e1abdc3f8 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_plough.json 6b1ae84d071e8fc7a1789aaeb01a15260831fc82 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_press.json -750d93013709081b7eaca5a5b9122ab51ab31d02 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json +90434eccfbcff42e8bc397881fd9d68f2dcb7ad4 data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json 40a87b7abbc22436efab546fad3910f4a945c5fc data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_saw.json ed6f472a0de659074e384d20e6c5903bda543acc data/create/advancements/recipes/create.base/crafting/kinetics/metal_bracket.json 4619ee687e7a6d162c771246a40ac1d76b766842 data/create/advancements/recipes/create.base/crafting/kinetics/millstone.json @@ -1997,7 +1984,7 @@ dba0696069fe0850120dc6e1ca1ab741b0fe6d21 data/create/advancements/recipes/create d177c347ce9ef4a3c021b337b6e974894941e0b3 data/create/advancements/recipes/create.base/crafting/kinetics/sequenced_gearshift.json 883ef3fc5f79903ca39049a01b1da8a02d67cbb0 data/create/advancements/recipes/create.base/crafting/kinetics/shaft.json 65d5626037d2e8bdcbbbf127c08cadab62f22d14 data/create/advancements/recipes/create.base/crafting/kinetics/smart_chute.json -232044be44da655ff09deeb99cb220bf71e31096 data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json +aa081b762579ed614eeace1c02a66243921b5ab7 data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json 4cc0acdf9bfd6c3575b81c8129002aca558fc723 data/create/advancements/recipes/create.base/crafting/kinetics/speedometer.json fe70a9ffa16e5063f4fc99da4459a647c56174cf data/create/advancements/recipes/create.base/crafting/kinetics/speedometerfrom_conversion.json 1874d4f0df7b2bf8c95bdc6614c07fdd098b4d7c data/create/advancements/recipes/create.base/crafting/kinetics/spout.json @@ -2041,11 +2028,8 @@ a7d9a6dda3049332f04f4db027340070e1a9e597 data/create/advancements/recipes/create 7716dae5a22a02fa9ea129985eb14639811c2045 data/create/advancements/recipes/create.base/crafting/materials/brass_ingot_from_compacting.json 906a26d805d46f44ce094a14ce138a6ce14431fa data/create/advancements/recipes/create.base/crafting/materials/brass_ingot_from_decompacting.json 90d4658a26a32bfdade4573797ea4d913151c707 data/create/advancements/recipes/create.base/crafting/materials/brass_nugget_from_decompacting.json -6f8641d0ddf846626435189e7db8dfa455837cb7 data/create/advancements/recipes/create.base/crafting/materials/copper_block_from_compacting.json -596ec015f9115023cd304241e70ed812671d614f data/create/advancements/recipes/create.base/crafting/materials/copper_casing.json -d8281fb46ee6abb204331a47108f9289ae272ca4 data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_compacting.json -d35b9cb83644a550c7673b1b0a755466697821ac data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_decompacting.json -11094e06a7a06331df87dc39808b7d1fa1aedc4c data/create/advancements/recipes/create.base/crafting/materials/copper_nugget_from_decompacting.json +e0493cc058cc7dc647b4147dabedae9aa61bc9e3 data/create/advancements/recipes/create.base/crafting/materials/copper_casing.json +dbfba4474ce5229205245d46680a651754a593ce data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json a8a032b40204919242bf5043d2920627cd28d348 data/create/advancements/recipes/create.base/crafting/materials/electron_tube.json 2d875ed3e78b4840863f2188aea2b9dd23304512 data/create/advancements/recipes/create.base/crafting/materials/red_sand_paper.json 984fedbd1e66dd2730d50a9b0b171df6ba03bacc data/create/advancements/recipes/create.base/crafting/materials/refined_radiance_casing.json @@ -2056,16 +2040,15 @@ d8a83ace588c01d781fea3e62fa3762ee04e0250 data/create/advancements/recipes/create 827269a9749c37af9221d27281a85de09942fa2a data/create/advancements/recipes/create.base/crafting/materials/zinc_ingot_from_compacting.json b15e93ea48cc71a78dca4d5fa5738d5354a3a944 data/create/advancements/recipes/create.base/crafting/materials/zinc_ingot_from_decompacting.json b13ffffe311c3e16c3577aeeca881a04aeed7ee6 data/create/advancements/recipes/create.base/crafting/materials/zinc_nugget_from_decompacting.json +b5946b92355a059263240b5cf2e5c0afeb69fa6c data/create/advancements/recipes/create.base/crafting/palettes/copper_block.json ae3abb1234ff2bb373ddb660e2df99e4fb2fffbd data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles.json -71214eeda01bb62bb7da30fb9ba428afaf5cb8b1 data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_tiles.json +72d2672d353c6d60a944fd042f0c5507932f8dfa data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_plating.json 0b21adcf249e97d4257f5614323eb7cbc3277c35 data/create/advancements/recipes/create.base/crafting/palettes/copper_tiles.json 4f8b8c90b7659b41f282127a0c6e509309a26200 data/create/advancements/recipes/create.base/crafting/schematics/empty_schematic.json 453c39a149831f27b4c0069fae40cb1a8c87ed5e data/create/advancements/recipes/create.base/crafting/schematics/schematic_and_quill.json d5efcd206b74c5165cbd4c2f5bb7bf3cf3eeae34 data/create/advancements/recipes/create.base/crafting/schematics/schematic_table.json cd1f66066664ed58995f8a7988fb1aa22605650b data/create/advancements/recipes/create.base/crafting/schematics/schematicannon.json 4f330e44fc9eed84ddf84d1a510ac42e2c36b058 data/create/advancements/recipes/create.base/smelting/brass_ingot_from_crushed.json -d7b126eef46e9179c10d19d247f58e74f61818bc data/create/advancements/recipes/create.base/smelting/copper_ingot_from_crushed.json -3dc1433ffd2a3b5520ed7728ad7dadc560c39d98 data/create/advancements/recipes/create.base/smelting/copper_ingot_from_ore.json b2b9c6d93ff4d912081cee2ab5e68209828cdc86 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json 16e52ba04279bcf803c5f6be46550ba5d81be1a3 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_ore.json e7134f9dd47eb9f706f1ec1bd886a14eb7d3010a data/create/advancements/recipes/create.palettes/acacia_window.json @@ -2464,9 +2447,12 @@ d759d42813afa08afa27fdc6b986ad89b735be4a data/create/advancements/recipes/decora 086d805fcd6196d25d3a82383d857c2d0782a726 data/create/advancements/recipes/food/campfire_cooking/bread.json 94422ef3a72d5454732722d0d65ba74882bd2df7 data/create/advancements/recipes/food/smelting/bread.json d40ef19fffb27cde542e0c6a5e8014a2662d211d data/create/advancements/recipes/food/smoking/bread.json +18d6171548bd5206f812e658f06e1d8835a5dd88 data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json 6e8fb3e344e829f4bca99b4281adddf9a33a2dbc data/create/advancements/recipes/misc/blasting/gold_ingot_from_crushed.json 54d51527a901b21a85692f9b0a41f0007e33f261 data/create/advancements/recipes/misc/blasting/iron_ingot_from_crushed.json 64e58d40d56b89e467d76e7805b61a795b1ba499 data/create/advancements/recipes/misc/crafting/appliances/slime_ball.json +a0889b6df1627dea4787ca340560ed5b1f50d6a0 data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json +d7b126eef46e9179c10d19d247f58e74f61818bc data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json 86944a0a96717ae6afca305ea18039fd6c34cef6 data/create/advancements/recipes/misc/smelting/gold_ingot_from_crushed.json 2599cc5ed09e70881aca4bb1550d21b4f65a9608 data/create/advancements/recipes/misc/smelting/iron_ingot_from_crushed.json a1afb005cc23607cb4d84d42664b4bc28eef9ead data/create/advancements/recipes/transportation/crafting/kinetics/furnace_minecart_from_contraption_cart.json @@ -2553,7 +2539,6 @@ d78489da8ac1699787f449afa5fde6f6873a0d9f data/create/loot_tables/blocks/controll 5834e02a77f812b24745f7b2f6a923050713740a data/create/loot_tables/blocks/copper_backtank.json 241602d74fa7a70cfd201e5963f72a30b247cf08 data/create/loot_tables/blocks/copper_block.json d851aebe28df577cce2c79100b54cff23560d026 data/create/loot_tables/blocks/copper_casing.json -ceca30b3fa5b9b800fae836d9c13842bfed1b3fb data/create/loot_tables/blocks/copper_ore.json 1d13939f23622600dc5a622a2b4d1bafa396feb5 data/create/loot_tables/blocks/copper_shingles.json 48e3b824a6269c312422090e681544ebf6700670 data/create/loot_tables/blocks/copper_tiles.json 1895a2a7d4a13f1204120702238d4b35acfe0694 data/create/loot_tables/blocks/copper_valve_handle.json @@ -2954,8 +2939,7 @@ dcdad7a04838ef202b42f84a15243e3d2472b14e data/create/recipes/andesite_pillar_fro 288d80210f7efb4664e2e9c9d9111049863e5f60 data/create/recipes/birch_window_pane.json a4a9159c349dba7269c6b32c481f1df90b9e805a data/create/recipes/blasting/aluminum_ingot_compat_silents_mechanisms.json adb384440f91411692689707d5c767c1065ac06c data/create/recipes/blasting/brass_ingot_from_crushed.json -c21420fbf2080dba5f95bdc9a19743ba09e1f1c9 data/create/recipes/blasting/copper_ingot_from_crushed.json -c6f0509618f703f1a48313e46d934bd862096699 data/create/recipes/blasting/copper_ingot_from_ore.json +7fc9cec199788a1151f9760b2e2c6eec870f830f data/create/recipes/blasting/copper_ingot_from_crushed.json d9021504be855cd2d4d91503a82b84233052adb0 data/create/recipes/blasting/gold_ingot_from_crushed.json f2307aa01ddf7accb3fe19c4d3f9b46dec1acf97 data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json 8315c188802bd64f7226a9e942be45173112c7ac data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json @@ -2998,10 +2982,10 @@ f7879d404d7a848d818278b4e788f285a9087e63 data/create/recipes/compacting/blaze_ca 7b2ef15dd28d1d8a450ea49a82dfb361d1adde4c data/create/recipes/compacting/diorite_from_flint.json 7657603e95ccf83dd0d4b104635db66e531d092a data/create/recipes/compacting/granite_from_flint.json 739a1d004c4be50cda2d706a64b797f66c3ca9c8 data/create/recipes/compacting/honey.json -b187def3a843505ab42db301f5374043d90605d6 data/create/recipes/crafting/appliances/copper_backtank.json +eb18d5972484418fa5a768633e68688ad20d2bd7 data/create/recipes/crafting/appliances/copper_backtank.json c077375d16b4505e52548613fbc9356993556e6b data/create/recipes/crafting/appliances/crafting_blueprint.json -9ad82ac5ce02654b7af7f1a570a6b2c01e140da3 data/create/recipes/crafting/appliances/diving_boots.json -813081c6421b34e161ec44e8e470994c282f76be data/create/recipes/crafting/appliances/diving_helmet.json +cba3566f09234b9cd17d8bc87dc87b2f779214e9 data/create/recipes/crafting/appliances/diving_boots.json +3e6bbbd6aa2b1373e9d6063d48560e4b547a5a5b data/create/recipes/crafting/appliances/diving_helmet.json 19526da3a59fc136654ff1bc93c0251581f397a9 data/create/recipes/crafting/appliances/dough.json 75cdbd88973a8ca943ebe890153b01a344b96b01 data/create/recipes/crafting/appliances/linked_controller.json 7b5f863dda3d05a79cb85943a178eba0bd8a7dc7 data/create/recipes/crafting/appliances/slime_ball.json @@ -3045,7 +3029,7 @@ be86df1c4d7af14bc5dcfe044d07c03b6c6d2a75 data/create/recipes/crafting/kinetics/d 73cd487885be8d5190f24319b4a927b8e34c21cd data/create/recipes/crafting/kinetics/encased_chain_drive.json b07496e4ba5bc56a2c5a395b612c68ba21328867 data/create/recipes/crafting/kinetics/encased_fan.json 0dd0cc11eaa6789fc612af3231ed247893852178 data/create/recipes/crafting/kinetics/filter.json -f4ae37f736d06ccda5fbba7831a7a174ec916a05 data/create/recipes/crafting/kinetics/fluid_pipe.json +371a80e2a93d9fb68b892db5685aaeea55f34a11 data/create/recipes/crafting/kinetics/fluid_pipe.json 86ad4d2820e8e2b01de8d977af7796119dfb7430 data/create/recipes/crafting/kinetics/fluid_tank.json 3dad2a849796df268cd3a06ed37376f2cc529957 data/create/recipes/crafting/kinetics/fluid_valve.json 84153bd478c0e63a04c77579d6595043f604b7ab data/create/recipes/crafting/kinetics/furnace_minecart_from_contraption_cart.json @@ -3164,11 +3148,9 @@ fa23f8ff9f43ed39a70a86d0c9080102d57d14b6 data/create/recipes/crafting/materials/ 6a7d69e7e6abeb643f3158c575061e3edac01421 data/create/recipes/crafting/materials/brass_ingot_from_compacting.json 7e10c06f4d77b17efb03252801d9fe189de8aefe data/create/recipes/crafting/materials/brass_ingot_from_decompacting.json 49c263368f8c02509332654c0ce97b7472d45cd3 data/create/recipes/crafting/materials/brass_nugget_from_decompacting.json -a51337920f2e261101179201c13dcb1b6ed28934 data/create/recipes/crafting/materials/copper_block_from_compacting.json 9ef75592334f5c72c889cdeb5280b6b9220b6d45 data/create/recipes/crafting/materials/copper_casing.json -67ce2cf2f99d053a3b36abaf8c466b2b58cca195 data/create/recipes/crafting/materials/copper_ingot_from_compacting.json -e0912ff39ab4e94f390b685ef873d6326a637abd data/create/recipes/crafting/materials/copper_ingot_from_decompacting.json -6fdd6922da25a4f7b50e0213b2203f6ae4c64784 data/create/recipes/crafting/materials/copper_nugget_from_decompacting.json +62ce480f3b5a2f9de27858fdde4f48cf8b91fe2c data/create/recipes/crafting/materials/copper_ingot.json +9a8cef55dc3b7cecef500bad0c7bbb86c51f4b5f data/create/recipes/crafting/materials/copper_nugget.json 7cd3500890430496381cb56c432a233f78b21a25 data/create/recipes/crafting/materials/electron_tube.json 9c9e40ffd41ce46c65113080a92ff9b4f27e5fab data/create/recipes/crafting/materials/red_sand_paper.json 7ff4df8c25b7647463a88dfd5d750a5562d5015c data/create/recipes/crafting/materials/refined_radiance_casing.json @@ -3179,8 +3161,9 @@ e1ac783d1f8fd96a1dd1088cf736e95ee3f7b025 data/create/recipes/crafting/materials/ 06cc0ec46bc5a7d2e98dbd4ece82d451c5f79de9 data/create/recipes/crafting/materials/zinc_ingot_from_compacting.json fe1d69b1e33d5748eb3c0ea732b8d67e2d612203 data/create/recipes/crafting/materials/zinc_ingot_from_decompacting.json 4b66d8769b6a7c5c294e2affd0dad4b3c70be62c data/create/recipes/crafting/materials/zinc_nugget_from_decompacting.json +160e2087dc65448e03d98978cb361f993d8f509e data/create/recipes/crafting/palettes/copper_block.json 83eb4279cce9bddd89afb939ee75d47e0aae7ceb data/create/recipes/crafting/palettes/copper_shingles.json -575e01de24b4a8327c6b140627096d6364707ec5 data/create/recipes/crafting/palettes/copper_shingles_from_tiles.json +c44b7f55e32f2e5cbfac5e5d890d4f727d00b60a data/create/recipes/crafting/palettes/copper_shingles_from_plating.json 48e6a00e9bddc8fd930278294d2cfe8fbf266b2d data/create/recipes/crafting/palettes/copper_tiles.json fe95f8f5f15edb0a5ff8da5a4757c9f8910b51bd data/create/recipes/crafting/palettes/dark_scoria.json 0b7acc249bed992387aa9702a2c05836ecf584df data/create/recipes/crafting/schematics/empty_schematic.json @@ -3193,7 +3176,7 @@ fe95f8f5f15edb0a5ff8da5a4757c9f8910b51bd data/create/recipes/crafting/palettes/d 3da7a3cdb84f44e259b5399a94ddfbf94ebebd37 data/create/recipes/crushing/blaze_rod.json 5878767e89be5a522b8f28d6a2d7b2f8566cf0dd data/create/recipes/crushing/brass_block.json b83ef0af844ca068e0353330b8273bace5b6a8c3 data/create/recipes/crushing/coal_ore.json -da4ed79975391ec9f263869936b84474f1f727d3 data/create/recipes/crushing/copper_block.json +5015cd10482b5f2db7e646e1a73fb80288a17f88 data/create/recipes/crushing/copper_block.json b576c6e51e5b6a0623e024ac90cdf4d3a9265e4b data/create/recipes/crushing/copper_ore.json 4c482db5575b74b4111800602d7fce22b2e6d32a data/create/recipes/crushing/diamond_horse_armor.json 28ba8cf655bd11bb6c600cd862b98349c812915f data/create/recipes/crushing/diamond_ore.json @@ -3455,7 +3438,7 @@ c2e15ac0c9109bad3face6d13efc32d7116b4c25 data/create/recipes/limestone_pillar_fr 599f8b87c24c131350ba7ceb69a0c8b9829c62bc data/create/recipes/mechanical_crafting/extendo_grip.json f26ed47c10cc63613759b0f8ae4ef349000de60d data/create/recipes/mechanical_crafting/flywheel.json 2dc00d6e4c159e06ab2a705e666e83e4238a7814 data/create/recipes/mechanical_crafting/furnace_engine.json -b77911c169b6205a09001a09ca074eb2234f0d29 data/create/recipes/mechanical_crafting/potato_cannon.json +fa356eb82c08339bb0064017d88b1e5b053fd4ff data/create/recipes/mechanical_crafting/potato_cannon.json 98f877bf8f3f8a686fc6cf7479a0fba5744248ce data/create/recipes/milling/allium.json 8c7e1cbc87c7ca7df2bf949957e89422fef8ad94 data/create/recipes/milling/aluminum_ore.json bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json @@ -3515,7 +3498,7 @@ eec880075efd6008b604a4b8064d782752b4bad6 data/create/recipes/milling/wool.json 2363962d6c8ad337b1fd9dfb2bd2c82388b911a5 data/create/recipes/milling/zinc_ore.json b3cc5e61bab40ca6135dc1f706f3ab447e9f78bf data/create/recipes/mixing/andesite_alloy.json ce9dc7dacb85cb23a7187c19a115b40e597ad36b data/create/recipes/mixing/andesite_alloy_from_zinc.json -3417f9399ce0fb32fc4bce94c772b40d780c9006 data/create/recipes/mixing/brass_ingot.json +5a0ff7f1284d3c5e476552170cfee2e8164fb087 data/create/recipes/mixing/brass_ingot.json ab602a53a5d8d057aad910dd1c5529cde2d587ab data/create/recipes/mixing/chocolate.json d3bf74bb3826cf2dccaf7377b8b3e0fdaa38f1aa data/create/recipes/mixing/chocolate_melting.json 0e29b4ce13750aab5a60ae54cbec8776569b35e0 data/create/recipes/mixing/chromatic_compound.json @@ -3658,7 +3641,7 @@ d51106184083761635fa902c09c45436c414ddab data/create/recipes/polished_weathered_ 7dd58714cf8fc4614ae2e1c2981471da3a52f06c data/create/recipes/polished_weathered_limestone_wall.json eae06580a0a5f486cde35426716d50fcb3ba5bb3 data/create/recipes/polished_weathered_limestone_wall_from_polished_weathered_limestone_stonecutting.json 9c8b3ec11152820acd5ee99971fd22c1484c8815 data/create/recipes/pressing/brass_ingot.json -4a51cb6066e87613c13bdc6d3427929080ef1def data/create/recipes/pressing/copper_ingot.json +3d5c154da126ad7ac0a6887ce1254f6f966ca2c3 data/create/recipes/pressing/copper_ingot.json 0fa8386648398724f6fd373178b706c6b11ddefc data/create/recipes/pressing/gold_ingot.json a104ef6eb8872a40ea7b2ef67ae54cec943162f0 data/create/recipes/pressing/iron_ingot.json 83bcbf6a56b5df3be97d86744fcfbb866879d133 data/create/recipes/pressing/path.json @@ -3687,8 +3670,7 @@ b49a0da57a179edc087eee224221ded22fd1be01 data/create/recipes/sequenced_assembly/ 4e817b521623966fa24186731a70f0e14c03168e data/create/recipes/smelting/aluminum_ingot_compat_silents_mechanisms.json ae90f50589bc06b44765ac8cbb9fbdc2b58fdb32 data/create/recipes/smelting/brass_ingot_from_crushed.json 64cbf425effba00ff2e31d95cffc2be2e0191932 data/create/recipes/smelting/bread.json -68aae31e827e192e28e1f950b0bfdeb4ec1860c7 data/create/recipes/smelting/copper_ingot_from_crushed.json -7fab4012e343cc14137f02f2a051deb813ffacf6 data/create/recipes/smelting/copper_ingot_from_ore.json +1c537423aeeb2a0a787f4499c7b339f3a5f152d1 data/create/recipes/smelting/copper_ingot_from_crushed.json c460e8e09340ff3f5b61cfd99137ea3a69de3079 data/create/recipes/smelting/dolomite.json 5cccc708796df044fdd4ed03a12b0432c75af971 data/create/recipes/smelting/gabbro.json 11857aff0104cce17a318e440b6b38cf414f7174 data/create/recipes/smelting/glass_from_framed_glass.json @@ -3826,7 +3808,7 @@ d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/blocks/toolboxes.json eac71740fb12bdb38b5dfaa2268613d7ba82b809 data/create/tags/blocks/windmill_sails.json 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/windowable.json 893a01e6004d6d8272bd1658e98da88bb572ee57 data/create/tags/blocks/wrench_pickup.json -081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data/create/tags/items/create_ingots.json +5212172aee2239136c94f9868ad39ec2e17cf1c6 data/create/tags/items/create_ingots.json 94c62bf22678ef55b2b8a5398a7960e5b00682dc data/create/tags/items/crushed_ores.json bce28787b0271382842823d04a977912a88b01c2 data/create/tags/items/sandpaper.json 6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json @@ -3836,13 +3818,11 @@ d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/items/toolboxes.json 05ca51cdc60a5e109b5a0e3b782de13d34ebcb24 data/forge/tags/blocks/cobblestone.json 16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/blocks/glass/colorless.json 81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json -4b700ee8aa748c2ec70c29ef1589844879c0deae data/forge/tags/blocks/ores.json -4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data/forge/tags/blocks/ores/copper.json +d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores.json d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores/zinc.json 55196ee770ad20602211e26864dd62a58b2e985c data/forge/tags/blocks/stone.json -508730d3822c54d355329bf6a33d58071653afad data/forge/tags/blocks/storage_blocks.json +9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/forge/tags/blocks/storage_blocks.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json -f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/blocks/storage_blocks/copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json 2072c51afc5bbc6c9d64fd086803193d8a3c40de data/forge/tags/blocks/wg_stone.json 6b73c57912934d09233ad2966110968a6109f2c9 data/forge/tags/fluids/chocolate.json @@ -3855,14 +3835,12 @@ d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/beacon_payment.js 81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/items/glass_panes.json d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/ingots.json 2dfd21017cb51d4bdc18d977a7d16f103cc3a985 data/forge/tags/items/ingots/brass.json -8e0ca32df10a50544f54fbe3dbfe485971b23315 data/forge/tags/items/ingots/copper.json 2f9ac80569a5cc168061742f9e3c36277d4d056e data/forge/tags/items/ingots/zinc.json bcf15289cbadd429a48bd9accb4d2d5f75353a61 data/forge/tags/items/nuggets.json cc82188fe8d986f4457301ed4f75ae833d263601 data/forge/tags/items/nuggets/brass.json 7affb30e30a252566a77467994b0c99331f1076c data/forge/tags/items/nuggets/copper.json 0d8cb5092ee6ec01ea09324c80d649ba05549799 data/forge/tags/items/nuggets/zinc.json -4b700ee8aa748c2ec70c29ef1589844879c0deae data/forge/tags/items/ores.json -4a0b13a9835106de9a1dd0a71a02372abb48e7b6 data/forge/tags/items/ores/copper.json +d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores.json d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/items/ores/zinc.json 5d5ec04a61ff2b1ad19210e2859a9c96cc246ef8 data/forge/tags/items/plates.json 39f0d70ec10597e85df7c4783bbc5e0e4a5ffb80 data/forge/tags/items/plates/brass.json @@ -3870,15 +3848,14 @@ c3dab5fe379bc1b7b10d4a0ba7009eee1b75a27c data/forge/tags/items/plates/copper.jso fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json 04d947ed7a5066f3cfe75a8dc564fe2dca8a9c93 data/forge/tags/items/plates/iron.json 55196ee770ad20602211e26864dd62a58b2e985c data/forge/tags/items/stone.json -508730d3822c54d355329bf6a33d58071653afad data/forge/tags/items/storage_blocks.json +9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/forge/tags/items/storage_blocks.json ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json -f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/copper.json 7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json 2072c51afc5bbc6c9d64fd086803193d8a3c40de data/minecraft/tags/blocks/base_stone_overworld.json -508730d3822c54d355329bf6a33d58071653afad data/minecraft/tags/blocks/beacon_base_blocks.json +9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json 69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json 492323734dfc7824d751b0b4afeaaa65ed205d65 data/minecraft/tags/blocks/mineable/axe.json -cc2a55f4113093544d519f3618469acae5d671b3 data/minecraft/tags/blocks/mineable/pickaxe.json +5336e84dd8843298ab415c406c1a5146c2146e5c data/minecraft/tags/blocks/mineable/pickaxe.json f937a7166c62cd33927297d47f1c338c507c6989 data/minecraft/tags/blocks/needs_iron_tool.json 6bcabbc1c0479caa80a0ebc676bb34ce0052efb0 data/minecraft/tags/blocks/rails.json 29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/blocks/slabs.json diff --git a/src/generated/resources/assets/create/blockstates/copper_ore.json b/src/generated/resources/assets/create/blockstates/copper_ore.json deleted file mode 100644 index 5e125609b..000000000 --- a/src/generated/resources/assets/create/blockstates/copper_ore.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "variants": { - "oxidization=0": { - "model": "create:block/oxidized/copper_ore_0" - }, - "oxidization=1": { - "model": "create:block/oxidized/copper_ore_1" - }, - "oxidization=2": { - "model": "create:block/oxidized/copper_ore_2" - }, - "oxidization=3": { - "model": "create:block/oxidized/copper_ore_3" - }, - "oxidization=4": { - "model": "create:block/oxidized/copper_ore_4" - }, - "oxidization=5": { - "model": "create:block/oxidized/copper_ore_5" - }, - "oxidization=6": { - "model": "create:block/oxidized/copper_ore_6" - }, - "oxidization=7": { - "model": "create:block/oxidized/copper_ore_7" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index bb1cf6853..ead8a1e87 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -63,9 +63,8 @@ "block.create.content_observer": "\u0279\u01DD\u028C\u0279\u01DDsqO \u0287u\u01DD\u0287uo\u0186", "block.create.controller_rail": "\u05DF\u0131\u0250\u1D1A \u0279\u01DD\u05DF\u05DFo\u0279\u0287uo\u0186", "block.create.copper_backtank": "\u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186", - "block.create.copper_block": "\u0279\u01DDddo\u0186 \u025Fo \u029E\u0254o\u05DF\u15FA", + "block.create.copper_block": "bu\u0131\u0287\u0250\u05DF\u0500 \u0279\u01DDddo\u0186", "block.create.copper_casing": "bu\u0131s\u0250\u0186 \u0279\u01DDddo\u0186", - "block.create.copper_ore": "\u01DD\u0279O \u0279\u01DDddo\u0186", "block.create.copper_shingles": "s\u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186", "block.create.copper_tiles": "s\u01DD\u05DF\u0131\u27D8 \u0279\u01DDddo\u0186", "block.create.copper_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B \u0279\u01DDddo\u0186", @@ -472,7 +471,6 @@ "item.create.chromatic_compound": "punod\u026Fo\u0186 \u0254\u0131\u0287\u0250\u026Fo\u0279\u0265\u0186", "item.create.cinder_flour": "\u0279no\u05DF\u2132 \u0279\u01DDpu\u0131\u0186", "item.create.copper_backtank": "\u029Eu\u0250\u0287\u029E\u0254\u0250\u15FA \u0279\u01DDddo\u0186", - "item.create.copper_ingot": "\u0287obuI \u0279\u01DDddo\u0186", "item.create.copper_nugget": "\u0287\u01DDbbnN \u0279\u01DDddo\u0186", "item.create.copper_sheet": "\u0287\u01DD\u01DD\u0265S \u0279\u01DDddo\u0186", "item.create.crafter_slot_cover": "\u0279\u01DD\u028Co\u0186 \u0287o\u05DFS \u0279\u01DD\u0287\u025F\u0250\u0279\u0186", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index ea516eddf..1a66e8d6b 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -66,9 +66,8 @@ "block.create.content_observer": "Content Observer", "block.create.controller_rail": "Controller Rail", "block.create.copper_backtank": "Copper Backtank", - "block.create.copper_block": "Block of Copper", + "block.create.copper_block": "Copper Plating", "block.create.copper_casing": "Copper Casing", - "block.create.copper_ore": "Copper Ore", "block.create.copper_shingles": "Copper Shingles", "block.create.copper_tiles": "Copper Tiles", "block.create.copper_valve_handle": "Copper Valve Handle", @@ -479,7 +478,6 @@ "item.create.chromatic_compound": "Chromatic Compound", "item.create.cinder_flour": "Cinder Flour", "item.create.copper_backtank": "Copper Backtank", - "item.create.copper_ingot": "Copper Ingot", "item.create.copper_nugget": "Copper Nugget", "item.create.copper_sheet": "Copper Sheet", "item.create.crafter_slot_cover": "Crafter Slot Cover", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 6f50401e0..4673277a0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "block.create.copper_block": "Kupfer Block", "block.create.copper_casing": "Kupferrahmen", - "block.create.copper_ore": "Kupfererz", "block.create.copper_shingles": "Kupferschindeln", "block.create.copper_tiles": "Kupferfliesen", "block.create.copper_valve_handle": "Kupfer Ventilgriff", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Chromatische Verbindung", "item.create.cinder_flour": "Aschenmehl", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", - "item.create.copper_ingot": "Kupferbarren", "item.create.copper_nugget": "Kupferklumpen", "item.create.copper_sheet": "Kupferblech", "item.create.crafter_slot_cover": "Handwerkseinheit Slot Abdeckung", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 04808ac15..d1fc7718d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "Depósito trasero de cobre", "block.create.copper_block": "Bloque de cobre", "block.create.copper_casing": "Revestidor de caliza", - "block.create.copper_ore": "Mena de cobre", "block.create.copper_shingles": "Bloque de tejas de cobre", "block.create.copper_tiles": "Bloque de baldosas de cobre", "block.create.copper_valve_handle": "Asa de válvula de cobre", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Compuesto cromático", "item.create.cinder_flour": "Harina del Nether", "item.create.copper_backtank": "Depósito trasero de cobre", - "item.create.copper_ingot": "Lingote de cobre", "item.create.copper_nugget": "Pepita de cobre", "item.create.copper_sheet": "Lámina de cobre", "item.create.crafter_slot_cover": "Tapa de ranura del ensamblador mecánico", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index efcebf00c..a79389d46 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "block.create.copper_block": "Bloc de cuivre", "block.create.copper_casing": "Revêtement en cuivre", - "block.create.copper_ore": "Minerai de cuivre", "block.create.copper_shingles": "Bardeaux de cuivre", "block.create.copper_tiles": "Tuiles en cuivre", "block.create.copper_valve_handle": "Vanne en cuivre", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Composé chromatique", "item.create.cinder_flour": "Farine de braise", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", - "item.create.copper_ingot": "Lingot de cuivre", "item.create.copper_nugget": "Pépite de cuivre", "item.create.copper_sheet": "Plaques de cuivre", "item.create.crafter_slot_cover": "Couvercle", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 32775e151..999855572 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "UNLOCALIZED: Copper Backtank", "block.create.copper_block": "Blocco di rame", "block.create.copper_casing": "Involucro di rame", - "block.create.copper_ore": "Rame grezzo", "block.create.copper_shingles": "Tegole di rame", "block.create.copper_tiles": "Piastrelle di rame", "block.create.copper_valve_handle": "Maniglia per valvola di rame", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Composto cromatico", "item.create.cinder_flour": "Cenere farinosa", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", - "item.create.copper_ingot": "Lingotto di rame", "item.create.copper_nugget": "Pepita di rame", "item.create.copper_sheet": "Lamiera di rame", "item.create.crafter_slot_cover": "Rivestimento per slot da costruzione", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index a374547a4..e47915a8e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "銅のバックタンク", "block.create.copper_block": "銅ブロック", "block.create.copper_casing": "銅ケーシング", - "block.create.copper_ore": "銅鉱石", "block.create.copper_shingles": "銅の屋根板", "block.create.copper_tiles": "銅のタイル", "block.create.copper_valve_handle": "銅のバルブハンドル", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "色彩の化合物", "item.create.cinder_flour": "ネザーラックの粉", "item.create.copper_backtank": "銅のバックタンク", - "item.create.copper_ingot": "銅インゴット", "item.create.copper_nugget": "銅塊", "item.create.copper_sheet": "銅板", "item.create.crafter_slot_cover": "クラフタースロットカバー", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index acc8fcdb5..e3ac9e39b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "구리 산소통", "block.create.copper_block": "구리 블록", "block.create.copper_casing": "구리 케이스", - "block.create.copper_ore": "구리 광석", "block.create.copper_shingles": "구리 판자", "block.create.copper_tiles": "구리 타일", "block.create.copper_valve_handle": "구리 밸브 손잡이", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "색채 혼합물", "item.create.cinder_flour": "잿가루", "item.create.copper_backtank": "구리 산소통", - "item.create.copper_ingot": "구리 주괴", "item.create.copper_nugget": "구리 조각", "item.create.copper_sheet": "구리 판", "item.create.crafter_slot_cover": "조합기 슬롯 덮개", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 538768827..bfd5727ea 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1796", + "_": "Missing Localizations: 1795", "_": "->------------------------] Game Elements [------------------------<-", @@ -67,9 +67,8 @@ "block.create.content_observer": "UNLOCALIZED: Content Observer", "block.create.controller_rail": "UNLOCALIZED: Controller Rail", "block.create.copper_backtank": "UNLOCALIZED: Copper Backtank", - "block.create.copper_block": "UNLOCALIZED: Block of Copper", + "block.create.copper_block": "UNLOCALIZED: Copper Plating", "block.create.copper_casing": "UNLOCALIZED: Copper Casing", - "block.create.copper_ore": "UNLOCALIZED: Copper Ore", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.copper_valve_handle": "UNLOCALIZED: Copper Valve Handle", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_backtank": "UNLOCALIZED: Copper Backtank", - "item.create.copper_ingot": "Koperstaaf", "item.create.copper_nugget": "Koper klompje", "item.create.copper_sheet": "UNLOCALIZED: Copper Sheet", "item.create.crafter_slot_cover": "UNLOCALIZED: Crafter Slot Cover", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index e52e1dff1..b667bc658 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "Miedziany zbiornik w plecaku", "block.create.copper_block": "Blok miedzi", "block.create.copper_casing": "Miedziana Obudowa", - "block.create.copper_ore": "Ruda miedzi", "block.create.copper_shingles": "Miedziane dachówki", "block.create.copper_tiles": "Miedziane kafelki", "block.create.copper_valve_handle": "Miedziane pokrętło", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Związek chromatyczny", "item.create.cinder_flour": "Rozżarzona mąka", "item.create.copper_backtank": "Miedziany zbiornik w plecaku", - "item.create.copper_ingot": "Sztabka miedzi", "item.create.copper_nugget": "Bryłka miedzi", "item.create.copper_sheet": "Arkusz miedzi", "item.create.crafter_slot_cover": "Przykrywka na slot stołu rzemieślniczego", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index f7cc3c0d5..d7e3b719f 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "Tanque Traseiro de Cobre", "block.create.copper_block": "Bloco de Cobre", "block.create.copper_casing": "Revestimento de Cobre", - "block.create.copper_ore": "Minério de Cobre", "block.create.copper_shingles": "UNLOCALIZED: Copper Shingles", "block.create.copper_tiles": "UNLOCALIZED: Copper Tiles", "block.create.copper_valve_handle": "Válvula de Cobre", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Composto Cromático", "item.create.cinder_flour": "Farinha de Netherrack", "item.create.copper_backtank": "Tanque Traseiro", - "item.create.copper_ingot": "Barra de Cobre", "item.create.copper_nugget": "Pepita de Cobre", "item.create.copper_sheet": "Chapa de Cobre", "item.create.crafter_slot_cover": "UNLOCALIZED: Crafter Slot Cover", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 551c1bf18..b1a7f9c25 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "Медный баллон", "block.create.copper_block": "Медный блок", "block.create.copper_casing": "Медный корпус", - "block.create.copper_ore": "Медная руда", "block.create.copper_shingles": "Медная черепица", "block.create.copper_tiles": "Медная плитка", "block.create.copper_valve_handle": "Медный ручной вентиль", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "Хроматический компаунд", "item.create.cinder_flour": "Незераковая пыль", "item.create.copper_backtank": "Медный баллон", - "item.create.copper_ingot": "Медный слиток", "item.create.copper_nugget": "Кусочек меди", "item.create.copper_sheet": "Медный лист", "item.create.crafter_slot_cover": "Крышка на слот крафтера", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index a4e164bc7..ac4106e51 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "Copper Backtank", "block.create.copper_block": "铜块", "block.create.copper_casing": "铜机壳", - "block.create.copper_ore": "铜矿石", "block.create.copper_shingles": "铜砖块", "block.create.copper_tiles": "铜砖块", "block.create.copper_valve_handle": "铜阀门手轮", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "异彩化合物", "item.create.cinder_flour": "下界面粉", "item.create.copper_backtank": "铜制背罐", - "item.create.copper_ingot": "铜锭", "item.create.copper_nugget": "铜粒", "item.create.copper_sheet": "铜板", "item.create.crafter_slot_cover": "合成器盖板", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index c0e162c02..181454afc 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -69,7 +69,6 @@ "block.create.copper_backtank": "銅製後背包", "block.create.copper_block": "銅磚", "block.create.copper_casing": "銅機殼", - "block.create.copper_ore": "銅礦石", "block.create.copper_shingles": "塊狀銅磚", "block.create.copper_tiles": "菱形銅磚", "block.create.copper_valve_handle": "銅製閥門開關", @@ -480,7 +479,6 @@ "item.create.chromatic_compound": "異彩化合物", "item.create.cinder_flour": "地獄麵粉", "item.create.copper_backtank": "銅製後背包", - "item.create.copper_ingot": "銅錠", "item.create.copper_nugget": "銅粒", "item.create.copper_sheet": "銅板", "item.create.crafter_slot_cover": "合成器蓋板", diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_0.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_0.json deleted file mode 100644 index 8d79f6690..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_0" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_1.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_1.json deleted file mode 100644 index 77b9b712d..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_2.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_2.json deleted file mode 100644 index 3559db606..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_2" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_3.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_3.json deleted file mode 100644 index e1ee86560..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_3" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_4.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_4.json deleted file mode 100644 index a9ec80571..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_4" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_5.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_5.json deleted file mode 100644 index b8cd3f292..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_5" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_6.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_6.json deleted file mode 100644 index ef2b2a68a..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_6" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_7.json b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_7.json deleted file mode 100644 index 3da5f2b8e..000000000 --- a/src/generated/resources/assets/create/models/block/oxidized/copper_ore_7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "create:block/oxidized/copper_ore_7" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_ingot.json b/src/generated/resources/assets/create/models/item/copper_ingot.json deleted file mode 100644 index a9c71cea3..000000000 --- a/src/generated/resources/assets/create/models/item/copper_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "create:item/copper_ingot" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_ore.json b/src/generated/resources/assets/create/models/item/copper_ore.json deleted file mode 100644 index d62f6c3ed..000000000 --- a/src/generated/resources/assets/create/models/item/copper_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "create:block/oxidized/copper_ore_0" -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json index cec124115..6134a2525 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/copper_backtank.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json index 1151c46ef..d0d7f07e1 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_boots.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json index 91f879caa..5491317c8 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/appliances/diving_helmet.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json index db57fc099..4f32ada9c 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json index a90d4393a..fb2db1564 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/copper_valve_handle_from_others.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json index f4703e0d7..c5bd18402 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_pipe.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json index 75d57d1cb..7580a2170 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/fluid_valve.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json index bf53aa381..5ec077eba 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json index 739f21b8b..7874aeac9 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/mechanical_pump.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json index a1ade7524..dcd4c9720 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/smart_fluid_pipe.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_casing.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_casing.json index 138691b87..bebda2bed 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_casing.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_casing.json @@ -11,7 +11,9 @@ "conditions": { "items": [ { - "tag": "forge:ingots/copper" + "items": [ + "minecraft:copper_ingot" + ] } ] } diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_decompacting.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_decompacting.json deleted file mode 100644 index b8c9b3737..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_decompacting.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/materials/copper_ingot_from_decompacting" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "create:copper_block" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/materials/copper_ingot_from_decompacting" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_block_from_compacting.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json similarity index 73% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_block_from_compacting.json rename to src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json index 3982ba3ce..eca001c18 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_block_from_compacting.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:crafting/materials/copper_block_from_compacting" + "create:crafting/materials/copper_nugget" ] }, "criteria": { @@ -12,7 +12,7 @@ "items": [ { "items": [ - "create:copper_ingot" + "minecraft:copper_ingot" ] } ] @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:crafting/materials/copper_block_from_compacting" + "recipe": "create:crafting/materials/copper_nugget" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget_from_decompacting.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget_from_decompacting.json deleted file mode 100644 index a037c8302..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_nugget_from_decompacting.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:crafting/materials/copper_nugget_from_decompacting" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "create:copper_ingot" - ] - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:crafting/materials/copper_nugget_from_decompacting" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/copper_ingot_from_ore.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_block.json similarity index 75% rename from src/generated/resources/data/create/advancements/recipes/create.base/blasting/copper_ingot_from_ore.json rename to src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_block.json index 3a12efed5..91255abb2 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/copper_ingot_from_ore.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_block.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:blasting/copper_ingot_from_ore" + "create:crafting/palettes/copper_block" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "forge:ores/copper" + "tag": "forge:plates/copper" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:blasting/copper_ingot_from_ore" + "recipe": "create:crafting/palettes/copper_block" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_tiles.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_plating.json similarity index 88% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_tiles.json rename to src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_plating.json index 31eab5581..3fd967f7f 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_tiles.json +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/palettes/copper_shingles_from_plating.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:crafting/palettes/copper_shingles_from_tiles" + "create:crafting/palettes/copper_shingles_from_plating" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:crafting/palettes/copper_shingles_from_tiles" + "recipe": "create:crafting/palettes/copper_shingles_from_plating" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/copper_ingot_from_ore.json b/src/generated/resources/data/create/advancements/recipes/create.base/smelting/copper_ingot_from_ore.json deleted file mode 100644 index ee4c33734..000000000 --- a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/copper_ingot_from_ore.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "rewards": { - "recipes": [ - "create:smelting/copper_ingot_from_ore" - ] - }, - "criteria": { - "has_item": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "tag": "forge:ores/copper" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "create:smelting/copper_ingot_from_ore" - } - } - }, - "requirements": [ - [ - "has_item", - "has_the_recipe" - ] - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/blasting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/blasting/copper_ingot_from_crushed.json rename to src/generated/resources/data/create/advancements/recipes/misc/blasting/copper_ingot_from_crushed.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_compacting.json b/src/generated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json similarity index 78% rename from src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_compacting.json rename to src/generated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json index 71aaa0839..94ac5cb7b 100644 --- a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/materials/copper_ingot_from_compacting.json +++ b/src/generated/resources/data/create/advancements/recipes/misc/crafting/materials/copper_ingot.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "create:crafting/materials/copper_ingot_from_compacting" + "create:crafting/materials/copper_ingot" ] }, "criteria": { @@ -21,7 +21,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "create:crafting/materials/copper_ingot_from_compacting" + "recipe": "create:crafting/materials/copper_ingot" } } }, diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/smelting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json similarity index 100% rename from src/generated/resources/data/create/advancements/recipes/create.base/smelting/copper_ingot_from_crushed.json rename to src/generated/resources/data/create/advancements/recipes/misc/smelting/copper_ingot_from_crushed.json diff --git a/src/generated/resources/data/create/loot_tables/blocks/copper_ore.json b/src/generated/resources/data/create/loot_tables/blocks/copper_ore.json deleted file mode 100644 index 46c31f4fd..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/copper_ore.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1.0, - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "name": "create:copper_ore" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "functions": [] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json index 6afa9b361..dd803ed81 100644 --- a/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json +++ b/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_crushed.json @@ -3,7 +3,7 @@ "ingredient": { "item": "create:crushed_copper_ore" }, - "result": "create:copper_ingot", + "result": "minecraft:copper_ingot", "experience": 0.1, "cookingtime": 100 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_ore.json b/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_ore.json deleted file mode 100644 index 3c3da8e41..000000000 --- a/src/generated/resources/data/create/recipes/blasting/copper_ingot_from_ore.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:blasting", - "ingredient": { - "tag": "forge:ores/copper" - }, - "result": "create:copper_ingot", - "experience": 0.1, - "cookingtime": 100 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json b/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json index 66a29e031..eb244798b 100644 --- a/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json +++ b/src/generated/resources/data/create/recipes/crafting/appliances/copper_backtank.json @@ -13,10 +13,10 @@ "item": "create:andesite_alloy" }, "B": { - "tag": "forge:storage_blocks/copper" + "item": "minecraft:copper_block" }, "P": { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/diving_boots.json b/src/generated/resources/data/create/recipes/crafting/appliances/diving_boots.json index 790d1fd91..8ea573d10 100644 --- a/src/generated/resources/data/create/recipes/crafting/appliances/diving_boots.json +++ b/src/generated/resources/data/create/recipes/crafting/appliances/diving_boots.json @@ -10,7 +10,7 @@ "item": "create:andesite_alloy" }, "P": { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/appliances/diving_helmet.json b/src/generated/resources/data/create/recipes/crafting/appliances/diving_helmet.json index ebc49ae69..c2434ae43 100644 --- a/src/generated/resources/data/create/recipes/crafting/appliances/diving_helmet.json +++ b/src/generated/resources/data/create/recipes/crafting/appliances/diving_helmet.json @@ -9,7 +9,7 @@ "tag": "forge:glass" }, "P": { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json b/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json index 5e5ed0cc0..1424a0d14 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/fluid_pipe.json @@ -8,7 +8,7 @@ "tag": "forge:plates/copper" }, "C": { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/materials/copper_block_from_compacting.json b/src/generated/resources/data/create/recipes/crafting/materials/copper_block_from_compacting.json deleted file mode 100644 index 1ef586c30..000000000 --- a/src/generated/resources/data/create/recipes/crafting/materials/copper_block_from_compacting.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], - "key": { - "#": { - "tag": "forge:ingots/copper" - } - }, - "result": { - "item": "create:copper_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/materials/copper_ingot_from_compacting.json b/src/generated/resources/data/create/recipes/crafting/materials/copper_ingot.json similarity index 63% rename from src/generated/resources/data/create/recipes/crafting/materials/copper_ingot_from_compacting.json rename to src/generated/resources/data/create/recipes/crafting/materials/copper_ingot.json index 77b6a3625..8231b1e66 100644 --- a/src/generated/resources/data/create/recipes/crafting/materials/copper_ingot_from_compacting.json +++ b/src/generated/resources/data/create/recipes/crafting/materials/copper_ingot.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "###", - "###", - "###" + "CCC", + "CCC", + "CCC" ], "key": { - "#": { + "C": { "tag": "forge:nuggets/copper" } }, "result": { - "item": "create:copper_ingot" + "item": "minecraft:copper_ingot" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/materials/copper_nugget_from_decompacting.json b/src/generated/resources/data/create/recipes/crafting/materials/copper_nugget.json similarity index 79% rename from src/generated/resources/data/create/recipes/crafting/materials/copper_nugget_from_decompacting.json rename to src/generated/resources/data/create/recipes/crafting/materials/copper_nugget.json index b7fbc41dc..e97ffa7ff 100644 --- a/src/generated/resources/data/create/recipes/crafting/materials/copper_nugget_from_decompacting.json +++ b/src/generated/resources/data/create/recipes/crafting/materials/copper_nugget.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } ], "result": { diff --git a/src/generated/resources/data/create/recipes/crafting/materials/copper_ingot_from_decompacting.json b/src/generated/resources/data/create/recipes/crafting/palettes/copper_block.json similarity index 51% rename from src/generated/resources/data/create/recipes/crafting/materials/copper_ingot_from_decompacting.json rename to src/generated/resources/data/create/recipes/crafting/palettes/copper_block.json index ade5608b9..1139f3250 100644 --- a/src/generated/resources/data/create/recipes/crafting/materials/copper_ingot_from_decompacting.json +++ b/src/generated/resources/data/create/recipes/crafting/palettes/copper_block.json @@ -2,11 +2,10 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "tag": "forge:storage_blocks/copper" + "item": "create:copper_tiles" } ], "result": { - "item": "create:copper_ingot", - "count": 9 + "item": "create:copper_block" } } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/palettes/copper_shingles_from_tiles.json b/src/generated/resources/data/create/recipes/crafting/palettes/copper_shingles_from_plating.json similarity index 79% rename from src/generated/resources/data/create/recipes/crafting/palettes/copper_shingles_from_tiles.json rename to src/generated/resources/data/create/recipes/crafting/palettes/copper_shingles_from_plating.json index 697c492aa..3963b6c37 100644 --- a/src/generated/resources/data/create/recipes/crafting/palettes/copper_shingles_from_tiles.json +++ b/src/generated/resources/data/create/recipes/crafting/palettes/copper_shingles_from_plating.json @@ -2,7 +2,7 @@ "type": "minecraft:crafting_shapeless", "ingredients": [ { - "item": "create:copper_tiles" + "item": "create:copper_block" } ], "result": { diff --git a/src/generated/resources/data/create/recipes/crushing/copper_block.json b/src/generated/resources/data/create/recipes/crushing/copper_block.json index 7965a3dbb..5b7abcc76 100644 --- a/src/generated/resources/data/create/recipes/crushing/copper_block.json +++ b/src/generated/resources/data/create/recipes/crushing/copper_block.json @@ -2,7 +2,7 @@ "type": "create:crushing", "ingredients": [ { - "tag": "forge:storage_blocks/copper" + "item": "minecraft:copper_block" } ], "results": [ diff --git a/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json b/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json index a21d9bd04..316d85a1f 100644 --- a/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json +++ b/src/generated/resources/data/create/recipes/mechanical_crafting/potato_cannon.json @@ -15,7 +15,7 @@ "item": "create:fluid_pipe" }, "C": { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } }, "result": { diff --git a/src/generated/resources/data/create/recipes/mixing/brass_ingot.json b/src/generated/resources/data/create/recipes/mixing/brass_ingot.json index 94183eb22..f8f998109 100644 --- a/src/generated/resources/data/create/recipes/mixing/brass_ingot.json +++ b/src/generated/resources/data/create/recipes/mixing/brass_ingot.json @@ -2,7 +2,7 @@ "type": "create:mixing", "ingredients": [ { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" }, { "tag": "forge:ingots/zinc" diff --git a/src/generated/resources/data/create/recipes/pressing/copper_ingot.json b/src/generated/resources/data/create/recipes/pressing/copper_ingot.json index 404bb276d..c8afab545 100644 --- a/src/generated/resources/data/create/recipes/pressing/copper_ingot.json +++ b/src/generated/resources/data/create/recipes/pressing/copper_ingot.json @@ -2,7 +2,7 @@ "type": "create:pressing", "ingredients": [ { - "tag": "forge:ingots/copper" + "item": "minecraft:copper_ingot" } ], "results": [ diff --git a/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json b/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json index e6875b970..3ce7bf74a 100644 --- a/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json +++ b/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_crushed.json @@ -3,7 +3,7 @@ "ingredient": { "item": "create:crushed_copper_ore" }, - "result": "create:copper_ingot", + "result": "minecraft:copper_ingot", "experience": 0.1, "cookingtime": 200 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_ore.json b/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_ore.json deleted file mode 100644 index 5ad042b91..000000000 --- a/src/generated/resources/data/create/recipes/smelting/copper_ingot_from_ore.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "type": "minecraft:smelting", - "ingredient": { - "tag": "forge:ores/copper" - }, - "result": "create:copper_ingot", - "experience": 0.1, - "cookingtime": 200 -} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/create_ingots.json b/src/generated/resources/data/create/tags/items/create_ingots.json index c407a2e9a..0a0d86199 100644 --- a/src/generated/resources/data/create/tags/items/create_ingots.json +++ b/src/generated/resources/data/create/tags/items/create_ingots.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "create:copper_ingot", "create:zinc_ingot", "create:brass_ingot" ] diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/blocks/ores.json index dc8820ef1..9389dcb95 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores.json +++ b/src/generated/resources/data/forge/tags/blocks/ores.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "create:copper_ore", "create:zinc_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/copper.json b/src/generated/resources/data/forge/tags/blocks/ores/copper.json deleted file mode 100644 index 4b386dbe0..000000000 --- a/src/generated/resources/data/forge/tags/blocks/ores/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json index fd18acec8..a1b3ce3d3 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "create:copper_block", "create:zinc_block", "create:brass_block" ] diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json deleted file mode 100644 index 0b5561d1f..000000000 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/copper.json b/src/generated/resources/data/forge/tags/items/ingots/copper.json deleted file mode 100644 index 2617d2aeb..000000000 --- a/src/generated/resources/data/forge/tags/items/ingots/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_ingot" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json index dc8820ef1..9389dcb95 100644 --- a/src/generated/resources/data/forge/tags/items/ores.json +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "create:copper_ore", "create:zinc_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/copper.json b/src/generated/resources/data/forge/tags/items/ores/copper.json deleted file mode 100644 index 4b386dbe0..000000000 --- a/src/generated/resources/data/forge/tags/items/ores/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_ore" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json index fd18acec8..a1b3ce3d3 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "create:copper_block", "create:zinc_block", "create:brass_block" ] diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json deleted file mode 100644 index 0b5561d1f..000000000 --- a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "create:copper_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json index fd18acec8..a1b3ce3d3 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json +++ b/src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "create:copper_block", "create:zinc_block", "create:brass_block" ] 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 9589418b2..ead4cdaca 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -135,7 +135,6 @@ "create:copper_backtank", "create:peculiar_bell", "create:haunted_bell", - "create:copper_ore", "create:zinc_ore", "create:copper_block", "create:copper_shingles", diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 814489d72..56dad46de 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -1496,18 +1496,6 @@ public class AllBlocks { REGISTRATE.startSection(AllSections.MATERIALS); } - public static final BlockEntry COPPER_ORE = - REGISTRATE.block("copper_ore", p -> new OxidizingBlock(p, 1)) - .initialProperties(() -> Blocks.IRON_ORE) - .properties(p -> p.requiresCorrectToolForDrops()) - .transform(pickaxeOnly()) - .transform(oxidizedBlockstate()) - .tag(Tags.Blocks.ORES) - .transform(tagBlockAndItem("ores/copper")) - .tag(Tags.Items.ORES) - .transform(oxidizedItemModel()) - .register(); - public static final BlockEntry ZINC_ORE = REGISTRATE.block("zinc_ore", Block::new) .initialProperties(() -> Blocks.GOLD_BLOCK) .properties(p -> p.requiresCorrectToolForDrops() @@ -1520,18 +1508,15 @@ public class AllBlocks { .build() .register(); - public static final BlockEntry COPPER_BLOCK = + public static final BlockEntry COPPER_PLATING = REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f)) .initialProperties(() -> Blocks.IRON_BLOCK) .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem("storage_blocks/copper")) - .tag(Tags.Items.STORAGE_BLOCKS) + .item() .transform(oxidizedItemModel()) .transform(oxidizedBlockstate()) - .lang("Block of Copper") + .lang("Copper Plating") .register(); public static final BlockEntry COPPER_SHINGLES = diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index efde80ffa..e46c7715b 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -139,7 +139,6 @@ public class AllItems { .register(); public static final ItemEntry ANDESITE_ALLOY = ingredient("andesite_alloy"), - COPPER_INGOT = taggedIngredient("copper_ingot", forgeItemTag("ingots/copper"), CREATE_INGOTS.tag), ZINC_INGOT = taggedIngredient("zinc_ingot", forgeItemTag("ingots/zinc"), CREATE_INGOTS.tag), BRASS_INGOT = taggedIngredient("brass_ingot", forgeItemTag("ingots/brass"), CREATE_INGOTS.tag); diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java b/src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java index 8182d7198..db63cb334 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/AllArmorMaterials.java @@ -2,13 +2,13 @@ package com.simibubi.create.content.curiosities.armor; import java.util.function.Supplier; -import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import net.minecraft.sounds.SoundEvent; import net.minecraft.util.LazyLoadedValue; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -16,7 +16,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; public enum AllArmorMaterials implements ArmorMaterial { COPPER("copper", 7, new int[] { 1, 3, 4, 2 }, 25, AllSoundEvents.COPPER_ARMOR_EQUIP.getMainEvent(), 0.0F, 0.0F, - () -> Ingredient.of(AllItems.COPPER_INGOT.get())) + () -> Ingredient.of(Items.COPPER_INGOT)) ; diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java index e8ad450ca..131c7bcd9 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CreateRecipeProvider.java @@ -15,6 +15,7 @@ import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; import net.minecraftforge.common.Tags; @@ -127,8 +128,8 @@ public abstract class CreateRecipeProvider extends RecipeProvider { return AllItems.PRECISION_MECHANISM.get(); } - static Tag.Named copperBlock() { - return AllTags.forgeItemTag("storage_blocks/copper"); + static ItemLike copperBlock() { + return Items.COPPER_BLOCK; } static Tag.Named brassBlock() { @@ -139,8 +140,8 @@ public abstract class CreateRecipeProvider extends RecipeProvider { return AllTags.forgeItemTag("storage_blocks/zinc"); } - static Tag.Named copper() { - return AllTags.forgeItemTag("ingots/copper"); + static ItemLike copper() { + return Items.COPPER_INGOT; } static Tag.Named copperSheet() { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java index fa14b8cca..148960546 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java @@ -68,9 +68,15 @@ public class StandardRecipeGen extends CreateRecipeProvider { GeneratedRecipe - COPPER_COMPACTING = - metalCompacting(ImmutableList.of(AllItems.COPPER_NUGGET, AllItems.COPPER_INGOT, AllBlocks.COPPER_BLOCK), - ImmutableList.of(I::copperNugget, I::copper, I::copperBlock)), + COPPER_NUGGET = create(AllItems.COPPER_NUGGET).returns(9) + .unlockedBy(() -> Items.COPPER_INGOT) + .viaShapeless(b -> b.requires(I.copper())), + + COPPER_INGOT = create(() -> Items.COPPER_INGOT).unlockedBy(AllItems.COPPER_NUGGET::get) + .viaShaped(b -> b.define('C', I.copperNugget()) + .pattern("CCC") + .pattern("CCC") + .pattern("CCC")), BRASS_COMPACTING = metalCompacting(ImmutableList.of(AllItems.BRASS_NUGGET, AllItems.BRASS_INGOT, AllBlocks.BRASS_BLOCK), @@ -112,7 +118,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("AAA")), COPPER_CASING = create(AllBlocks.COPPER_CASING).returns(4) - .unlockedByTag(I::copper) + .unlockedBy(I::copper) .viaShaped(b -> b.define('A', ItemTags.PLANKS) .define('C', I.copperSheet()) .define('S', ItemTags.LOGS) @@ -385,14 +391,14 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("CCC") .pattern(" A")), - COPPER_VALVE_HANDLE = create(AllBlocks.COPPER_VALVE_HANDLE).unlockedByTag(I::copper) + COPPER_VALVE_HANDLE = create(AllBlocks.COPPER_VALVE_HANDLE).unlockedBy(I::copper) .viaShaped(b -> b.define('S', I.andesite()) .define('C', I.copperSheet()) .pattern("CCC") .pattern(" S ")), COPPER_VALVE_HANDLE_FROM_OTHER_HANDLES = create(AllBlocks.COPPER_VALVE_HANDLE).withSuffix("_from_others") - .unlockedByTag(I::copper) + .unlockedBy(I::copper) .viaShapeless(b -> b.requires(AllItemTags.VALVE_HANDLES.tag)), NOZZLE = create(AllBlocks.NOZZLE).unlockedBy(AllBlocks.ENCASED_FAN::get) @@ -487,18 +493,18 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("PCP")), FLUID_PIPE = create(AllBlocks.FLUID_PIPE).returns(8) - .unlockedByTag(I::copper) + .unlockedBy(I::copper) .viaShaped(b -> b.define('S', I.copperSheet()) .define('C', I.copper()) .pattern("SCS")), - MECHANICAL_PUMP = create(AllBlocks.MECHANICAL_PUMP).unlockedByTag(I::copper) + MECHANICAL_PUMP = create(AllBlocks.MECHANICAL_PUMP).unlockedBy(I::copper) .viaShaped(b -> b.define('P', I.cog()) .define('S', AllBlocks.FLUID_PIPE.get()) .pattern("P") .pattern("S")), - SMART_FLUID_PIPE = create(AllBlocks.SMART_FLUID_PIPE).unlockedByTag(I::copper) + SMART_FLUID_PIPE = create(AllBlocks.SMART_FLUID_PIPE).unlockedBy(I::copper) .viaShaped(b -> b.define('P', I.electronTube()) .define('S', AllBlocks.FLUID_PIPE.get()) .define('I', I.brassSheet()) @@ -506,7 +512,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("S") .pattern("P")), - FLUID_VALVE = create(AllBlocks.FLUID_VALVE).unlockedByTag(I::copper) + FLUID_VALVE = create(AllBlocks.FLUID_VALVE).unlockedBy(I::copper) .viaShaped(b -> b.define('P', I.shaft()) .define('S', AllBlocks.FLUID_PIPE.get()) .define('I', I.ironSheet()) @@ -567,7 +573,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("SCS") .pattern(" I ")), - HOSE_PULLEY = create(AllBlocks.HOSE_PULLEY).unlockedByTag(I::copper) + HOSE_PULLEY = create(AllBlocks.HOSE_PULLEY).unlockedBy(I::copper) .viaShaped(b -> b.define('S', I.shaft()) .define('P', AllBlocks.FLUID_PIPE.get()) .define('B', I.copperCasing()) @@ -948,12 +954,15 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("##") .pattern("##")), - COPPER_SHINGLES_FROM_TILES = create(AllBlocks.COPPER_SHINGLES).withSuffix("_from_tiles") + COPPER_SHINGLES_FROM_TILES = create(AllBlocks.COPPER_SHINGLES).withSuffix("_from_plating") .unlockedByTag(I::copperSheet) - .viaShapeless(b -> b.requires(AllBlocks.COPPER_TILES.get())), + .viaShapeless(b -> b.requires(AllBlocks.COPPER_PLATING.get())), COPPER_TILES = create(AllBlocks.COPPER_TILES).unlockedByTag(I::copperSheet) - .viaShapeless(b -> b.requires(AllBlocks.COPPER_SHINGLES.get())) + .viaShapeless(b -> b.requires(AllBlocks.COPPER_SHINGLES.get())), + + COPPER_PLATING = create(AllBlocks.COPPER_PLATING).unlockedByTag(I::copperSheet) + .viaShapeless(b -> b.requires(AllBlocks.COPPER_TILES.get())) ; @@ -965,13 +974,13 @@ public class StandardRecipeGen extends CreateRecipeProvider { .viaShapeless(b -> b.requires(AllItems.WHEAT_FLOUR.get()) .requires(Items.WATER_BUCKET)), - DIVING_HELMET = create(AllItems.DIVING_HELMET).unlockedByTag(I::copper) + DIVING_HELMET = create(AllItems.DIVING_HELMET).unlockedBy(I::copper) .viaShaped(b -> b.define('G', Tags.Items.GLASS) .define('P', I.copper()) .pattern("PPP") .pattern("PGP")), - COPPER_BACKTANK = create(AllItems.COPPER_BACKTANK).unlockedByTag(I::copper) + COPPER_BACKTANK = create(AllItems.COPPER_BACKTANK).unlockedBy(I::copper) .viaShaped(b -> b.define('G', I.shaft()) .define('A', I.andesite()) .define('B', I.copperBlock()) @@ -980,7 +989,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { .pattern("PBP") .pattern(" P ")), - DIVING_BOOTS = create(AllItems.DIVING_BOOTS).unlockedByTag(I::copper) + DIVING_BOOTS = create(AllItems.DIVING_BOOTS).unlockedBy(I::copper) .viaShaped(b -> b.define('G', I.andesite()) .define('P', I.copper()) .pattern("P P") @@ -1039,11 +1048,10 @@ public class StandardRecipeGen extends CreateRecipeProvider { VERTICAL_FRAMED_GLASS_PANE = recycleGlassPane(AllPaletteBlocks.VERTICAL_FRAMED_GLASS_PANE), HORIZONTAL_FRAMED_GLASS_PANE = recycleGlassPane(AllPaletteBlocks.HORIZONTAL_FRAMED_GLASS_PANE), - COPPER_ORE = blastMetalOre(AllItems.COPPER_INGOT::get, AllTags.forgeItemTag("ores/copper")), ZINC_ORE = blastMetalOre(AllItems.ZINC_INGOT::get, AllTags.forgeItemTag("ores/zinc")), CRUSHED_IRON = blastCrushedMetal(() -> Items.IRON_INGOT, AllItems.CRUSHED_IRON::get), CRUSHED_GOLD = blastCrushedMetal(() -> Items.GOLD_INGOT, AllItems.CRUSHED_GOLD::get), - CRUSHED_COPPER = blastCrushedMetal(AllItems.COPPER_INGOT::get, AllItems.CRUSHED_COPPER::get), + CRUSHED_COPPER = blastCrushedMetal(() -> Items.COPPER_INGOT, AllItems.CRUSHED_COPPER::get), CRUSHED_ZINC = blastCrushedMetal(AllItems.ZINC_INGOT::get, AllItems.CRUSHED_ZINC::get), CRUSHED_BRASS = blastCrushedMetal(AllItems.BRASS_INGOT::get, AllItems.CRUSHED_BRASS::get), @@ -1087,7 +1095,8 @@ public class StandardRecipeGen extends CreateRecipeProvider { return create(result::get); } - GeneratedRecipe createSpecial(Supplier> serializer, String recipeType, String path) { + GeneratedRecipe createSpecial(Supplier> serializer, String recipeType, + String path) { ResourceLocation location = Create.asResource(recipeType + "/" + currentFolder + "/" + path); return register(consumer -> { SpecialRecipeBuilder b = SpecialRecipeBuilder.special(serializer.get()); @@ -1095,8 +1104,7 @@ public class StandardRecipeGen extends CreateRecipeProvider { }); } - GeneratedRecipe blastCrushedMetal(Supplier result, - Supplier ingredient) { + GeneratedRecipe blastCrushedMetal(Supplier result, Supplier ingredient) { return create(result::get).withSuffix("_from_crushed") .viaCooking(ingredient::get) .rewardXP(.1f) @@ -1342,8 +1350,8 @@ public class StandardRecipeGen extends CreateRecipeProvider { return register(consumer -> { boolean isOtherMod = compatDatagenOutput != null; - SimpleCookingRecipeBuilder b = builder - .apply(SimpleCookingRecipeBuilder.cooking(ingredient.get(), isOtherMod ? Items.DIRT : result.get(), + SimpleCookingRecipeBuilder b = builder.apply( + SimpleCookingRecipeBuilder.cooking(ingredient.get(), isOtherMod ? Items.DIRT : result.get(), exp, (int) (cookingTime * cookingTimeModifier), serializer)); if (unlockedBy != null) b.unlockedBy("has_item", inventoryTrigger(unlockedBy.get())); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java index a38f3bc2f..1a1fb5fe9 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/ArmScenes.java @@ -1,7 +1,6 @@ package com.simibubi.create.foundation.ponder.content; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; @@ -116,7 +115,7 @@ public class ArmScenes { scene.effects.indicateSuccess(armPos); scene.world.showSection(util.select.fromTo(2, 1, 5, 2, 1, 3) .add(util.select.position(2, 0, 5)), Direction.DOWN); - ItemStack copper = AllItems.COPPER_INGOT.asStack(); + ItemStack copper = new ItemStack(Items.COPPER_INGOT); scene.world.createItemOnBeltLike(inputDepot, Direction.SOUTH, copper); scene.idle(10); @@ -157,7 +156,7 @@ public class ArmScenes { inputDepot = util.grid.at(1, 3, 4); outputDepot = util.grid.at(1, 1, 0); - copper = AllBlocks.COPPER_BLOCK.asStack(); + copper = new ItemStack(Items.COPPER_BLOCK); scene.world.createItemOnBeltLike(inputDepot, Direction.SOUTH, copper); scene.idle(20); scene.world.instructArm(armPos, Phase.MOVE_TO_INPUT, ItemStack.EMPTY, 2); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java index 3966fb4f9..545e31cc2 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/BeltScenes.java @@ -332,7 +332,7 @@ public class BeltScenes { scene.idle(10); scene.special.movePointOfInterest(util.grid.at(2, 2, 0)); - ItemStack stack = AllBlocks.COPPER_BLOCK.asStack(); + ItemStack stack = new ItemStack(Items.COPPER_BLOCK); ElementLink item = scene.world.createItemEntity(util.vector.centerOf(0, 4, 2), util.vector.of(0, 0, 0), stack); scene.idle(13); @@ -496,9 +496,9 @@ public class BeltScenes { scene.idle(70); scene.overlay.showControls(new InputWindowElement(topOf, Pointing.DOWN).rightClick() - .withItem(AllBlocks.COPPER_BLOCK.asStack()), 20); + .withItem(new ItemStack(Items.COPPER_BLOCK)), 20); scene.idle(7); - scene.world.createItemOnBeltLike(depotPos, Direction.NORTH, AllBlocks.COPPER_BLOCK.asStack()); + scene.world.createItemOnBeltLike(depotPos, Direction.NORTH, new ItemStack(Items.COPPER_BLOCK)); scene.idle(10); scene.overlay.showText(70) .attachKeyFrame() @@ -539,7 +539,7 @@ public class BeltScenes { BlockPos pressPos = depotPos.above(2) .west(); - ItemStack copper = AllItems.COPPER_INGOT.asStack(); + ItemStack copper = new ItemStack(Items.COPPER_INGOT); scene.world.createItemOnBeltLike(depotPos, Direction.NORTH, copper); Vec3 depotCenter = util.vector.centerOf(depotPos); scene.idle(10); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java index 9e44828ae..899db4353 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/ChuteScenes.java @@ -41,7 +41,7 @@ public class ChuteScenes { scene.world.moveSection(top, util.vector.of(0, 0, -1), 0); scene.idle(20); - ItemStack stack = AllBlocks.COPPER_BLOCK.asStack(); + ItemStack stack = new ItemStack(Items.COPPER_BLOCK); scene.world.createItemEntity(util.vector.centerOf(util.grid.at(3, 3, 2)), util.vector.of(0, -0.1, 0), stack); scene.idle(20); ElementLink remove = @@ -171,7 +171,7 @@ public class ChuteScenes { scene.world.showSection(util.select.fromTo(2, 2, 2, 4, 1, 5) .add(util.select.position(3, 0, 5)), Direction.DOWN); - ItemStack stack = AllBlocks.COPPER_BLOCK.asStack(); + ItemStack stack = new ItemStack(Items.COPPER_BLOCK); scene.world.createItemOnBelt(util.grid.at(4, 1, 2), Direction.EAST, stack); scene.idle(10); scene.rotateCameraY(60); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java index 5125b2b6b..9aa632f3d 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/DebugScenes.java @@ -25,6 +25,7 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; @@ -395,7 +396,7 @@ public class DebugScenes { scene.world.showSection(util.select.layersFrom(1), Direction.DOWN); ItemStack brassItem = AllItems.BRASS_INGOT.asStack(); - ItemStack copperItem = AllItems.COPPER_INGOT.asStack(); + ItemStack copperItem = new ItemStack(Items.COPPER_INGOT); for (int z = 4; z >= 2; z--) { scene.world.createItemEntity(util.vector.centerOf(0, 4, z), Vec3.ZERO, brassItem.copy()); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java index 8b27f6d6b..2b71a8261 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/EjectorScenes.java @@ -1,7 +1,6 @@ package com.simibubi.create.foundation.ponder.content; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.simibubi.create.content.logistics.block.depot.EjectorTileEntity; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.ponder.ElementLink; @@ -19,6 +18,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; import net.minecraftforge.items.ItemHandlerHelper; @@ -114,8 +114,8 @@ public class EjectorScenes { .placeNearTarget(); scene.idle(60); - ItemStack copperBlock = AllBlocks.COPPER_BLOCK.asStack(); - ItemStack copperIngot = AllItems.COPPER_INGOT.asStack(); + ItemStack copperBlock = new ItemStack(Items.COPPER_BLOCK); + ItemStack copperIngot = new ItemStack(Items.COPPER_INGOT); scene.overlay.showControls(new InputWindowElement(util.vector.topOf(ejectorPos) .add(0.5, 0, 0), Pointing.RIGHT).withItem(copperBlock), 30); scene.idle(7); @@ -269,9 +269,9 @@ public class EjectorScenes { scene.idle(90); scene.overlay.showControls(new InputWindowElement(util.vector.topOf(util.grid.at(4, 1, 3)), Pointing.DOWN) - .withItem(AllItems.COPPER_INGOT.asStack()), 20); + .withItem(new ItemStack(Items.COPPER_INGOT)), 20); scene.idle(7); - scene.world.createItemOnBelt(util.grid.at(4, 1, 3), Direction.UP, AllItems.COPPER_INGOT.asStack(64)); + scene.world.createItemOnBelt(util.grid.at(4, 1, 3), Direction.UP, new ItemStack(Items.COPPER_INGOT, 64)); scene.idle(40); scene.world.multiplyKineticSpeed(util.select.everywhere(), 1 / 16f); scene.overlay.showText(80) @@ -304,7 +304,7 @@ public class EjectorScenes { BlockPos ejectorPos = util.grid.at(4, 1, 2); Vec3 topOf = util.vector.topOf(ejectorPos.above(2)); - ItemStack copper = AllItems.COPPER_INGOT.asStack(); + ItemStack copper = new ItemStack(Items.COPPER_INGOT); for (int i = 0; i < 3; i++) { scene.world.createItemEntity(topOf, util.vector.of(0, 0.1, 0), copper); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java index 0242b39a9..8f0d8045d 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/MovementActorScenes.java @@ -1,6 +1,5 @@ package com.simibubi.create.foundation.ponder.content; -import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.components.actors.HarvesterTileEntity; import com.simibubi.create.content.contraptions.components.actors.PortableItemInterfaceTileEntity; import com.simibubi.create.content.contraptions.components.actors.PortableStorageInterfaceTileEntity; @@ -114,7 +113,7 @@ public class MovementActorScenes { .attachKeyFrame() .text("Items can now be inserted..."); - ItemStack itemStack = AllItems.COPPER_INGOT.asStack(); + ItemStack itemStack = new ItemStack(Items.COPPER_INGOT); Vec3 entitySpawn = util.vector.topOf(hopper.above(3)); ElementLink entity1 = diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java index a4f2572e3..53a7be260 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/ProcessingScenes.java @@ -306,7 +306,7 @@ public class ProcessingScenes { .placeNearTarget() .text("The Input items can be dropped or placed on a Depot under the Press"); scene.idle(50); - ItemStack copper = AllItems.COPPER_INGOT.asStack(); + ItemStack copper = new ItemStack(Items.COPPER_INGOT); scene.world.createItemOnBeltLike(depotPos, Direction.NORTH, copper); Vec3 depotCenter = util.vector.centerOf(depotPos.south()); scene.overlay.showControls(new InputWindowElement(depotCenter, Pointing.UP).withItem(copper), 30); @@ -477,8 +477,8 @@ public class ProcessingScenes { BlockPos pressPos = util.grid.at(1, 4, 2); Vec3 basinSide = util.vector.blockSurface(basin, Direction.WEST); - ItemStack copper = AllItems.COPPER_INGOT.asStack(); - ItemStack copperBlock = AllBlocks.COPPER_BLOCK.asStack(); + ItemStack copper = new ItemStack(Items.COPPER_INGOT); + ItemStack copperBlock = new ItemStack(Items.COPPER_BLOCK); scene.overlay.showText(60) .pointAt(basinSide) @@ -863,7 +863,7 @@ public class ProcessingScenes { scene.world.modifyTileEntity(pressPos, type, pte -> pte.makeCompactingParticleEffect(util.vector.centerOf(basinPos), nugget)); - ItemStack ingot = AllItems.COPPER_INGOT.asStack(); + ItemStack ingot = new ItemStack(Items.COPPER_INGOT); scene.idle(30); scene.overlay.showControls(new InputWindowElement(util.vector.topOf(basinPos), Pointing.RIGHT).withItem(ingot), 30); @@ -873,7 +873,7 @@ public class ProcessingScenes { scene.world.modifyTileEntity(pressPos, type, pte -> pte.makeCompactingParticleEffect(util.vector.centerOf(basinPos), ingot)); - ItemStack block = AllBlocks.COPPER_BLOCK.asStack(); + ItemStack block = new ItemStack(Items.COPPER_BLOCK); scene.idle(30); scene.overlay.showControls(new InputWindowElement(util.vector.topOf(basinPos), Pointing.RIGHT).withItem(block), 30); diff --git a/src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java b/src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java index f273f4344..4298b9e26 100644 --- a/src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java +++ b/src/main/java/com/simibubi/create/foundation/ponder/content/TunnelScenes.java @@ -85,9 +85,9 @@ public class TunnelScenes { scene.idle(70); scene.overlay.showControls(new InputWindowElement(util.vector.topOf(util.grid.at(4, 1, 2)), Pointing.DOWN) - .withItem(AllItems.COPPER_INGOT.asStack()), 20); + .withItem(new ItemStack(Items.COPPER_INGOT)), 20); scene.idle(7); - scene.world.createItemOnBelt(util.grid.at(4, 1, 2), Direction.UP, AllItems.COPPER_INGOT.asStack(64)); + scene.world.createItemOnBelt(util.grid.at(4, 1, 2), Direction.UP, new ItemStack(Items.COPPER_INGOT, 64)); scene.idle(40); scene.world.multiplyKineticSpeed(util.select.everywhere(), 1 / 16f); scene.overlay.showText(80) @@ -176,7 +176,7 @@ public class TunnelScenes { .pointAt(tunnelFilterVec) .placeNearTarget() .text("Filters on inbound connections simply block non-matching items"); - ItemStack copper = AllItems.COPPER_INGOT.asStack(); + ItemStack copper = new ItemStack(Items.COPPER_INGOT); Class tunnelClass = BrassTunnelTileEntity.class; scene.world.modifyTileEntity(tunnelPos, tunnelClass, te -> te.getBehaviour(SidedFilteringBehaviour.TYPE) .setFilter(Direction.EAST, copper)); diff --git a/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java index c36a9c7f5..ed2d89300 100644 --- a/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java +++ b/src/main/java/com/simibubi/create/foundation/worldgen/AllWorldFeatures.java @@ -26,8 +26,6 @@ public class AllWorldFeatures { static final ConfigDrivenFeatureEntry - COPPER = register("copper_ore", AllBlocks.COPPER_ORE, 18, 2).between(40, 85), - ZINC = register("zinc_ore", AllBlocks.ZINC_ORE, 14, 4).between(15, 70), LIMESTONE = register("limestone", AllPaletteBlocks.LIMESTONE, 128, 1 / 64f).between(30, 70),