From de79e78c0fb34c02acd27fe6fee3bf3b119fd890 Mon Sep 17 00:00:00 2001 From: LocusAzzurro Date: Thu, 8 Feb 2024 23:55:02 +0100 Subject: [PATCH] :sparkles: material and template recipes --- src/generated/resources/.cache/cache | 27 ++++++++++++++ .../ultramarine/models/item/bronze_dust.json | 6 ++++ .../ultramarine/models/item/bronze_ingot.json | 6 ++++ .../ultramarine/models/item/bronze_parts.json | 6 ++++ .../architrave_template.json | 34 ++++++++++++++++++ .../ultramarine.materials/bronze_dust.json | 34 ++++++++++++++++++ .../ultramarine.materials/bronze_parts.json | 34 ++++++++++++++++++ .../caihua_template.json | 34 ++++++++++++++++++ .../carved_wood_template.json | 34 ++++++++++++++++++ .../fangxin_edge_template.json | 34 ++++++++++++++++++ .../fangxin_template.json | 34 ++++++++++++++++++ .../gold_dye_powder.json | 34 ++++++++++++++++++ .../ultramarine.materials/gutou_template.json | 34 ++++++++++++++++++ .../rafter_end_template.json | 34 ++++++++++++++++++ .../rafter_template.json | 34 ++++++++++++++++++ .../zhaotou_template.json | 34 ++++++++++++++++++ .../recipes/architrave_template.json | 8 +++++ .../data/ultramarine/recipes/bronze_dust.json | 8 +++++ .../ultramarine/recipes/bronze_parts.json | 8 +++++ .../ultramarine/recipes/caihua_template.json | 8 +++++ .../recipes/carved_wood_template.json | 8 +++++ .../recipes/fangxin_edge_template.json | 8 +++++ .../ultramarine/recipes/fangxin_template.json | 8 +++++ .../ultramarine/recipes/gold_dye_powder.json | 8 +++++ .../ultramarine/recipes/gutou_template.json | 8 +++++ .../recipes/rafter_end_template.json | 8 +++++ .../ultramarine/recipes/rafter_template.json | 8 +++++ .../ultramarine/recipes/zhaotou_template.json | 8 +++++ .../data/registry/ItemRegistry.java | 3 ++ .../datagen/ModRecipeProvider.java | 23 +++++++++++- .../ultramarine/event/CommonEventHandler.java | 8 +++++ .../assets/ultramarine/lang/en_us.json | 2 ++ .../assets/ultramarine/lang/zh_cn.json | 4 ++- .../item/{bronze.png => bronze_ingot.png} | Bin 34 files changed, 587 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/assets/ultramarine/models/item/bronze_dust.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/bronze_ingot.json create mode 100644 src/generated/resources/assets/ultramarine/models/item/bronze_parts.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/architrave_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_dust.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_parts.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/caihua_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/carved_wood_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_edge_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gold_dye_powder.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gutou_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_end_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_template.json create mode 100644 src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/zhaotou_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/architrave_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/bronze_dust.json create mode 100644 src/generated/resources/data/ultramarine/recipes/bronze_parts.json create mode 100644 src/generated/resources/data/ultramarine/recipes/caihua_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/carved_wood_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/fangxin_edge_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/fangxin_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/gold_dye_powder.json create mode 100644 src/generated/resources/data/ultramarine/recipes/gutou_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/rafter_end_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/rafter_template.json create mode 100644 src/generated/resources/data/ultramarine/recipes/zhaotou_template.json rename src/main/resources/assets/ultramarine/textures/item/{bronze.png => bronze_ingot.png} (100%) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 452f51c2..beb9dcfc 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -2486,7 +2486,10 @@ f5f2d620ee60eaed08cc4f7d72196a5d16beeb65 assets/ultramarine/models/item/boots.js b64a4d0485096790f66401d28b2bd0de0855e7d3 assets/ultramarine/models/item/brick_kiln.json e33dadca3ebea210fc288905fc5ebbfc8d5172a8 assets/ultramarine/models/item/bronze_censer.json 19be52f5da2385c798ed666a62f4cd4ca1713709 assets/ultramarine/models/item/bronze_ding.json +bfb7e1895d1479800c3cdfd7d981520f450d1e24 assets/ultramarine/models/item/bronze_dust.json +c91bdad09c75d428c998decfa72764c963a42b16 assets/ultramarine/models/item/bronze_ingot.json 4c8ea4168b34e9356ed2ef7597e08e0f3ec7865d assets/ultramarine/models/item/bronze_mirror.json +9d4d9af55ef7873b659a767295858f9bd5f5d18a assets/ultramarine/models/item/bronze_parts.json 79310b1a7db58f58991e17e302720c4d922264b5 assets/ultramarine/models/item/broom.json 497776f6ee65bcb2a1b97bd79ccc63a7d1e070de assets/ultramarine/models/item/brown_dye_powder.json 64e1071f0993274043c2c23cf7f8926a0cee8fdc assets/ultramarine/models/item/brownish_red_stone_brick.json @@ -3677,27 +3680,36 @@ e3d9dd447577affee57f99c9f04e2652adc9a4c7 data/ultramarine/advancements/recipes/u 6490cde441d7b485ca57f7b12c75809eb1b82941 data/ultramarine/advancements/recipes/ultramarine.lamps/tricolor_candlestick.json cf10ff3ce24fda0de9fbc94f64ede85228963692 data/ultramarine/advancements/recipes/ultramarine.lamps/white_sky_lantern.json b14a99cb7d744a786a4b28ca5ee5493dbbcbfbaf data/ultramarine/advancements/recipes/ultramarine.lamps/yellow_sky_lantern.json +00b86f538e3d3518c8e53b405709f51f01c00e8d data/ultramarine/advancements/recipes/ultramarine.materials/architrave_template.json 15288694e0c262c102fc5e763b54f75914e7c9ac data/ultramarine/advancements/recipes/ultramarine.materials/black_brick_from_blasting.json 29bd47b994a2b3fded73b0d8102f28e5f9e41785 data/ultramarine/advancements/recipes/ultramarine.materials/black_brick_from_smelting.json 6a81e0fb6d97752f7bd27772a170e5f835248677 data/ultramarine/advancements/recipes/ultramarine.materials/black_dye_powder.json 2f79f236cab0131520e6006f78af918f63b42368 data/ultramarine/advancements/recipes/ultramarine.materials/black_roof_tile.json 6ce1a54a08a8cb07d0ec022377c2d635f538ff47 data/ultramarine/advancements/recipes/ultramarine.materials/blue_dye_powder.json 9526b35d68ed7168d861138a24e5067af778e36e data/ultramarine/advancements/recipes/ultramarine.materials/blue_roof_tile.json +dc3bce4c9114935138f67f2fe1cc3dec19b94963 data/ultramarine/advancements/recipes/ultramarine.materials/bronze_dust.json +1921471f723f87b37b86c2abd153cef3d0300a65 data/ultramarine/advancements/recipes/ultramarine.materials/bronze_parts.json fc4aacb69337d3bc5e19654ec4f68411f2c6079c data/ultramarine/advancements/recipes/ultramarine.materials/brown_dye_powder.json 864b88390f58544cb427ccafdfb3eb27c1ab6b1e data/ultramarine/advancements/recipes/ultramarine.materials/brownish_red_stone_brick_from_blasting.json deb60d7d559c90ed30867694681b7012fcc94047 data/ultramarine/advancements/recipes/ultramarine.materials/brownish_red_stone_brick_from_smelting.json +340f0040dbe664af8d03ed4aaaf7c52892bb3aa3 data/ultramarine/advancements/recipes/ultramarine.materials/caihua_template.json +c9d80ca6a0ab544384eb7c2ef8b26a14b8083167 data/ultramarine/advancements/recipes/ultramarine.materials/carved_wood_template.json 85ba51f04050e7b6437f45e100343566db046859 data/ultramarine/advancements/recipes/ultramarine.materials/cyan_brick.json 0c274fe9b6c1acdd2441a1be9e9457b7be29b1fa data/ultramarine/advancements/recipes/ultramarine.materials/cyan_brick_from_blasting.json 660ae9fa43510137bbd252480ce416a0814fd848 data/ultramarine/advancements/recipes/ultramarine.materials/cyan_brick_from_smelting.json d9cf62ab7595658dfec0be888ffc5f8ff45d5585 data/ultramarine/advancements/recipes/ultramarine.materials/cyan_dye_powder.json 4ea63b8678c0d2990b5cfd77513ace8b643ad000 data/ultramarine/advancements/recipes/ultramarine.materials/cyan_roof_tile.json +258174e05c507a0a3df714232c0b5f8ece75091b data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_edge_template.json +2e9a7fe5c32412196525616533c5a3bfd10e8b1b data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_template.json 063ccc314c106ba9831f263434f98104b17f2784 data/ultramarine/advancements/recipes/ultramarine.materials/fired_brick_from_blasting.json 098fa55b315c6a6802d0e8a5e53707f93c6c189d data/ultramarine/advancements/recipes/ultramarine.materials/fired_brick_from_smelting.json +43e4b56741a916c3b63eb8cff9c6862b3974b893 data/ultramarine/advancements/recipes/ultramarine.materials/gold_dye_powder.json f946db8cbd54fe870f0ada1e661cbada30c24963 data/ultramarine/advancements/recipes/ultramarine.materials/gold_parts.json 5afde22ed512bea91cf9f3120eef7866bf3c3c1a data/ultramarine/advancements/recipes/ultramarine.materials/gray_dye_powder.json 10d47d1feaf27c70550b246333c4391f2c7c6cf8 data/ultramarine/advancements/recipes/ultramarine.materials/gray_roof_tile.json 8f49e54be3359369d8bc76b89f75aafd4283370d data/ultramarine/advancements/recipes/ultramarine.materials/green_dye_powder.json 96ac6e2763570869c3ea171067750435fa6b956e data/ultramarine/advancements/recipes/ultramarine.materials/green_roof_tile.json +5d972aa7df12b99e78f8b7b55d3a1b06e5c2b153 data/ultramarine/advancements/recipes/ultramarine.materials/gutou_template.json b3d0a6ccfc1f130dadac42f64c6266175f4f403c data/ultramarine/advancements/recipes/ultramarine.materials/hematite_dust.json d5c48d2dfeae6ed4ef8a29fd41cded2f925e97e3 data/ultramarine/advancements/recipes/ultramarine.materials/jade_parts.json 21838bfdaa1a61359c0dba8e33f1276f4d401cbe data/ultramarine/advancements/recipes/ultramarine.materials/light_blue_dye_powder.json @@ -3719,6 +3731,8 @@ fc12f504b94526a0de0f6b0b6b095bcd19bf90dd data/ultramarine/advancements/recipes/u 40f73a6914d7f4cc97802e2aa0777d7fd6daa7e6 data/ultramarine/advancements/recipes/ultramarine.materials/porcelain_parts.json c6636999e9e73481660c5d882003252780499111 data/ultramarine/advancements/recipes/ultramarine.materials/prismarine_dust.json fa6a2e120d0d59fabe04421d9d50cd476818600e data/ultramarine/advancements/recipes/ultramarine.materials/purple_dye_powder.json +4e4bab22a2c8f9f440159c048ecdc5ee61e6a2c3 data/ultramarine/advancements/recipes/ultramarine.materials/rafter_end_template.json +1491774c5bcc904f8f6908a5a03d404cc2e5e553 data/ultramarine/advancements/recipes/ultramarine.materials/rafter_template.json 71fd1125901bd9f31f3019c5540ce2f6c0f2d4cb data/ultramarine/advancements/recipes/ultramarine.materials/red_dye_powder.json 68094cb8b50f912511be0c2b54dd94363581f2b9 data/ultramarine/advancements/recipes/ultramarine.materials/unfired_black_brick.json bdccc0cdd9832b3148af7bf6115d4331740fdb82 data/ultramarine/advancements/recipes/ultramarine.materials/unfired_brownish_red_stone_brick.json @@ -3730,6 +3744,7 @@ bc23d6bbde48ea99656d0bdbf86ddd302ba5ad22 data/ultramarine/advancements/recipes/u 4df6dfcf1591a587523823f2e05b4533f4a04196 data/ultramarine/advancements/recipes/ultramarine.materials/wooden_parts.json 33af8c4bfc98412ef5492fee094524e5b0713235 data/ultramarine/advancements/recipes/ultramarine.materials/yellow_dye_powder.json 6b749c05dc3d66b06d450cd5e72e963ef22c60b7 data/ultramarine/advancements/recipes/ultramarine.materials/yellow_roof_tile.json +d6b717b02352940e4aebcbe6ab9800136c20fb99 data/ultramarine/advancements/recipes/ultramarine.materials/zhaotou_template.json 09d0e1019f126d1b9533606fc8120db89c7cc574 data/ultramarine/advancements/recipes/ultramarine.tools/brick_kiln.json 638740f2cfa0430576dbfda0fba39538de031870 data/ultramarine/advancements/recipes/ultramarine.tools/wooden_mallet.json 3ce6ad7bcc25c7a4e18235769ca6ae0318fc10a2 data/ultramarine/advancements/recipes/ultramarine.tools/woodworking_workbench.json @@ -4152,6 +4167,7 @@ d8e41dfa2a62106f65cf08330bdf57f4dccaca81 data/ultramarine/loot_tables/blocks/yel 23dba58a90d6bff63ab176ef51136a86caf8a5d1 data/ultramarine/loot_tables/blocks/yellow_roof_tiles.json 35037870b4eb18347e4abc1be6ed92240e5ccc0f data/ultramarine/loot_tables/blocks/yellow_sky_lantern.json c4405cf0cc6215954753141e3b3f1c1b17b5f13c data/ultramarine/loot_tables/blocks/yellow_su_style_caihua.json +85e436b14d679e069d90c8b7e17c14f00f0fe386 data/ultramarine/recipes/architrave_template.json 0f3df4372d70e4f50dd8ab9c78dcf7fdef821d8b data/ultramarine/recipes/bamboo_mat.json f3e4c24ad4ad1158fa962710b5bb12a28f010c72 data/ultramarine/recipes/bamboo_mat_slab_from_crafting.json c8a802b3c3aec2d6ac4b951a3467fbfb8af4e817 data/ultramarine/recipes/bamboo_mat_slab_from_woodworking.json @@ -4237,6 +4253,8 @@ cf4b0cc4b8e9c840bf70481d179df9edb099d623 data/ultramarine/recipes/blue_zhaotou_e c0448b6874231816c15e26cdce248ad879a8562b data/ultramarine/recipes/bookshelf.json a405f1d2a2b08737b3febef44b13d594722cb60b data/ultramarine/recipes/bookshelf_variant.json 0250cd379d765308a0a649a381a74a4c81480f85 data/ultramarine/recipes/brick_kiln.json +2005979078648ab908085013a79023750b949a56 data/ultramarine/recipes/bronze_dust.json +14179f87c0191bdf4e5dca20e3a76ac67626ac6f data/ultramarine/recipes/bronze_parts.json e36d3ca66d2cb3679a5f0ceda442a9cdc441d0d9 data/ultramarine/recipes/brown_dye_powder.json 4f48ddd8299a99b0cbc260e3c4e42d5071cb455c data/ultramarine/recipes/brownish_red_stone_brick_from_blasting.json 9848cffb8d7030df9f928724500dbdda0de433fa data/ultramarine/recipes/brownish_red_stone_brick_from_smelting.json @@ -4247,6 +4265,7 @@ a0a05067748bb6da03f3c688b19d62655c8d50e5 data/ultramarine/recipes/brownish_red_s a7ca746341f76e38c34fbe444f29b68ae309d875 data/ultramarine/recipes/brownish_red_stone_brick_wall_from_crafting.json 290a87ce2d917b6f75a28e3767fd9cf73c71f43f data/ultramarine/recipes/brownish_red_stone_brick_wall_from_stonecutting.json 6330006c73002cb0302fe6c48fcef84a4b5f8793 data/ultramarine/recipes/brownish_red_stone_bricks.json +0cfb32abc35856c260973be34bfe7b4c4bc6d9ba data/ultramarine/recipes/caihua_template.json a22211c3ba20a000b41f9d027ec59ef88d6a086d data/ultramarine/recipes/carved_dark_oak_beam.json 8b82bc9335729e00b5dcb0d10fbf66489f2a68a3 data/ultramarine/recipes/carved_dark_oak_beam_edge.json 7d5301adc175103519303633cf7f49fb622c21c8 data/ultramarine/recipes/carved_red_pillar.json @@ -4258,6 +4277,7 @@ cb62e963ff0deca640320676618e7af339c9a73a data/ultramarine/recipes/carved_stone_p 935a56f525c5cd717b7702af4a0ae7ac0bdc9477 data/ultramarine/recipes/carved_stone_panel_edge.json b6e0cba3c0596db5a8757d713c93debca5e6805b data/ultramarine/recipes/carved_stone_queti.json e92575ae7b95ab62fb0c1564edf9da72db5814a9 data/ultramarine/recipes/carved_stone_queti_part.json +7a2e4a2e6cd9e41665ee416e3f91270764f21327 data/ultramarine/recipes/carved_wood_template.json 8d1f5e540162bae8b1c709f159a50bb48c828836 data/ultramarine/recipes/carved_wooden_railing.json dde3eaa3ea8e09a964a8b04df73b1ea7c463a369 data/ultramarine/recipes/carved_zhaotou_pattern.json d4133968080e9c026e5f9c4e44139e83b0c0d8a0 data/ultramarine/recipes/central_gilded_dark_oak_queti.json @@ -4316,6 +4336,8 @@ a505d6cf5ccb0bc78f89c18b9483868857342e29 data/ultramarine/recipes/dark_cyan_floo 873fe2a1e42398cc016134e171d40c8bd75b93d9 data/ultramarine/recipes/dark_oak_rafter.json a4005ac36a259a006391389fa58ab18c1b134f24 data/ultramarine/recipes/dark_oak_rafter_end.json c95ea9d10cfa233c28040011fc2410b489e112dc data/ultramarine/recipes/empty_tuanhua_slab.json +a3e66d2cea7566be9ab9c87842a1ed17edd728fa data/ultramarine/recipes/fangxin_edge_template.json +44bd296a6ed98d9f3c5971d8fe240a66eff99ec0 data/ultramarine/recipes/fangxin_template.json 672fbfc799887d61f7874917cd122f455cb16f0e data/ultramarine/recipes/fired_brick_from_blasting.json b897dfb19c64a857c463d917129af2ab7834f667 data/ultramarine/recipes/fired_brick_from_smelting.json 3e170d6083f31b876bdb1e11585fc4d5478ad515 data/ultramarine/recipes/flame_arch_wall_pattern.json @@ -4335,6 +4357,7 @@ ad39c2e603500b716726f23320c6c8d0b9d6bfc4 data/ultramarine/recipes/gilded_dark_oa f2d0bd8d31abedb12a2b6209dcdfe73099715bb0 data/ultramarine/recipes/gilded_dark_oak_slab_from_woodworking.json 19f8338ca67edab7edbfbae4f24edf2d9bc810c7 data/ultramarine/recipes/gilded_dark_oak_stairs_from_crafting.json 58b21d7217d488783f7c8185fbddadacf8d9011d data/ultramarine/recipes/gilded_dark_oak_stairs_from_woodworking.json +1ad54b2e910949e2d4fdf436cf221bdb9e24422d data/ultramarine/recipes/gold_dye_powder.json f8da811acc39f049a924058eef40160d030505a3 data/ultramarine/recipes/gold_parts.json dd4286b305f994157f0b972a2fdc085a7e1d5374 data/ultramarine/recipes/golden_dragon_fangxin_pattern.json 56c7f9c125ce545b7332f2a9b72d3eeb90702433 data/ultramarine/recipes/golden_glazed_roof_charm.json @@ -4381,6 +4404,7 @@ ce2b9a9e50308dbb50b95138f9be97b0789a0681 data/ultramarine/recipes/green_wanzi_ra 34cb480eae9963b6843d44349aa356a312dedf29 data/ultramarine/recipes/green_weathered_stone.json a27151a1eef9a48011259e1d6c12f772d9977791 data/ultramarine/recipes/green_weathered_stone_batch.json 6553ebac21ab69a6fd630ef1c051d19759b3fbdc data/ultramarine/recipes/green_white_red_carved_wood.json +842eb3ad59b98d4a9638c5e187b167bfd1c2155d data/ultramarine/recipes/gutou_template.json 3be2efc90031d93041ef97a288d35c1cc6d1f8d3 data/ultramarine/recipes/hematite_dust.json c7100862ba75b0820bda592ad9fc0288388dd3dc data/ultramarine/recipes/horizontal_gilded_dark_oak_queti.json 57f1e81128c26872bf30bffcc1df14b660c417be data/ultramarine/recipes/jade_candlestick.json @@ -4446,6 +4470,8 @@ e8fd5b0471b51c337694047ac3258a11cf982017 data/ultramarine/recipes/polished_weath aca736ee033ad52cc52daa5ad1b3f1c19eebc3b2 data/ultramarine/recipes/purple_dye_powder.json 21186c64845d36f72df3a4bcc6efa94de835ed0c data/ultramarine/recipes/qing_golden_dragon_ceiling.json 09b5ddc52b3a1fa7e6aac86db62f64fbbbb87409 data/ultramarine/recipes/qing_green_beam_head.json +5332f321a15df2f108dc4b2fcc68b23c41b114c8 data/ultramarine/recipes/rafter_end_template.json +31ff592bbbcb5e23b61fc03c2730c0a8095cf262 data/ultramarine/recipes/rafter_template.json f5e8e64ba406ed7e46ed6352c3836b8b8f3d6b3b data/ultramarine/recipes/red_and_blue_carved_architrave.json 190222c3137fd896ccf3addada4f4bcdfdb2a303 data/ultramarine/recipes/red_and_blue_carved_architrave_slab.json 3d6c6744017b273ce8d0f3aacf7e0f4819189a4a data/ultramarine/recipes/red_and_blue_zhaotou.json @@ -4560,6 +4586,7 @@ daf52f68f622d70c0be6679947fc3eeb177e4753 data/ultramarine/recipes/yellow_roof_ti fcfeebbc3040cb32e94a29f1a90f1c0e18ab6b64 data/ultramarine/recipes/yellow_roof_tiles.json 0a749c939400810233b1bfc6fba83efc5d4ed0fe data/ultramarine/recipes/yellow_sky_lantern.json 49ac128f6e2fa8fce8f27bc30c96e577346e47d0 data/ultramarine/recipes/yellow_su_style_caihua.json +6dbea7a7ec6d5b4495e1c81eccea4760f49564ab data/ultramarine/recipes/zhaotou_template.json ebcfc6a762b29207fa1a053fac41d156861a27f0 data/ultramarine/tags/blocks/mineable_with_shears.json d8ce6b2522bce0fc345af6caf59bc4733c51372f data/ultramarine/tags/items/chisel_templates.json 03454771c5ce1d4ad5128a2b215b76f5c38cbc78 data/ultramarine/tags/items/dye_powder.json diff --git a/src/generated/resources/assets/ultramarine/models/item/bronze_dust.json b/src/generated/resources/assets/ultramarine/models/item/bronze_dust.json new file mode 100644 index 00000000..b364523d --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/bronze_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/bronze_dust" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/bronze_ingot.json b/src/generated/resources/assets/ultramarine/models/item/bronze_ingot.json new file mode 100644 index 00000000..0bd2b3f6 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/bronze_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/bronze_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/bronze_parts.json b/src/generated/resources/assets/ultramarine/models/item/bronze_parts.json new file mode 100644 index 00000000..f0a74755 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/bronze_parts.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/bronze_parts" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/architrave_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/architrave_template.json new file mode 100644 index 00000000..9a4b5cb1 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/architrave_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:architrave_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:architrave_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:architrave_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_dust.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_dust.json new file mode 100644 index 00000000..3fe348f8 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_dust.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:bronze_dust" + ] + }, + "criteria": { + "has_bronze_ingot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:bronze_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:bronze_dust" + } + } + }, + "requirements": [ + [ + "has_bronze_ingot", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_parts.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_parts.json new file mode 100644 index 00000000..580aaf37 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/bronze_parts.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:bronze_parts" + ] + }, + "criteria": { + "has_bronze_ingot": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:bronze_ingot" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:bronze_parts" + } + } + }, + "requirements": [ + [ + "has_bronze_ingot", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/caihua_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/caihua_template.json new file mode 100644 index 00000000..570e86fb --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/caihua_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:caihua_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:caihua_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:caihua_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/carved_wood_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/carved_wood_template.json new file mode 100644 index 00000000..8d0e78dc --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/carved_wood_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:carved_wood_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:carved_wood_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:carved_wood_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_edge_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_edge_template.json new file mode 100644 index 00000000..02258e1b --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_edge_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:fangxin_edge_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:fangxin_edge_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:fangxin_edge_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_template.json new file mode 100644 index 00000000..36d93fcd --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/fangxin_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:fangxin_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:fangxin_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:fangxin_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gold_dye_powder.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gold_dye_powder.json new file mode 100644 index 00000000..467c55a5 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gold_dye_powder.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:gold_dye_powder" + ] + }, + "criteria": { + "has_gold_nugget": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:gold_dye_powder" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:gold_dye_powder" + } + } + }, + "requirements": [ + [ + "has_gold_nugget", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gutou_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gutou_template.json new file mode 100644 index 00000000..032cd761 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/gutou_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:gutou_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:gutou_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:gutou_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_end_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_end_template.json new file mode 100644 index 00000000..caac481c --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_end_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:rafter_end_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:rafter_end_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:rafter_end_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_template.json new file mode 100644 index 00000000..07e13946 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/rafter_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:rafter_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:rafter_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:rafter_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/zhaotou_template.json b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/zhaotou_template.json new file mode 100644 index 00000000..1e4fd7d1 --- /dev/null +++ b/src/generated/resources/data/ultramarine/advancements/recipes/ultramarine.materials/zhaotou_template.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "ultramarine:zhaotou_template" + ] + }, + "criteria": { + "has_polished_blackstone": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": [ + "ultramarine:zhaotou_template" + ] + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "ultramarine:zhaotou_template" + } + } + }, + "requirements": [ + [ + "has_polished_blackstone", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/architrave_template.json b/src/generated/resources/data/ultramarine/recipes/architrave_template.json new file mode 100644 index 00000000..6b82de10 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/architrave_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:architrave_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/bronze_dust.json b/src/generated/resources/data/ultramarine/recipes/bronze_dust.json new file mode 100644 index 00000000..ed4bdd65 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/bronze_dust.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "ultramarine:bronze_ingot" + }, + "result": "ultramarine:bronze_dust", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/bronze_parts.json b/src/generated/resources/data/ultramarine/recipes/bronze_parts.json new file mode 100644 index 00000000..2e7faab1 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/bronze_parts.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "ultramarine:bronze_ingot" + }, + "result": "ultramarine:bronze_parts", + "count": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/caihua_template.json b/src/generated/resources/data/ultramarine/recipes/caihua_template.json new file mode 100644 index 00000000..1df576a0 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/caihua_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:caihua_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/carved_wood_template.json b/src/generated/resources/data/ultramarine/recipes/carved_wood_template.json new file mode 100644 index 00000000..9d91f0ee --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/carved_wood_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:carved_wood_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/fangxin_edge_template.json b/src/generated/resources/data/ultramarine/recipes/fangxin_edge_template.json new file mode 100644 index 00000000..b28f15b2 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/fangxin_edge_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:fangxin_edge_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/fangxin_template.json b/src/generated/resources/data/ultramarine/recipes/fangxin_template.json new file mode 100644 index 00000000..9b87bf9b --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/fangxin_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:fangxin_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/gold_dye_powder.json b/src/generated/resources/data/ultramarine/recipes/gold_dye_powder.json new file mode 100644 index 00000000..bbca5663 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/gold_dye_powder.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:gold_nugget" + }, + "result": "ultramarine:gold_dye_powder", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/gutou_template.json b/src/generated/resources/data/ultramarine/recipes/gutou_template.json new file mode 100644 index 00000000..766432c8 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/gutou_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:gutou_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/rafter_end_template.json b/src/generated/resources/data/ultramarine/recipes/rafter_end_template.json new file mode 100644 index 00000000..b9ac2450 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/rafter_end_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:rafter_end_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/rafter_template.json b/src/generated/resources/data/ultramarine/recipes/rafter_template.json new file mode 100644 index 00000000..755f8b81 --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/rafter_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:rafter_template", + "count": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/recipes/zhaotou_template.json b/src/generated/resources/data/ultramarine/recipes/zhaotou_template.json new file mode 100644 index 00000000..545e0d3a --- /dev/null +++ b/src/generated/resources/data/ultramarine/recipes/zhaotou_template.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": { + "item": "minecraft:polished_blackstone" + }, + "result": "ultramarine:zhaotou_template", + "count": 1 +} \ No newline at end of file diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index fdbbfb4f..7fe756f6 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -726,6 +726,7 @@ public class ItemRegistry { public static final RegistryObject GOLD_PARTS = simpleItem("gold_parts", ModCreativeTab.MATERIALS); public static final RegistryObject JADE_PARTS = simpleItem("jade_parts", ModCreativeTab.MATERIALS); public static final RegistryObject PORCELAIN_PARTS = simpleItem("porcelain_parts", ModCreativeTab.MATERIALS); + public static final RegistryObject BRONZE_PARTS = simpleItem("bronze_parts", ModCreativeTab.MATERIALS); // DYE POWDERS @@ -767,6 +768,8 @@ public class ItemRegistry { public static final RegistryObject SILK = simpleItem("silk", ModCreativeTab.MATERIALS); public static final RegistryObject XUAN_PAPER = simpleItem("xuan_paper", ModCreativeTab.MATERIALS); public static final RegistryObject COPPER_CASH_COIN = simpleItem("copper_cash_coin", ModCreativeTab.MATERIALS); + public static final RegistryObject BRONZE_INGOT = simpleItem("bronze_ingot", ModCreativeTab.MATERIALS); + public static final RegistryObject BRONZE_DUST = simpleItem("bronze_dust", ModCreativeTab.MATERIALS); // FOOD diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java index dcebb147..06a04308 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModRecipeProvider.java @@ -936,7 +936,7 @@ private static void categoryMaterials(@NotNull Consumer recipeCo //polishedPlankRecipe(ItemRegistry.EBONY_PLANKS.get(), ItemRegistry.POLISHED_EBONY_PLANK.get(), recipeConsumer); woodworking(Ingredient.of(ItemTags.PLANKS), ItemRegistry.WOODEN_FRAME.get(), 2, Items.OAK_PLANKS, recipeConsumer); - // PORCELAIN + // PORCELAIN dropped by porcelain blocks // PARTS @@ -948,6 +948,9 @@ private static void categoryMaterials(@NotNull Consumer recipeCo .unlockedBy(itemUnlockName(ItemRegistry.JADE.get()), itemCriterion(ItemRegistry.JADE.get())) .save(recipeConsumer); simpleStonecutting(ItemRegistry.BLUE_AND_WHITE_PORCELAIN_PIECE.get(), ItemRegistry.PORCELAIN_PARTS.get(), recipeConsumer); //todo add porcelain variants + SingleItemRecipeBuilder.stonecutting(Ingredient.of(ItemRegistry.BRONZE_INGOT.get()), ItemRegistry.BRONZE_PARTS.get(), 2) + .unlockedBy(itemUnlockName(ItemRegistry.BRONZE_INGOT.get()), itemCriterion(ItemRegistry.BRONZE_INGOT.get())) + .save(recipeConsumer); // DYE POWDERS @@ -967,6 +970,24 @@ private static void categoryMaterials(@NotNull Consumer recipeCo dyePowder(ModItemTags.FORGE_GREEN_DYE, ItemRegistry.GREEN_DYE_POWDER.get(), recipeConsumer); dyePowder(ModItemTags.FORGE_RED_DYE, ItemRegistry.RED_DYE_POWDER.get(), recipeConsumer); dyePowder(ModItemTags.FORGE_BLACK_DYE, ItemRegistry.BLACK_DYE_POWDER.get(), recipeConsumer); + simpleStonecutting(Items.GOLD_NUGGET, ItemRegistry.GOLD_DYE_POWDER.get(), recipeConsumer); + + // TEMPLATES + + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.CARVED_WOOD_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.FANGXIN_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.FANGXIN_EDGE_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.ZHAOTOU_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.GUTOU_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.RAFTER_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.RAFTER_END_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.ARCHITRAVE_TEMPLATE.get(), recipeConsumer); + simpleStonecutting(Items.POLISHED_BLACKSTONE, ItemRegistry.CAIHUA_TEMPLATE.get(), recipeConsumer); + + // MATERIALS + + dust(ItemRegistry.BRONZE_INGOT.get(), ItemRegistry.BRONZE_DUST.get(), recipeConsumer); + } private static void categoryTools(@NotNull Consumer recipeConsumer) { diff --git a/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java b/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java index 232dd670..1df040f1 100644 --- a/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java +++ b/src/main/java/com/voxelutopia/ultramarine/event/CommonEventHandler.java @@ -116,6 +116,14 @@ public static void villagerTradesHandler(VillagerTradesEvent event){ )); } + if (profession == VillagerProfession.TOOLSMITH){ + trades.get(4).add(($1, $2) -> new MerchantOffer( + new ItemStack(Items.EMERALD, 6), + new ItemStack(ItemRegistry.BRONZE_INGOT.get(), 1), + 12, 10, 0.05f + )); + } + if (profession == VillagerProfession.FARMER){ trades.get(3).add(($1, $2) -> new MerchantOffer( new ItemStack(Items.EMERALD, 4), diff --git a/src/main/resources/assets/ultramarine/lang/en_us.json b/src/main/resources/assets/ultramarine/lang/en_us.json index fdabf437..d3dd3a65 100644 --- a/src/main/resources/assets/ultramarine/lang/en_us.json +++ b/src/main/resources/assets/ultramarine/lang/en_us.json @@ -483,9 +483,11 @@ "item.ultramarine.gold_parts": "Gold Parts", "item.ultramarine.jade_parts": "Jade Parts", "item.ultramarine.porcelain_parts": "Porcelain Parts", + "item.ultramarine.bronze_parts": "Bronze Parts", "item.ultramarine.silk": "Silk", "item.ultramarine.linen": "Linen", "item.ultramarine.bronze_ingot": "Bronze Ingot", + "item.ultramarine.bronze_dust": "Bronze Dust", "item.ultramarine.copper_cash_coin": "Copper Cash Coin", "item.ultramarine.xuan_paper": "Xuan Paper", "item.ultramarine.mung_bean_cake": "Mung Bean Cake", diff --git a/src/main/resources/assets/ultramarine/lang/zh_cn.json b/src/main/resources/assets/ultramarine/lang/zh_cn.json index 6b62ed5a..cc654674 100644 --- a/src/main/resources/assets/ultramarine/lang/zh_cn.json +++ b/src/main/resources/assets/ultramarine/lang/zh_cn.json @@ -482,9 +482,11 @@ "item.ultramarine.gold_parts": "黄金部件", "item.ultramarine.jade_parts": "玉部件", "item.ultramarine.porcelain_parts": "陶瓷部件", + "item.ultramarine.bronze_parts": "黄铜部件", "item.ultramarine.silk": "丝绸", "item.ultramarine.linen": "亚麻布", - "item.ultramarine.bronze_ingot": "青铜锭", + "item.ultramarine.bronze_ingot": "黄铜锭", + "item.ultramarine.bronze_dust": "黄铜粉", "item.ultramarine.copper_cash_coin": "铜钱", "item.ultramarine.xuan_paper": "宣纸", "item.ultramarine.mung_bean_cake": "绿豆糕", diff --git a/src/main/resources/assets/ultramarine/textures/item/bronze.png b/src/main/resources/assets/ultramarine/textures/item/bronze_ingot.png similarity index 100% rename from src/main/resources/assets/ultramarine/textures/item/bronze.png rename to src/main/resources/assets/ultramarine/textures/item/bronze_ingot.png