diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 14df5ef39..622438326 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -11,6 +11,7 @@ a579c40c43dc2174afb66f42d00d0c4a0efaaeee assets\create\blockstates\andesite_bric 9210df936a886dc4727deec204f06359dd1f14e9 assets\create\blockstates\andesite_pillar.json cf9045eb16e5299a1d917c4cb536289f49411276 assets\create\blockstates\birch_window.json 94a1a91403eb4b035fec48071e7fcae57a8a6abd assets\create\blockstates\birch_window_pane.json +8b1dd00adcc7e74c5a9feed069e2610b15a338cb assets\create\blockstates\brass_block.json 7299cea212d879d6d5611bd139b24768b9af236f assets\create\blockstates\chiseled_dark_scoria.json 0f01f813388d3e6907c1cfd992e4b21c914e267e assets\create\blockstates\chiseled_dolomite.json 324488e0c228f38f2597b2f76849e962bc1a7d90 assets\create\blockstates\chiseled_gabbro.json @@ -19,6 +20,9 @@ cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets\create\blockstates\chiseled_scor 291952556c52fba2af5bbd793c71af81abd27e71 assets\create\blockstates\chiseled_weathered_limestone.json 86101bf2f0a5cec159c8b0e4c45ff0a73759c8b6 assets\create\blockstates\clutch.json 10e6e789e00253da08db14e885a2cd24b7306047 assets\create\blockstates\cogwheel.json +f8eff64c75fc599e9a44a003f54ae9931cd8ce7c assets\create\blockstates\copper_block.json +3355a852cdc717e257ca19b3db836068964733e3 assets\create\blockstates\copper_ore.json +dc76bca1fdd41c8e6ada27fd59a2b73d7adc9596 assets\create\blockstates\copper_shingles.json 1726b1b9e04a0634e7e1fdcf1cf4cc898efc5c2f assets\create\blockstates\dark_oak_window.json 50d4627d8e8b5adade12de764ab528ddacfa9ea5 assets\create\blockstates\dark_oak_window_pane.json 21e435ad3baf69970446b0acd3db0d6d02dc9fcb assets\create\blockstates\dark_scoria.json @@ -247,8 +251,10 @@ fd7a9c7095372485081436c91489cadb2b0c514e assets\create\blockstates\weathered_lim 47f8c91ff4c3f5cad782ab469a1fe5f4909dc7f1 assets\create\blockstates\weathered_limestone_cobblestone_stairs.json c60c3115fd6eeaa3a696428a87a74d184ab7d62d assets\create\blockstates\weathered_limestone_cobblestone_wall.json 7e2476ffff93d0eedee5314e5692fcbf5692bffc assets\create\blockstates\weathered_limestone_pillar.json -86e298a75033e3397d16a683fe78c901de51134a assets\create\lang\en_ud.json -816d7485c65b6b5e09836ed96b080e745ba84f9b assets\create\lang\en_us.json +7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json +b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json +5dbfc71c642672428b88a2fd7f31516f7d8f5c31 assets\create\lang\en_ud.json +24601285e20a92802b386b94004acc6abf484af3 assets\create\lang\en_us.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json @@ -278,6 +284,7 @@ b1d0bb538fc8285b7d3fd77a977d78a104b83b62 assets\create\models\block\andesite_pil 3905ced5892afa60009bf26279f9fa4756c273d4 assets\create\models\block\birch_window_pane_post.json 62b3f2edc5ef5d7dabbcff19220921b0e3582376 assets\create\models\block\birch_window_pane_side.json 95d4230eb366f5e7684820c9337e3956ed34042a assets\create\models\block\birch_window_pane_side_alt.json +0934933df6bfbb19a1b14cd0e3cab2c18d5a3ebc assets\create\models\block\brass_block.json 028a07b49c05fe8a93f1d8c229d81e73d887c2df assets\create\models\block\chiseled_dark_scoria.json b1f9ee4867373dd8f976625bab744a1c72c7fd16 assets\create\models\block\chiseled_dolomite.json cd7751090cf3d55296b8e415d0af9b6f18d69770 assets\create\models\block\chiseled_gabbro.json @@ -527,6 +534,30 @@ ca08c15006d65701d72bb88852df884236822522 assets\create\models\block\overgrown_di 3368bbdf335c81b9e84adc30afeab9261256279c assets\create\models\block\overgrown_limestone.json c21c58e982ec0eb1c88948ac53b570b26bf1c9bc assets\create\models\block\overgrown_scoria.json 6d7842c5c0f58a3cb3150e54bee2b51e7138df45 assets\create\models\block\overgrown_weathered_limestone.json +e151c82942df13d7f4296b6b717b12036c4c47fe assets\create\models\block\oxidized\copper_block_0.json +35cb12fe13b6f39d2baad9b5a1638b6c5b364513 assets\create\models\block\oxidized\copper_block_1.json +a7ea046b36c810816dd749727fcc3f1008807c4c assets\create\models\block\oxidized\copper_block_2.json +e06ed91723927def43bd21d9b26230c07e80151b assets\create\models\block\oxidized\copper_block_3.json +45dc4f29c527b614ce3b12706342233a6de82fa4 assets\create\models\block\oxidized\copper_block_4.json +3890ed69f41efe49233c063c572c6bfb8319e37b assets\create\models\block\oxidized\copper_block_5.json +6b681b9829a2493ee5312d4021e9302cb23d7e28 assets\create\models\block\oxidized\copper_block_6.json +b1ed190a331ba21ffeba378e9526364874a22a9d assets\create\models\block\oxidized\copper_block_7.json +375323c5dfaf643cdce4792e2c86ed6033d43412 assets\create\models\block\oxidized\copper_ore_0.json +e5be33b30e6e83ea1cfdf09201fde1255b0f7a11 assets\create\models\block\oxidized\copper_ore_1.json +cf9ab024daedfaab9e4f3f35cb788e259c3616a4 assets\create\models\block\oxidized\copper_ore_2.json +8f24fce14e52cc4082bf292c9ca8043c98023e0a assets\create\models\block\oxidized\copper_ore_3.json +db2990e91a12fd5c5a039b724da9377bb2a861a2 assets\create\models\block\oxidized\copper_ore_4.json +ffc37d15dde98e7e03d189f55fca33ac203bd1e0 assets\create\models\block\oxidized\copper_ore_5.json +4bfbc1352c961f6beeb35ca44bdc8f4084e7edc0 assets\create\models\block\oxidized\copper_ore_6.json +90daa6f691b18a078eab36a21c0a2d6fadfe20c3 assets\create\models\block\oxidized\copper_ore_7.json +2a88da386c48ff915c9a7fb6b1d96bde796020bb assets\create\models\block\oxidized\copper_shingles_0.json +79c45f98817de41f23e2a6a2a2197fdaf3e8ee8b assets\create\models\block\oxidized\copper_shingles_1.json +0085be85c60675694cfc97d39eb595327c953d02 assets\create\models\block\oxidized\copper_shingles_2.json +b4987ed1fbd44719e59cf911d606b964d51a734c assets\create\models\block\oxidized\copper_shingles_3.json +33d060556bd43b1b51f9a990fc802b204f07ceeb assets\create\models\block\oxidized\copper_shingles_4.json +c9f722cd27fb18239f796eb1fa11a73e5339005a assets\create\models\block\oxidized\copper_shingles_5.json +4df00795cde9497a0910584c6a53b62bfb18fef1 assets\create\models\block\oxidized\copper_shingles_6.json +712f8b01330a1aeff2efce5ac1ec2fdd84b622c7 assets\create\models\block\oxidized\copper_shingles_7.json 081d87f990e01211789e9d0dc43acfceb6982aaa assets\create\models\block\paved_andesite.json 30b9aafb43ecfffcbffdf0aa19b5243e38065ff4 assets\create\models\block\paved_andesite_covered.json ab78afb3c487976c2dc5dcefa12153fd4a064ca8 assets\create\models\block\paved_andesite_slab.json @@ -716,6 +747,8 @@ eb838d687f7a925f5b91c4784bfbf33070515e31 assets\create\models\block\weathered_li 7b70d26bf88ccc3bb0657e00c6ca50b7149d3643 assets\create\models\block\weathered_limestone_cobblestone_wall_post.json 5a866d7cca51056c15a5f51e171d89598426fade assets\create\models\block\weathered_limestone_cobblestone_wall_side.json a5b04a1a35735713f51dcd5a80d9e582e6575bbc assets\create\models\block\weathered_limestone_pillar.json +c94c60d1d77404af7d74a29a094c7bdf7501b385 assets\create\models\block\zinc_block.json +a3ff06384fff574ac4cd6c253259f0734b025cab assets\create\models\block\zinc_ore.json 67ef6fd6ec26fc216fa5319b8538beb223da1530 assets\create\models\item\acacia_window.json cbc0ebadda4497663437f99622914de678d0ffaf assets\create\models\item\acacia_window_pane.json a513af38f164a48fd44693b70a93012f3546caff assets\create\models\item\andesite_bricks.json @@ -729,6 +762,7 @@ b0f664dd6de3d0ee9afcb6223fbcd53b97fa0d65 assets\create\models\item\andesite_cobb 75b8b00c2418b9660d35a7fabd0774925cf1c02f assets\create\models\item\andesite_pillar.json 9044243882cfd49a2827e1b910a4c9b0e46daa47 assets\create\models\item\birch_window.json 6ed49f59ea91068ef68720f43e67a9237594bdf0 assets\create\models\item\birch_window_pane.json +17d340c3678bd24cb085ba49490b2b4cb341a9e7 assets\create\models\item\brass_block.json 99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets\create\models\item\chiseled_dark_scoria.json 83d3571eacde52568786802b268f24c6578c1e5d assets\create\models\item\chiseled_dolomite.json afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets\create\models\item\chiseled_gabbro.json @@ -737,6 +771,9 @@ a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets\create\models\item\chiseled_scor 70232ce9b88119fb383717e2c1ad113f7aad6a99 assets\create\models\item\chiseled_weathered_limestone.json 0a2a0f0aafeab0088172f77afd40c1fa2cc1f2b8 assets\create\models\item\clutch.json dcb09deae110077bcddf090996b51cc66e9a7de3 assets\create\models\item\cogwheel.json +965a90a882d85dba93b30af9bce7ecf8e68ce747 assets\create\models\item\copper_block.json +51be7da59368681522de870f1e09036dac55aa77 assets\create\models\item\copper_ore.json +d7cb2f7bac8fae893fc5179af8140786a908f3f5 assets\create\models\item\copper_shingles.json f786a43e296d9f10d7c302fe3ae9cddf4ba9984e assets\create\models\item\dark_oak_window.json e3e9ebbc694edad1f473e5c3a897d95cc87528ae assets\create\models\item\dark_oak_window_pane.json f0e98871e4bb68c29954f2de24566a6404f21d9c assets\create\models\item\dark_scoria.json @@ -965,6 +1002,8 @@ def7382f3216c59d835ab64f534678f3d31ecc51 assets\create\models\item\weathered_lim 3d26cb5616182ba6926d0bf703119ebfbeacbe31 assets\create\models\item\weathered_limestone_cobblestone_stairs.json 62cba55cef305e8fcbc545363919f75d702a617b assets\create\models\item\weathered_limestone_cobblestone_wall.json 40bed7f5e9e97da45c5d9cebc3fcf87b2b13a808 assets\create\models\item\weathered_limestone_pillar.json +9365b5cf29e35d070d077c54520f6cc780aeb842 assets\create\models\item\zinc_block.json +b1689617190c05ef34bd18456b0c7ae09bb3210f assets\create\models\item\zinc_ore.json 187921fa131b06721bfaf63f2623a28c141aae9a data\create\advancements\andesite_alloy.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data\create\advancements\andesite_casing.json de37aa79135d560adf1cc5404f86761f97335314 data\create\advancements\basin.json @@ -1022,8 +1061,7 @@ cb36b039a511aca643fe674a63de8d6ad8478256 data\create\loot_tables\blocks\andesite 36d38c085d8e522fe15f0ef9bc64363e163f3de7 data\create\loot_tables\blocks\andesite_cobblestone_wall.json 6908f62c809ea2105bc92765d84d5655197346ab data\create\loot_tables\blocks\andesite_pillar.json 14bf1764b9313893b6a6f57094f9506ac9fa71a8 data\create\loot_tables\blocks\basin.json -c7f81e30c31837a287d6d6040cdb02c7dec11441 data\create\loot_tables\blocks\belt.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\belt_funnel.json +d412419824ca0938d6047169b3f97491363c3519 data\create\loot_tables\blocks\belt_funnel.json f2acadb49cac3aa6347cae606536cbbde89f0a5f data\create\loot_tables\blocks\belt_tunnel.json 1818b0b62c1e2ad8b030638a59fd7132a4b7bd0a data\create\loot_tables\blocks\birch_window.json 151728f0001f3e890bf05535075224c25caa775c data\create\loot_tables\blocks\birch_window_pane.json @@ -1047,7 +1085,6 @@ a5a7ba88a1d38da83b37bbe842dc7cc0544f37be data\create\loot_tables\blocks\copper_s b160899aa785dc54d8c6cc095337f70b81f3e44f data\create\loot_tables\blocks\creative_crate.json d8f2f8921b9200b1d9476a77ee1be32c25308ac3 data\create\loot_tables\blocks\creative_motor.json c28fa42746a4d5ca2f824001b67e58673810169e data\create\loot_tables\blocks\crushing_wheel.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\crushing_wheel_controller.json d370ee874b5b6b98e9a8c368218fe61f644d956d data\create\loot_tables\blocks\cuckoo_clock.json 077c2f6f957afcc1925a96f80b6261fca484263a data\create\loot_tables\blocks\dark_oak_window.json 5abd6030828decc9f84963786dce88d194cdbcdb data\create\loot_tables\blocks\dark_oak_window_pane.json @@ -1179,15 +1216,13 @@ cb315814960850b5080598b89ee94c833b5048f7 data\create\loot_tables\blocks\limeston 92fb16606f289ad33860270d098fad2522b24e09 data\create\loot_tables\blocks\limestone_cobblestone_wall.json 371115e5ceb08c07a9ab2371509960c31e0baa8a data\create\loot_tables\blocks\limestone_pillar.json dac789cf53b00eed34308848b5e267b7ccec090c data\create\loot_tables\blocks\linked_extractor.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\linked_transposer.json +7af5a13c9e10903b11732fbc01ae3299328216f0 data\create\loot_tables\blocks\linked_transposer.json 90ddf7b5c3b61758a4ad12a1e6ef16fe6ebf7794 data\create\loot_tables\blocks\mechanical_bearing.json e93872a90e4f4642a003539e7db28fdacfdcd114 data\create\loot_tables\blocks\mechanical_crafter.json b12efeeef5682966016ce6ea2d171eecd33d9667 data\create\loot_tables\blocks\mechanical_mixer.json 2599be757a55464af338ef0a01e3772690d7eaf8 data\create\loot_tables\blocks\mechanical_piston.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\mechanical_piston_head.json 0e0742d066bda87ba5cc835a4028efb99e70b2f2 data\create\loot_tables\blocks\mechanical_press.json efbd4689e7d6740b80357203d1e02196f0752efa data\create\loot_tables\blocks\millstone.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\minecart_anchor.json 53215ac772bee2f88052266b82213aaf668660e9 data\create\loot_tables\blocks\mossy_andesite.json 1bf4a13a44e5cc03d730b2aa537e60426062786e data\create\loot_tables\blocks\mossy_dark_scoria.json 956e6cc0c6314c9c01610b643785eed48d2d9317 data\create\loot_tables\blocks\mossy_diorite.json @@ -1276,11 +1311,9 @@ c7029af40b6f5dd2cd8f2ae7dfb89b37074624e6 data\create\loot_tables\blocks\polished 6ef650c723d409c7a678ffac45212e22e37581c0 data\create\loot_tables\blocks\polished_weathered_limestone_stairs.json 58715bc033e4740dbb754f91c93a22b9d06828e6 data\create\loot_tables\blocks\polished_weathered_limestone_wall.json fbe98efcb1a5970b6795fdbbb671fee704c0945f data\create\loot_tables\blocks\portable_storage_interface.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\pulley_magnet.json e8fb62c91226ac107dee45c5ebc54c8dd0aee224 data\create\loot_tables\blocks\pulse_repeater.json c1f37a81f7bef557e7814e6d6e8ba2cab3a7ecaf data\create\loot_tables\blocks\redstone_bridge.json 96278b9e2a3eaf01a58975eca87e6fa8e74c7726 data\create\loot_tables\blocks\redstone_latch.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\rope.json cecaac07bd275bb1ae9e302f0bf44b581e74105d data\create\loot_tables\blocks\rope_pulley.json 464bea346c5a747b1227f4c28930ff019a737c14 data\create\loot_tables\blocks\rotation_chassis.json aa6af37356d65105efab2503ffe75f778cfe873b data\create\loot_tables\blocks\rotation_speed_controller.json @@ -1305,15 +1338,12 @@ d43db633e13e073a7e255495ed9fec0cb0e4917d data\create\loot_tables\blocks\spruce_w 8d2970acd61b96844a4308d87e858b1612d5862e data\create\loot_tables\blocks\sticky_mechanical_piston.json 23d01336968c748272f597d8925663cce0cfed1e data\create\loot_tables\blocks\stockswitch.json 066d06ffcb4b74af2483a1d9fb17b04b4acc7aeb data\create\loot_tables\blocks\stress_gauge.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\symmetry_crossplane.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\symmetry_plane.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\symmetry_tripleplane.json 05e843ca6eb5e299bf41de123977a1045c120ad4 data\create\loot_tables\blocks\tiled_glass.json 2082f3fb39185cb65555ab93178081a2f53f6046 data\create\loot_tables\blocks\tiled_glass_pane.json 8e5c0cec6e9ea59767d8e0fffe590cffd4a058b0 data\create\loot_tables\blocks\toggle_latch.json d95e09420ef7580779c71888d043aa5b4c56c725 data\create\loot_tables\blocks\translation_chassis.json 7c70f942b2ffb58a3fb894e57ce4e445b9007be2 data\create\loot_tables\blocks\translation_chassis_secondary.json -205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\transposer.json +b201436ae6d2ad5a7d47dca0ee8c7016b4c28fa5 data\create\loot_tables\blocks\transposer.json 7b66ad2c48449bafd0cdbd086ac41218cb73a814 data\create\loot_tables\blocks\turntable.json eb3086010565ff1e83e30aa3712f82819bcc0e99 data\create\loot_tables\blocks\vertical_framed_glass.json 15019b1b2b77e6be8a0f4ccd20f35ebb4a82a090 data\create\loot_tables\blocks\vertical_framed_glass_pane.json diff --git a/src/generated/resources/assets/create/blockstates/brass_block.json b/src/generated/resources/assets/create/blockstates/brass_block.json new file mode 100644 index 000000000..05cea719e --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/brass_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/brass_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/copper_block.json b/src/generated/resources/assets/create/blockstates/copper_block.json new file mode 100644 index 000000000..50233ad0f --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/copper_block.json @@ -0,0 +1,28 @@ +{ + "variants": { + "oxidization=0": { + "model": "create:block/oxidized/copper_block_0" + }, + "oxidization=1": { + "model": "create:block/oxidized/copper_block_1" + }, + "oxidization=2": { + "model": "create:block/oxidized/copper_block_2" + }, + "oxidization=3": { + "model": "create:block/oxidized/copper_block_3" + }, + "oxidization=4": { + "model": "create:block/oxidized/copper_block_4" + }, + "oxidization=5": { + "model": "create:block/oxidized/copper_block_5" + }, + "oxidization=6": { + "model": "create:block/oxidized/copper_block_6" + }, + "oxidization=7": { + "model": "create:block/oxidized/copper_block_7" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/copper_ore.json b/src/generated/resources/assets/create/blockstates/copper_ore.json new file mode 100644 index 000000000..5e125609b --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/copper_ore.json @@ -0,0 +1,28 @@ +{ + "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/blockstates/copper_shingles.json b/src/generated/resources/assets/create/blockstates/copper_shingles.json new file mode 100644 index 000000000..ea8971d81 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/copper_shingles.json @@ -0,0 +1,28 @@ +{ + "variants": { + "oxidization=0": { + "model": "create:block/oxidized/copper_shingles_0" + }, + "oxidization=1": { + "model": "create:block/oxidized/copper_shingles_1" + }, + "oxidization=2": { + "model": "create:block/oxidized/copper_shingles_2" + }, + "oxidization=3": { + "model": "create:block/oxidized/copper_shingles_3" + }, + "oxidization=4": { + "model": "create:block/oxidized/copper_shingles_4" + }, + "oxidization=5": { + "model": "create:block/oxidized/copper_shingles_5" + }, + "oxidization=6": { + "model": "create:block/oxidized/copper_shingles_6" + }, + "oxidization=7": { + "model": "create:block/oxidized/copper_shingles_7" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/zinc_block.json b/src/generated/resources/assets/create/blockstates/zinc_block.json new file mode 100644 index 000000000..ec9887ace --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/zinc_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/zinc_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/zinc_ore.json b/src/generated/resources/assets/create/blockstates/zinc_ore.json new file mode 100644 index 000000000..d3b6cc27a --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/zinc_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "create:block/zinc_ore" + } + } +} \ 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 41578400e..c79b3fee9 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -12,12 +12,18 @@ "block.create.andesite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131s\u01DDpu\u2C6F", "block.create.birch_window": "\u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", "block.create.birch_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u0265\u0254\u0279\u0131\u15FA", + "block.create.brass_block": "\u029E\u0254o\u05DF\u15FA ss\u0250\u0279\u15FA", "block.create.chiseled_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_dolomite": "\u01DD\u0287\u0131\u026Fo\u05DFo\u15E1 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_gabbro": "o\u0279qq\u0250\u2141 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", "block.create.chiseled_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u05DF\u01DDs\u0131\u0265\u0186", + "block.create.clutch": "\u0265\u0254\u0287n\u05DF\u0186", + "block.create.cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186", + "block.create.copper_block": "\u029E\u0254o\u05DF\u15FA \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.dark_oak_window": "\u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1", "block.create.dark_oak_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u029E\u0250O \u029E\u0279\u0250\u15E1", "block.create.dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1", @@ -49,6 +55,7 @@ "block.create.dolomite_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", "block.create.dolomite_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", "block.create.dolomite_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DD\u0287\u0131\u026Fo\u05DFo\u15E1", + "block.create.encased_shaft": "\u0287\u025F\u0250\u0265S p\u01DDs\u0250\u0254u\u018E", "block.create.fancy_andesite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", "block.create.fancy_andesite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", "block.create.fancy_andesite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131s\u01DDpu\u2C6F \u028E\u0254u\u0250\u2132", @@ -97,6 +104,8 @@ "block.create.gabbro_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 o\u0279qq\u0250\u2141", "block.create.gabbro_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 o\u0279qq\u0250\u2141", "block.create.gabbro_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 o\u0279qq\u0250\u2141", + "block.create.gearbox": "xoq\u0279\u0250\u01DD\u2141", + "block.create.gearshift": "\u0287\u025F\u0131\u0265s\u0279\u0250\u01DD\u2141", "block.create.granite_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131u\u0250\u0279\u2141", "block.create.granite_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131u\u0250\u0279\u2141", "block.create.granite_bricks_stairs": "s\u0279\u0131\u0250\u0287S s\u029E\u0254\u0131\u0279\u15FA \u01DD\u0287\u0131u\u0250\u0279\u2141", @@ -110,6 +119,7 @@ "block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH", "block.create.jungle_window": "\u028Dopu\u0131M \u01DD\u05DFbun\u017F", "block.create.jungle_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u01DD\u05DFbun\u017F", + "block.create.large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780", "block.create.layered_andesite": "\u01DD\u0287\u0131s\u01DDpu\u2C6F p\u01DD\u0279\u01DD\u028E\u0250\uA780", "block.create.layered_dark_scoria": "\u0250\u0131\u0279o\u0254S \u029E\u0279\u0250\u15E1 p\u01DD\u0279\u01DD\u028E\u0250\uA780", "block.create.layered_diorite": "\u01DD\u0287\u0131\u0279o\u0131\u15E1 p\u01DD\u0279\u01DD\u028E\u0250\uA780", @@ -213,6 +223,8 @@ "block.create.polished_weathered_limestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0265s\u0131\u05DFo\u0500", "block.create.polished_weathered_limestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0265s\u0131\u05DFo\u0500", "block.create.polished_weathered_limestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u0265s\u0131\u05DFo\u0500", + "block.create.schematic_table": "\u01DD\u05DFq\u0250\u27D8 \u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", + "block.create.schematicannon": "uouu\u0250\u0254\u0131\u0287\u0250\u026F\u01DD\u0265\u0254S", "block.create.scoria": "\u0250\u0131\u0279o\u0254S", "block.create.scoria_bricks": "s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S", "block.create.scoria_bricks_slab": "q\u0250\u05DFS s\u029E\u0254\u0131\u0279\u15FA \u0250\u0131\u0279o\u0254S", @@ -223,6 +235,7 @@ "block.create.scoria_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S", "block.create.scoria_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u0250\u0131\u0279o\u0254S", "block.create.scoria_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u0250\u0131\u0279o\u0254S", + "block.create.shaft": "\u0287\u025F\u0250\u0265S", "block.create.spruce_window": "\u028Dopu\u0131M \u01DD\u0254n\u0279dS", "block.create.spruce_window_pane": "\u01DDu\u0250\u0500 \u028Dopu\u0131M \u01DD\u0254n\u0279dS", "block.create.tiled_glass": "ss\u0250\u05DF\u2141 p\u01DD\u05DF\u0131\u27D8", @@ -238,5 +251,7 @@ "block.create.weathered_limestone_cobblestone_slab": "q\u0250\u05DFS \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", "block.create.weathered_limestone_cobblestone_stairs": "s\u0279\u0131\u0250\u0287S \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", "block.create.weathered_limestone_cobblestone_wall": "\u05DF\u05DF\u0250M \u01DDuo\u0287s\u01DD\u05DFqqo\u0186 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", - "block.create.weathered_limestone_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM" + "block.create.weathered_limestone_pillar": "\u0279\u0250\u05DF\u05DF\u0131\u0500 \u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM", + "block.create.zinc_block": "\u029E\u0254o\u05DF\u15FA \u0254u\u0131Z", + "block.create.zinc_ore": "\u01DD\u0279O \u0254u\u0131Z" } \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index ad7cce2b3..83898741f 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -12,12 +12,18 @@ "block.create.andesite_pillar": "Andesite Pillar", "block.create.birch_window": "Birch Window", "block.create.birch_window_pane": "Birch Window Pane", + "block.create.brass_block": "Brass Block", "block.create.chiseled_dark_scoria": "Chiseled Dark Scoria", "block.create.chiseled_dolomite": "Chiseled Dolomite", "block.create.chiseled_gabbro": "Chiseled Gabbro", "block.create.chiseled_limestone": "Chiseled Limestone", "block.create.chiseled_scoria": "Chiseled Scoria", "block.create.chiseled_weathered_limestone": "Chiseled Weathered Limestone", + "block.create.clutch": "Clutch", + "block.create.cogwheel": "Cogwheel", + "block.create.copper_block": "Copper Block", + "block.create.copper_ore": "Copper Ore", + "block.create.copper_shingles": "Copper Shingles", "block.create.dark_oak_window": "Dark Oak Window", "block.create.dark_oak_window_pane": "Dark Oak Window Pane", "block.create.dark_scoria": "Dark Scoria", @@ -49,6 +55,7 @@ "block.create.dolomite_cobblestone_stairs": "Dolomite Cobblestone Stairs", "block.create.dolomite_cobblestone_wall": "Dolomite Cobblestone Wall", "block.create.dolomite_pillar": "Dolomite Pillar", + "block.create.encased_shaft": "Encased Shaft", "block.create.fancy_andesite_bricks": "Fancy Andesite Bricks", "block.create.fancy_andesite_bricks_slab": "Fancy Andesite Bricks Slab", "block.create.fancy_andesite_bricks_stairs": "Fancy Andesite Bricks Stairs", @@ -97,6 +104,8 @@ "block.create.gabbro_cobblestone_stairs": "Gabbro Cobblestone Stairs", "block.create.gabbro_cobblestone_wall": "Gabbro Cobblestone Wall", "block.create.gabbro_pillar": "Gabbro Pillar", + "block.create.gearbox": "Gearbox", + "block.create.gearshift": "Gearshift", "block.create.granite_bricks": "Granite Bricks", "block.create.granite_bricks_slab": "Granite Bricks Slab", "block.create.granite_bricks_stairs": "Granite Bricks Stairs", @@ -110,6 +119,7 @@ "block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane", "block.create.jungle_window": "Jungle Window", "block.create.jungle_window_pane": "Jungle Window Pane", + "block.create.large_cogwheel": "Large Cogwheel", "block.create.layered_andesite": "Layered Andesite", "block.create.layered_dark_scoria": "Layered Dark Scoria", "block.create.layered_diorite": "Layered Diorite", @@ -213,6 +223,8 @@ "block.create.polished_weathered_limestone_slab": "Polished Weathered Limestone Slab", "block.create.polished_weathered_limestone_stairs": "Polished Weathered Limestone Stairs", "block.create.polished_weathered_limestone_wall": "Polished Weathered Limestone Wall", + "block.create.schematic_table": "Schematic Table", + "block.create.schematicannon": "Schematicannon", "block.create.scoria": "Scoria", "block.create.scoria_bricks": "Scoria Bricks", "block.create.scoria_bricks_slab": "Scoria Bricks Slab", @@ -223,6 +235,7 @@ "block.create.scoria_cobblestone_stairs": "Scoria Cobblestone Stairs", "block.create.scoria_cobblestone_wall": "Scoria Cobblestone Wall", "block.create.scoria_pillar": "Scoria Pillar", + "block.create.shaft": "Shaft", "block.create.spruce_window": "Spruce Window", "block.create.spruce_window_pane": "Spruce Window Pane", "block.create.tiled_glass": "Tiled Glass", @@ -238,5 +251,7 @@ "block.create.weathered_limestone_cobblestone_slab": "Weathered Limestone Cobblestone Slab", "block.create.weathered_limestone_cobblestone_stairs": "Weathered Limestone Cobblestone Stairs", "block.create.weathered_limestone_cobblestone_wall": "Weathered Limestone Cobblestone Wall", - "block.create.weathered_limestone_pillar": "Weathered Limestone Pillar" + "block.create.weathered_limestone_pillar": "Weathered Limestone Pillar", + "block.create.zinc_block": "Zinc Block", + "block.create.zinc_ore": "Zinc Ore" } \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/brass_block.json b/src/generated/resources/assets/create/models/block/brass_block.json new file mode 100644 index 000000000..6c71856ea --- /dev/null +++ b/src/generated/resources/assets/create/models/block/brass_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/brass_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_0.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_0.json new file mode 100644 index 000000000..f9452312f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_1.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_1.json new file mode 100644 index 000000000..5a4813611 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_2.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_2.json new file mode 100644 index 000000000..91487091c --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_3.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_3.json new file mode 100644 index 000000000..2eb99bd10 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_4.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_4.json new file mode 100644 index 000000000..628fdc41d --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_5.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_5.json new file mode 100644 index 000000000..ea9a50457 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_5" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_6.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_6.json new file mode 100644 index 000000000..7b4e6e742 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_6" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_block_7.json b/src/generated/resources/assets/create/models/block/oxidized/copper_block_7.json new file mode 100644 index 000000000..dddf59c26 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_block_7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_block_7" + } +} \ No newline at end of file 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 new file mode 100644 index 000000000..26529d3a4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_0.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..fa8d936ae --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_1.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..d796a6111 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_2.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..d6333f9a6 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_3.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..9bc412f0f --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_4.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..6e8d5ef5e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_5.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..fa74c9660 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_6.json @@ -0,0 +1,6 @@ +{ + "parent": "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 new file mode 100644 index 000000000..650e004b1 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_ore_7.json @@ -0,0 +1,6 @@ +{ + "parent": "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/block/oxidized/copper_shingles_0.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_0.json new file mode 100644 index 000000000..1d14a3fd8 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_1.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_1.json new file mode 100644 index 000000000..d1a13fc91 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_2.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_2.json new file mode 100644 index 000000000..5f6d49467 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_3.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_3.json new file mode 100644 index 000000000..bf0c37071 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_4.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_4.json new file mode 100644 index 000000000..6e4321dcb --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_5.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_5.json new file mode 100644 index 000000000..450b550c5 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_5" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_6.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_6.json new file mode 100644 index 000000000..1ed25fd08 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_6.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_6" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_7.json b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_7.json new file mode 100644 index 000000000..3e30b1660 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/oxidized/copper_shingles_7.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/oxidized/copper_shingles_7" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/zinc_block.json b/src/generated/resources/assets/create/models/block/zinc_block.json new file mode 100644 index 000000000..9a017d677 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/zinc_block.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/zinc_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/zinc_ore.json b/src/generated/resources/assets/create/models/block/zinc_ore.json new file mode 100644 index 000000000..934a0b809 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/zinc_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "create:block/zinc_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/brass_block.json b/src/generated/resources/assets/create/models/item/brass_block.json new file mode 100644 index 000000000..51b99542e --- /dev/null +++ b/src/generated/resources/assets/create/models/item/brass_block.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/brass_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_block.json b/src/generated/resources/assets/create/models/item/copper_block.json new file mode 100644 index 000000000..6ac071ba6 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/copper_block.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/oxidized/copper_block_0" +} \ 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 new file mode 100644 index 000000000..d62f6c3ed --- /dev/null +++ b/src/generated/resources/assets/create/models/item/copper_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/oxidized/copper_ore_0" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/copper_shingles.json b/src/generated/resources/assets/create/models/item/copper_shingles.json new file mode 100644 index 000000000..7d444aa35 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/copper_shingles.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/oxidized/copper_shingles_0" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/zinc_block.json b/src/generated/resources/assets/create/models/item/zinc_block.json new file mode 100644 index 000000000..4ec24c2c6 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/zinc_block.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/zinc_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/item/zinc_ore.json b/src/generated/resources/assets/create/models/item/zinc_ore.json new file mode 100644 index 000000000..e0f0cfe89 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/zinc_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/zinc_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/belt.json b/src/generated/resources/data/create/loot_tables/blocks/belt.json deleted file mode 100644 index 5ea424f73..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/belt.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "create:belt_connector" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/crushing_wheel_controller.json b/src/generated/resources/data/create/loot_tables/blocks/crushing_wheel_controller.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/crushing_wheel_controller.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json b/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json index 78793172c..31ecac893 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json +++ b/src/generated/resources/data/create/loot_tables/blocks/linked_transposer.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:linked_transposer" } ], "conditions": [ diff --git a/src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json b/src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/mechanical_piston_head.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/minecart_anchor.json b/src/generated/resources/data/create/loot_tables/blocks/minecart_anchor.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/minecart_anchor.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/pulley_magnet.json b/src/generated/resources/data/create/loot_tables/blocks/pulley_magnet.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/pulley_magnet.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/rope.json b/src/generated/resources/data/create/loot_tables/blocks/rope.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/rope.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/symmetry_crossplane.json b/src/generated/resources/data/create/loot_tables/blocks/symmetry_crossplane.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/symmetry_crossplane.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/symmetry_plane.json b/src/generated/resources/data/create/loot_tables/blocks/symmetry_plane.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/symmetry_plane.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/symmetry_tripleplane.json b/src/generated/resources/data/create/loot_tables/blocks/symmetry_tripleplane.json deleted file mode 100644 index 78793172c..000000000 --- a/src/generated/resources/data/create/loot_tables/blocks/symmetry_tripleplane.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:air" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/transposer.json b/src/generated/resources/data/create/loot_tables/blocks/transposer.json index 78793172c..846ecd381 100644 --- a/src/generated/resources/data/create/loot_tables/blocks/transposer.json +++ b/src/generated/resources/data/create/loot_tables/blocks/transposer.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "create:transposer" } ], "conditions": [ diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 181132c0b..9026bfee6 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -95,6 +95,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; +import net.minecraft.world.storage.loot.LootTable; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -355,8 +356,7 @@ public enum AllBlocks implements NonNullSupplier { this.block = Create.registrate() .block(Lang.asId(name()), $ -> block.get()) // TODO take properties as input .blockstate(NonNullBiConsumer.noop()) // TODO - .defaultLoot() -// .loot(NonNullBiConsumer.noop()) // TODO + .transform(b -> ArrayUtils.contains(comesWith, ComesWith.NO_BLOCKITEM) ? b.loot(NonNullBiConsumer.noop()) : b) // TODO .setData(ProviderType.LANG, NonNullBiConsumer.noop()) // TODO .transform(applyTags(tags)) .transform(b -> registerItemBlock(b, customItemCreator, comesWith)) diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocksNew.java index 2d1adfceb..37fb20978 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocksNew.java @@ -17,19 +17,25 @@ import com.simibubi.create.modules.contraptions.relays.gearbox.GearboxBlock; import com.simibubi.create.modules.schematics.block.SchematicTableBlock; import com.simibubi.create.modules.schematics.block.SchematicannonBlock; import com.tterrag.registrate.builders.BlockBuilder; +import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.BlockEntry; +import com.tterrag.registrate.util.nullness.NonNullFunction; +import com.tterrag.registrate.util.nullness.NonNullSupplier; import com.tterrag.registrate.util.nullness.NonNullUnaryOperator; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.SoundType; +import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.tags.TagCollection; +import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.ToolType; public class AllBlocksNew { @@ -122,44 +128,69 @@ public class AllBlocksNew { public static final BlockEntry COPPER_ORE = REGISTRATE.block("copper_ore", p -> new OxidizingBlock(p, 1)) .initialProperties(() -> Blocks.IRON_ORE) + .transform(oxidizedBlockstate()) .transform(tagBlockAndItem("ores/copper")) + .transform(oxidizedItemModel()) .register(); public static final BlockEntry ZINC_ORE = REGISTRATE.block("zinc_ore", Block::new) .initialProperties(() -> Blocks.GOLD_BLOCK) .properties(p -> p.harvestLevel(2).harvestTool(ToolType.PICKAXE)) .transform(tagBlockAndItem("ores/zinc")) + .build() .register(); public static final BlockEntry COPPER_BLOCK = REGISTRATE.block("copper_block", p -> new OxidizingBlock(p, 1 / 32f)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(tagBlockAndItem("storage_blocks/copper")) + .transform(oxidizedItemModel()) .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/copper")), ctx, false)) + .transform(oxidizedBlockstate()) .register(); public static final BlockEntry COPPER_SHINGLES = REGISTRATE.block("copper_shingles", p -> new OxidizingBlock(p, 1 / 32f)) .initialProperties(() -> Blocks.IRON_BLOCK) - .simpleItem() + .item().transform(oxidizedItemModel()) .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("plates/copper")), ctx, true)) + .transform(oxidizedBlockstate()) .register(); public static final BlockEntry ZINC_BLOCK = REGISTRATE.block("zinc_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(tagBlockAndItem("storage_blocks/zinc")) + .build() .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/zinc")), ctx, false)) .register(); public static final BlockEntry BRASS_BLOCK = REGISTRATE.block("brass_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(tagBlockAndItem("storage_blocks/brass")) + .build() .recipe((ctx, prov) -> prov.square(DataIngredient.tag(forgeItemTag("ingots/brass")), ctx, false)) .register(); + + private static String getOxidizedModel(String name, int level) { + return "block/oxidized/" + name + "_" + level; + } + + private static

NonNullUnaryOperator> oxidizedBlockstate() { + return b -> b.blockstate((ctx, prov) -> prov.getVariantBuilder(ctx.getEntry()) + .forAllStates(state -> { + String name = getOxidizedModel(ctx.getName(), state.get(OxidizingBlock.OXIDIZATION)); + return ConfiguredModel.builder() + .modelFile(prov.models().cubeAll(name, prov.modLoc(name))) + .build(); + })); + } + + private static

NonNullFunction, P> oxidizedItemModel() { + return b -> b.model((ctx, prov) -> prov.withExistingParent(ctx.getName(), prov.modLoc(getOxidizedModel(ctx.getName(), 0)))).build(); + } - private static NonNullUnaryOperator> tagBlockAndItem(String tagName) { + private static NonNullFunction, ItemBuilder>> tagBlockAndItem(String tagName) { return b -> b.tag(forgeBlockTag(tagName)) .item() - .tag(forgeItemTag(tagName)) - .build(); + .tag(forgeItemTag(tagName)); } private static Tag forgeBlockTag(String name) { diff --git a/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java b/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java index 6b57420ac..2c20166a8 100644 --- a/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java +++ b/src/main/java/com/simibubi/create/foundation/block/RenderUtilityBlock.java @@ -6,7 +6,7 @@ import net.minecraft.block.material.Material; public class RenderUtilityBlock extends Block implements IRenderUtilityBlock { public RenderUtilityBlock() { - super(Properties.create(Material.AIR)); + super(Properties.create(Material.AIR).noDrops()); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java index ec2403e4b..64cbee76b 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java @@ -28,7 +28,7 @@ public class MechanicalPistonHeadBlock extends ProperDirectionalBlock { public static final EnumProperty TYPE = BlockStateProperties.PISTON_TYPE; public MechanicalPistonHeadBlock() { - super(Properties.from(Blocks.PISTON_HEAD)); + super(Properties.from(Blocks.PISTON_HEAD).noDrops()); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java index 9d626101e..c4345c860 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java @@ -114,7 +114,7 @@ public class PulleyBlock extends HorizontalAxisKineticBlock implements ITE