From 081da836eda1b1fb3cd7ceac830328c1fcb81b4b Mon Sep 17 00:00:00 2001 From: YipKei <53115298+YipKei@users.noreply.github.com> Date: Sat, 29 Jun 2024 09:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=BB=BA=E7=AD=91=E6=96=B9=E5=9D=97=E6=9C=AA=E8=83=BD=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E5=BA=94=E7=94=A8=E6=8C=96=E6=8E=98=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3513c90cf19585ba85dce4bb4961dfc418764cbe | 2 +- .../4455c36134312040c3981d1a65d87410e591c38c | 2 +- .../46608147a03287dfdb8e0fa4f9102c4e2889225f | 9 +- .../4f22e9d501004ea65aac67eb84f633ec54fdd9e2 | 2 +- .../52b837f51544eeb314a89d0baa50276126ed9e15 | 2 +- .../6a7e12ea7cf1015f5401221fbb1c9800a2881825 | 2 +- .../cf36120aef76dfc9135b307737d1c5e76a54edb4 | 2 +- .../e764169a5e6dc427a404f8b7f74fc0c7b162a4f2 | 26 +-- .../tags/block/mineable/pickaxe.json | 155 +++++++++++++++++- .../minecraft/tags/block/mineable/shovel.json | 13 ++ .../tags/block/needs_diamond_tool.json | 9 +- .../vanilla-addition/tags/block/obsidian.json | 8 +- .../data/generator/ModBlockTagProvider.java | 81 ++++++++- .../data/lang/ModEnUsLangProvider.java | 2 +- .../data/lang/ModZhCnLangProvider.java | 2 +- .../data/lang/ModZhHkLangProvider.java | 2 +- 16 files changed, 285 insertions(+), 34 deletions(-) create mode 100644 src/main/generated/data/minecraft/tags/block/mineable/shovel.json diff --git a/src/main/generated/.cache/3513c90cf19585ba85dce4bb4961dfc418764cbe b/src/main/generated/.cache/3513c90cf19585ba85dce4bb4961dfc418764cbe index 2be8e2b..6683a8a 100644 --- a/src/main/generated/.cache/3513c90cf19585ba85dce4bb4961dfc418764cbe +++ b/src/main/generated/.cache/3513c90cf19585ba85dce4bb4961dfc418764cbe @@ -1,2 +1,2 @@ -// 1.21 2024-06-28T11:48:03.7673116 Vanilla Addition/Language (zh_hk) +// 1.21 2024-06-29T09:29:54.7711333 Vanilla Addition/Language (zh_hk) 81675f0f5667df06b68a41b410ae3b3147ecc7c6 assets\vanilla-addition\lang\zh_hk.json diff --git a/src/main/generated/.cache/4455c36134312040c3981d1a65d87410e591c38c b/src/main/generated/.cache/4455c36134312040c3981d1a65d87410e591c38c index cc8720b..fdd363f 100644 --- a/src/main/generated/.cache/4455c36134312040c3981d1a65d87410e591c38c +++ b/src/main/generated/.cache/4455c36134312040c3981d1a65d87410e591c38c @@ -1,2 +1,2 @@ -// 1.21 2024-06-28T11:48:03.7834176 Vanilla Addition/Language (zh_cn) +// 1.21 2024-06-29T09:29:54.7929763 Vanilla Addition/Language (zh_cn) 6ddd3b471cb305ff5a8f5177889d0f6e0708b301 assets\vanilla-addition\lang\zh_cn.json diff --git a/src/main/generated/.cache/46608147a03287dfdb8e0fa4f9102c4e2889225f b/src/main/generated/.cache/46608147a03287dfdb8e0fa4f9102c4e2889225f index f802e72..f35643f 100644 --- a/src/main/generated/.cache/46608147a03287dfdb8e0fa4f9102c4e2889225f +++ b/src/main/generated/.cache/46608147a03287dfdb8e0fa4f9102c4e2889225f @@ -1,14 +1,15 @@ -// 1.21 2024-06-28T11:48:03.7658045 Vanilla Addition/Tags for minecraft:block +// 1.21 2024-06-29T09:29:54.7691864 Vanilla Addition/Tags for minecraft:block ff6f92a3e9ef8e4d51485509dae9a528c14c76a0 data\vanilla-addition\tags\block\nether_bricks.json 34969052b498f41eaf578b7489231a8dd5ec55a2 data\minecraft\tags\block\beacon_base_blocks.json -858b4736f63a64046a40e9dbd025c709c79d7cb2 data\vanilla-addition\tags\block\obsidian.json +96122621230a2112253efc3723f65deb6ee0fb48 data\vanilla-addition\tags\block\obsidian.json 46c914fc5a9a16aba22d45e84efb29a9a0ba17f7 data\minecraft\tags\block\walls.json df61f73843a6cfb476f990e97e6d5dbcd2741125 data\vanilla-addition\tags\block\fairy_wand_replaceable.json -35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\minecraft\tags\block\needs_diamond_tool.json +6e36c43445339b5f766dae865cbb05a81b449af5 data\minecraft\tags\block\needs_diamond_tool.json +df79d43e8fd7dfa07b1b6c581cebaf707b87bf9e data\minecraft\tags\block\mineable\shovel.json 321e61550e6ec68cce5017c383ba3c59523b3815 data\minecraft\tags\block\stairs.json 34969052b498f41eaf578b7489231a8dd5ec55a2 data\minecraft\tags\block\needs_iron_tool.json 068aff5cb32d712026aa14aa88a3f074166c9e1c data\minecraft\tags\block\slabs.json 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\minecraft\tags\block\needs_stone_tool.json -34969052b498f41eaf578b7489231a8dd5ec55a2 data\minecraft\tags\block\mineable\pickaxe.json +498a9cce9e136ae3fc797869c939f1be843c9666 data\minecraft\tags\block\mineable\pickaxe.json 0eb85ae18a15d14311f1a26d94d4e8894bf17ee5 data\minecraft\tags\block\ice.json a562be063bc6c25dc6cd74ef91845c6f67a36321 data\vanilla-addition\tags\block\world_destroyer.json diff --git a/src/main/generated/.cache/4f22e9d501004ea65aac67eb84f633ec54fdd9e2 b/src/main/generated/.cache/4f22e9d501004ea65aac67eb84f633ec54fdd9e2 index b9f24d3..b07fa8b 100644 --- a/src/main/generated/.cache/4f22e9d501004ea65aac67eb84f633ec54fdd9e2 +++ b/src/main/generated/.cache/4f22e9d501004ea65aac67eb84f633ec54fdd9e2 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T11:48:03.7619121 Vanilla Addition/Block Loot Tables +// 1.21 2024-06-29T09:29:54.7652931 Vanilla Addition/Block Loot Tables 65582469a7435f6364ca0c189e06cc7497e76075 data\vanilla-addition\loot_table\blocks\ice_stairs.json 1a98f88a25643465c0404911c7ed52ac7b4c2d05 data\vanilla-addition\loot_table\blocks\magenta_concrete_stairs.json 8b11a61582f4250ff65fd05bb8861fa422d474c1 data\vanilla-addition\loot_table\blocks\packed_ice_slab.json diff --git a/src/main/generated/.cache/52b837f51544eeb314a89d0baa50276126ed9e15 b/src/main/generated/.cache/52b837f51544eeb314a89d0baa50276126ed9e15 index a52f8fa..88e8cfa 100644 --- a/src/main/generated/.cache/52b837f51544eeb314a89d0baa50276126ed9e15 +++ b/src/main/generated/.cache/52b837f51544eeb314a89d0baa50276126ed9e15 @@ -1,2 +1,2 @@ -// 1.21 2024-06-28T11:48:03.7673116 Vanilla Addition/Language (en_us) +// 1.21 2024-06-29T09:29:54.7711333 Vanilla Addition/Language (en_us) c7f25e5a650c88c4350e5f7e1b4aff52545770df assets\vanilla-addition\lang\en_us.json diff --git a/src/main/generated/.cache/6a7e12ea7cf1015f5401221fbb1c9800a2881825 b/src/main/generated/.cache/6a7e12ea7cf1015f5401221fbb1c9800a2881825 index e599a51..39bd62e 100644 --- a/src/main/generated/.cache/6a7e12ea7cf1015f5401221fbb1c9800a2881825 +++ b/src/main/generated/.cache/6a7e12ea7cf1015f5401221fbb1c9800a2881825 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T11:48:03.7736208 Vanilla Addition/Recipes +// 1.21 2024-06-29T09:29:54.7762071 Vanilla Addition/Recipes eaa9bfa0fc0031b7242c08fc7a9d2e7b5a83c5ea data\vanilla-addition\recipe\arms_up_pottery_sherd_prototype_from_arms_up_pottery_sherd_blueprint.json e5a0f5b8e7ff2d91d2f87e2d0cc175ce9572a468 data\vanilla-addition\advancement\recipes\misc\diamond_shovel_recycling_by_stone_hammer.json 84d107d13f3be57332a21a096fd8dac6db00c386 data\vanilla-addition\advancement\recipes\building_blocks\dark_oak_slab_from_stripped_dark_oak_log_stonecutting.json diff --git a/src/main/generated/.cache/cf36120aef76dfc9135b307737d1c5e76a54edb4 b/src/main/generated/.cache/cf36120aef76dfc9135b307737d1c5e76a54edb4 index 11a8aad..168b292 100644 --- a/src/main/generated/.cache/cf36120aef76dfc9135b307737d1c5e76a54edb4 +++ b/src/main/generated/.cache/cf36120aef76dfc9135b307737d1c5e76a54edb4 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T11:48:03.7658045 Vanilla Addition/Tags for minecraft:item +// 1.21 2024-06-29T09:29:54.7701601 Vanilla Addition/Tags for minecraft:item fdab8ddd5529ae14b26bc1853b004131135318a4 data\vanilla-addition\tags\item\diamond_like_ingredients.json f7c5163386ca4f6f59c115f8a2488784b9f15ce3 data\minecraft\tags\item\axes.json 8cda0614724ff2d3771cb9987e19759dd204f0a6 data\minecraft\tags\item\shovels.json diff --git a/src/main/generated/.cache/e764169a5e6dc427a404f8b7f74fc0c7b162a4f2 b/src/main/generated/.cache/e764169a5e6dc427a404f8b7f74fc0c7b162a4f2 index 5f61ad2..9f91985 100644 --- a/src/main/generated/.cache/e764169a5e6dc427a404f8b7f74fc0c7b162a4f2 +++ b/src/main/generated/.cache/e764169a5e6dc427a404f8b7f74fc0c7b162a4f2 @@ -1,4 +1,4 @@ -// 1.21 2024-06-28T11:48:03.7673116 Vanilla Addition/Model Definitions +// 1.21 2024-06-29T09:29:54.7711333 Vanilla Addition/Model Definitions 28b4faa5e5d0a06aca9d634390b7f4a68e33e10d assets\vanilla-addition\models\block\yellow_terracotta_wall_inventory.json b267da6f5f6a2c11266371de6e944af2d1b5cf0b assets\vanilla-addition\models\block\orange_terracotta_stairs.json 7506a0f6edd24cc5b6b95a590d9a5ef5b1bbc82d assets\vanilla-addition\models\block\purple_terracotta_wall_inventory.json @@ -91,8 +91,8 @@ af6ff37c2adac6997ed9d32d112e2b139747eff2 assets\vanilla-addition\models\item\ely 035ac0f8801c05550d3ff3ca895e977f54931fa1 assets\vanilla-addition\models\item\lime_terracotta_slab.json 9468c753d66678280dde49d5bd6773d3eeef8734 assets\vanilla-addition\models\block\green_terracotta_stairs_inner.json 72f847f7a179cd36dc12a5875720372cd5f28c31 assets\vanilla-addition\models\block\light_gray_terracotta_stairs_outer.json -bb7ab7343b4fe04c35aaba75aa01bda93f1eaf57 assets\vanilla-addition\models\item\burn_pottery_sherd_prototype.json 052ba472a0428e8372dfc944f52953b7b5e8e8e1 assets\vanilla-addition\models\block\black_concrete_wall_side_tall.json +bb7ab7343b4fe04c35aaba75aa01bda93f1eaf57 assets\vanilla-addition\models\item\burn_pottery_sherd_prototype.json d177f105092958ccb6ae3089b9eb2bf40b19e5bb assets\minecraft\blockstates\yellow_terracotta.json df10973f0b2cb0b68b7ba47718c380adfa7175e7 assets\vanilla-addition\models\item\blue_terracotta_wall.json c5d8b677a55c1ea1f3d7b1771e350c5de3ba87e9 assets\vanilla-addition\models\block\blue_ice_stairs.json @@ -131,8 +131,8 @@ dd3819992d0cb6d1c03814efe5418cb50ae49324 assets\vanilla-addition\models\block\po 226d17404abc5969dbfc21ad97c524470ce89afd assets\vanilla-addition\models\block\pink_concrete_stairs_inner.json 6cdedf16e9750931345133486e2c1017e5dfdfaa assets\vanilla-addition\models\block\yellow_terracotta_slab.json 66a8a641a1a7e9c433789884eb9f68228eb6a883 assets\vanilla-addition\models\block\purple_concrete_stairs.json -ced112c14b3e3a95761af2487dd6a1d79b96af5e assets\vanilla-addition\models\block\cyan_terracotta_stairs_inner.json 2233459e735bb9ba4e7cdfcbdb491240fbfcf224 assets\vanilla-addition\models\block\blue_concrete_stairs.json +ced112c14b3e3a95761af2487dd6a1d79b96af5e assets\vanilla-addition\models\block\cyan_terracotta_stairs_inner.json 0c3a2f41601c4043d161251c8b7316d588226fa3 assets\vanilla-addition\models\block\white_concrete_slab_top.json bb423e13b3006e6fba88430c595cfe0485974728 assets\vanilla-addition\models\item\yellow_concrete_wall.json a2113069b3c6a7706650f5f74661e94ffab64c3e assets\vanilla-addition\models\block\red_terracotta_wall_side_tall.json @@ -186,8 +186,8 @@ ae9fa36a44293ed30092d1c4cafcfdb071024340 assets\vanilla-addition\models\item\cal 1119889c6614242d08661ff177ac2ed6d7b49dc0 assets\minecraft\blockstates\green_concrete.json c00dde6b416dbc740ebf10ce5fbf319b5f26cc14 assets\vanilla-addition\models\block\cyan_terracotta_stairs.json b4a6c06ba56331ff83de41558dd9efb48ddb9887 assets\vanilla-addition\models\block\amethyst_wall_post.json -561b0c0edfae957b611c0b93bce2b7b9cf0fe92f assets\vanilla-addition\blockstates\amethyst_slab.json e9ea8cd2c6109163c88cb39b3478de67c5308b7c assets\vanilla-addition\blockstates\blue_ice_stairs.json +561b0c0edfae957b611c0b93bce2b7b9cf0fe92f assets\vanilla-addition\blockstates\amethyst_slab.json 5f2f67ac2902b2aaefb8899ee18a822a7a3ede70 assets\vanilla-addition\models\item\blue_terracotta_slab.json eb01d2a403b631fff3d5d9df529c6dbbeddf57a4 assets\vanilla-addition\models\block\glowstone_wall_post.json fa0c24a440e1866ee12af1d493c642c3ab108ed2 assets\vanilla-addition\models\block\glowstone_stairs.json @@ -209,8 +209,8 @@ c0e411613d08f49967a09d82ac7499271823d340 assets\vanilla-addition\models\block\ma 5fc40396999843148d1944c9e08919c68402c711 assets\vanilla-addition\models\item\diamond_upgraded_axe.json 379fec45212dd09ca8bc3703bb4943380707feac assets\vanilla-addition\models\item\light_gray_slab.json 971f9effc0d72a0c9ec3d2ee55e83eb003eba0cd assets\vanilla-addition\models\block\polished_diorite_wall_inventory.json -8c38d6df02596fb2006e793f649f3af93052a05d assets\vanilla-addition\blockstates\light_gray_terracotta_stairs.json 80d39a1d91895445379dbb07ab16bcf4136603fa assets\vanilla-addition\blockstates\green_concrete_wall.json +8c38d6df02596fb2006e793f649f3af93052a05d assets\vanilla-addition\blockstates\light_gray_terracotta_stairs.json 6e9d18adcb3401c8cf681fafae3467d19e58991a assets\vanilla-addition\models\item\glass_pickaxe.json 0809079f37716853902a651c5ae1c4e90ea76ceb assets\vanilla-addition\models\block\gray_concrete_wall_post.json e66f874ee21bb21ec4c23dfb2dee3fa8787463f8 assets\vanilla-addition\models\item\glass_pickaxe_prototype.json @@ -378,8 +378,8 @@ c73d6edcedd418d4929d180fb3a32dcac2d28fce assets\vanilla-addition\models\item\scr 40dde9c8444326c3b6de61a2c609935b8e3421f3 assets\vanilla-addition\models\item\black_terracotta_slab.json 509f5d133bbb6494dc14ca83e7abafcf57ce8910 assets\vanilla-addition\models\item\green_terracotta_wall.json d175739ef5b741f59d6447ba537e8e8eeecf6cb1 assets\vanilla-addition\blockstates\magenta_concrete_slab.json -025a77169481c9d60d303ba31431290b375b7160 assets\vanilla-addition\blockstates\glowstone_wall.json 6c5ae251f74053750aefae8c6ecb28e35a550803 assets\vanilla-addition\blockstates\red_concrete_slab.json +025a77169481c9d60d303ba31431290b375b7160 assets\vanilla-addition\blockstates\glowstone_wall.json 3145603c5a397176756ae9758f3e0299e8ca2886 assets\vanilla-addition\models\block\white_terracotta_wall_post.json 5a200ea0a8d3cf4c51257abd4bf706c2e03a2289 assets\vanilla-addition\models\block\brown_concrete_stairs.json 5de4e6c53fae49092567878ddcd0733dc1eb3dd3 assets\vanilla-addition\models\block\crying_obsidian_wall_inventory.json @@ -452,8 +452,8 @@ bfd642bfe567c0befa6f73fe585964c46ff18b06 assets\vanilla-addition\blockstates\pur 66dd853f2e576f6175fc29c1c52a1b7f82dd3336 assets\minecraft\models\block\packed_ice.json d85b60645b40cee8ebd3340cf6d235923af9724b assets\vanilla-addition\models\item\arms_up_pottery_sherd_prototype.json 421f14ad91b2143684d88b412e1447ea3c20abc8 assets\vanilla-addition\models\item\gray_concrete_wall.json -186c7e4130bc001ff737112e1ce12b254400b946 assets\vanilla-addition\blockstates\light_gray_stairs.json ef43feeba1697c873fb3da408828a7f870644ca2 assets\minecraft\blockstates\blue_terracotta.json +186c7e4130bc001ff737112e1ce12b254400b946 assets\vanilla-addition\blockstates\light_gray_stairs.json 3ebe8d48db07e2cd1ae035650bf438374e04c2fd assets\vanilla-addition\blockstates\gray_concrete_slab.json d38955eebf27424fe4690d426a627da2484245be assets\vanilla-addition\blockstates\black_concrete_wall.json e8bf6bd5c888a030bda160f9dea5d7848820b6e4 assets\vanilla-addition\models\block\brown_concrete_wall_side.json @@ -470,8 +470,8 @@ dfb44029766b0dc44106a5fbcac6a59a2bc663c8 assets\vanilla-addition\models\block\cr c4acb0e0f69d80b70d8b63d38dbf7a5ed15f77a0 assets\minecraft\models\block\purpur_block.json 68adfe3d0b30d6ce92fd2dab0561bc4659accf51 assets\minecraft\blockstates\amethyst_block.json 8cceedc7099b0cf1e5b67a70df6cb1511bca35bc assets\vanilla-addition\models\block\clay_slab_top.json -2c6f34826fb31dd21f7bedecf3c0eb178e6b9604 assets\minecraft\blockstates\light_gray_concrete.json 3c43a9c78d0e84eff2d483cc01a1b68438c10f6b assets\minecraft\blockstates\orange_concrete.json +2c6f34826fb31dd21f7bedecf3c0eb178e6b9604 assets\minecraft\blockstates\light_gray_concrete.json 836c73ecab7336a47e0640c9df5b8be912ae9189 assets\vanilla-addition\models\item\miner_pottery_sherd_prototype.json 4f8cbefd7818402667b7cebe67867d8fd36d54fa assets\vanilla-addition\models\block\crying_obsidian_wall_side_tall.json a88cbe2a3ae38508b8f1d75d30b4a745d70cde2c assets\vanilla-addition\models\item\steel_hoe.json @@ -570,8 +570,8 @@ febb01bc8e2d66ff0ba94645615b3f5e0efac34e assets\vanilla-addition\models\block\bl dbfb0ce8b4a51343e28334d955d73099fc96b478 assets\vanilla-addition\models\block\prismarine_bricks_wall_post.json 2470f8b11ca99baf166e4c7a39fb2ff056d1e504 assets\vanilla-addition\models\item\diamond_shard.json 59f978fce7298eb40a73c7a6bd6130f201286754 assets\vanilla-addition\models\item\flow_pottery_sherd_prototype.json -05b813a6e99050f83114010231737dd60dc8f830 assets\vanilla-addition\models\block\blue_ice_wall_post.json 94a9cb6479e1f634d08c1b56234d4db685d7cc4d assets\vanilla-addition\blockstates\orange_concrete_stairs.json +05b813a6e99050f83114010231737dd60dc8f830 assets\vanilla-addition\models\block\blue_ice_wall_post.json b3f0453a0d359c575b6d8e890d28dddc652844ef assets\vanilla-addition\models\block\amethyst_stairs.json 6f2499ffd5ef9de273cd2b392fcf7822bbbe3a5c assets\vanilla-addition\models\item\roasted_rotten_flesh.json 905cc26da029394b931fafe285080e4bcb43d87b assets\vanilla-addition\models\block\light_blue_concrete_wall_post.json @@ -665,8 +665,8 @@ c4eb954e1e2214c56446d752264575e2d031afa6 assets\vanilla-addition\models\item\lim 0d6e71e277377651c58822439ee0fba5d95aeeb8 assets\vanilla-addition\models\block\smooth_stone_stairs_inner.json a73be6114321412178ec2c0d608415bf4e42a3ad assets\vanilla-addition\models\block\magenta_concrete_wall_side_tall.json 24a4cc6d1014638853c619b710d95895536d7689 assets\vanilla-addition\models\item\gray_terracotta_slab.json -fadbeb7e0d982f7badc18f828acc8901d93b249e assets\vanilla-addition\blockstates\amethyst_stairs.json 4a17c92ac0c239c80c967d51891901768877dae0 assets\vanilla-addition\blockstates\white_concrete_stairs.json +fadbeb7e0d982f7badc18f828acc8901d93b249e assets\vanilla-addition\blockstates\amethyst_stairs.json f97d97c8471e81515686d2d6277117eaddde8dfd assets\vanilla-addition\models\block\purple_terracotta_slab_top.json 24546f395ccb02abc8027d86234449e5ced3afa2 assets\vanilla-addition\models\block\smooth_basalt_wall_side.json 39a761f695eece2a439a700344445df4b526b9de assets\vanilla-addition\models\item\pink_concrete_slab.json @@ -743,8 +743,8 @@ c868d32970b21895459ce89cb25c8bcd32d21bd1 assets\vanilla-addition\blockstates\blu d2b64355776e8338ab3d82ee55b29c67885581d4 assets\vanilla-addition\models\block\smooth_basalt_stairs_inner.json d94c8b5640e259df44f6b59995d9e23bd1239b6b assets\vanilla-addition\models\block\calcite_stairs_inner.json 906e6dd85754e8e8e72d02d44765e1d1aabd5eae assets\vanilla-addition\models\item\blue_concrete_wall.json -d1b83e49f6c525e977f3bb288169dbba02fcd288 assets\vanilla-addition\models\block\gray_concrete_stairs_outer.json e97043231664860b6326174c68d4b5e880ec6afd assets\vanilla-addition\models\block\brown_terracotta_slab.json +d1b83e49f6c525e977f3bb288169dbba02fcd288 assets\vanilla-addition\models\block\gray_concrete_stairs_outer.json 16fa75c7864ab791362803fa66900a612dfff138 assets\vanilla-addition\blockstates\gray_concrete_wall.json e905b4a0b2d89219016a129bb735b73b01b00d5c assets\vanilla-addition\models\item\dark_prismarine_wall.json 69163521305610a21f1d06cfbfe555edccd920cb assets\vanilla-addition\models\block\obsidian_stairs_inner.json @@ -836,8 +836,8 @@ ab8fc9e7e5c2f4e2ba5704474d90ef370ca18706 assets\vanilla-addition\models\block\cy 14f96b3b81db89a8572551e552f2701041ede3d5 assets\vanilla-addition\models\block\light_gray_terracotta_stairs_inner.json 818a256292b5a28e34231664ecfd2b1dc9b2f1d9 assets\vanilla-addition\models\item\suspicious_prototype.json 5a3b6e960dc48950cd453c970d1ebc5412a900d8 assets\vanilla-addition\models\block\lime_terracotta_wall_post.json -076b0cc6948d5fdbd575f001c8cba29daed31b45 assets\vanilla-addition\blockstates\lime_concrete_stairs.json 4bbcd09bc87b0980aef93ca2242d4980178cca5c assets\minecraft\blockstates\red_concrete.json +076b0cc6948d5fdbd575f001c8cba29daed31b45 assets\vanilla-addition\blockstates\lime_concrete_stairs.json 7f2f30e6d8f3000781578d3aba25690fcb3a32e3 assets\vanilla-addition\models\item\magenta_concrete_stairs.json 41eb2774c0aea65baa0c7c8280fa83192932cf96 assets\vanilla-addition\models\item\light_gray_terracotta_wall.json bcb6708e30f1f24702d77c6c2ab0bbcd9fd31509 assets\vanilla-addition\models\block\light_blue_concrete_wall_side.json @@ -902,8 +902,8 @@ b1c8ce9e3bdb0d74cf8a753386cc2bebd25f3794 assets\vanilla-addition\models\item\bla 35691fa9c475c606089423ef849d2d318bc2a14f assets\vanilla-addition\models\item\purple_concrete_stairs.json f4663460093cfe4f4184669326eb2253c893a84c assets\vanilla-addition\models\block\white_concrete_stairs_inner.json 44fb46bcf9bb05db083f6cfb05ce8ff34e6dff75 assets\vanilla-addition\blockstates\lime_terracotta_wall.json -018a4a7fc6c85d59c22d9b743803868267ca779c assets\vanilla-addition\blockstates\ice_wall.json 879e6c9349b8937fd84a19aae66bba3c660eee5e assets\vanilla-addition\blockstates\clay_slab.json +018a4a7fc6c85d59c22d9b743803868267ca779c assets\vanilla-addition\blockstates\ice_wall.json 90c9637daa8d39f54be6b18e5232e684a0103fb5 assets\vanilla-addition\models\block\brown_terracotta_stairs_inner.json 47b7c3820b4efba4eb10f15e02396d7f14eb3576 assets\vanilla-addition\blockstates\yellow_concrete_wall.json e640b5b57b090ea9936476687e184a6078fe307c assets\minecraft\models\block\mud.json diff --git a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json index 2dd6798..5e07764 100644 --- a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,5 +1,158 @@ { "values": [ - "vanilla-addition:steel_block" + "vanilla-addition:steel_block", + "vanilla-addition:stone_wall", + "vanilla-addition:smooth_stone_wall", + "vanilla-addition:smooth_stone_stairs", + "vanilla-addition:calcite_wall", + "vanilla-addition:calcite_stairs", + "vanilla-addition:calcite_slay", + "vanilla-addition:polished_granite_wall", + "vanilla-addition:polished_diorite_wall", + "vanilla-addition:polished_andesite_wall", + "vanilla-addition:smooth_sandstone_wall", + "vanilla-addition:smooth_red_sandstone_wall", + "vanilla-addition:prismarine_bricks_wall", + "vanilla-addition:dark_prismarine_wall", + "vanilla-addition:netherrack_wall", + "vanilla-addition:netherrack_stairs", + "vanilla-addition:netherrack_stair", + "vanilla-addition:basalt_wall", + "vanilla-addition:basalt_stairs", + "vanilla-addition:basalt_slab", + "vanilla-addition:smooth_basalt_wall", + "vanilla-addition:smooth_basalt_stairs", + "vanilla-addition:smooth_basalt_slab", + "vanilla-addition:polished_basalt_wall", + "vanilla-addition:polished_basalt_stairs", + "vanilla-addition:polished_basalt_slab", + "vanilla-addition:purpur_wall", + "vanilla-addition:end_stone_wall", + "vanilla-addition:end_stone_stairs", + "vanilla-addition:end_stone_slab", + "vanilla-addition:quartz_wall", + "minecraft:quartz_stairs", + "minecraft:quartz_slab", + "vanilla-addition:smooth_quartz_wall", + "vanilla-addition:amethyst_wall", + "vanilla-addition:amethyst_stairs", + "vanilla-addition:amethyst_slab", + "vanilla-addition:glowstone_wall", + "vanilla-addition:glowstone_stairs", + "vanilla-addition:glowstone_slab", + "vanilla-addition:ice_wall", + "vanilla-addition:ice_stairs", + "vanilla-addition:ice_slab", + "vanilla-addition:packed_ice_wall", + "vanilla-addition:packed_ice_stairs", + "vanilla-addition:packed_ice_slab", + "vanilla-addition:blue_ice_wall", + "vanilla-addition:blue_ice_stairs", + "vanilla-addition:blue_ice_slab", + "vanilla-addition:obsidian_wall", + "vanilla-addition:obsidian_stairs", + "vanilla-addition:obsidian_stair", + "vanilla-addition:crying_obsidian_wall", + "vanilla-addition:crying_obsidian_stairs", + "vanilla-addition:crying_obsidian_stair", + "vanilla-addition:white_concrete_wall", + "vanilla-addition:white_concrete_stairs", + "vanilla-addition:white_concrete_slab", + "vanilla-addition:light_gray_concrete_wall", + "vanilla-addition:light_gray_stairs", + "vanilla-addition:light_gray_slab", + "vanilla-addition:gray_concrete_wall", + "vanilla-addition:gray_concrete_stairs", + "vanilla-addition:gray_concrete_slab", + "vanilla-addition:black_concrete_wall", + "vanilla-addition:black_concrete_stairs", + "vanilla-addition:black_concrete_slab", + "vanilla-addition:brown_concrete_wall", + "vanilla-addition:brown_concrete_stairs", + "vanilla-addition:brown_concrete_slab", + "vanilla-addition:red_concrete_wall", + "vanilla-addition:red_concrete_stairs", + "vanilla-addition:red_concrete_slab", + "vanilla-addition:orange_concrete_wall", + "vanilla-addition:orange_concrete_stairs", + "vanilla-addition:orange_concrete_slab", + "vanilla-addition:yellow_concrete_wall", + "vanilla-addition:yellow_concrete_stairs", + "vanilla-addition:yellow_concrete_slab", + "vanilla-addition:lime_concrete_wall", + "vanilla-addition:lime_concrete_stairs", + "vanilla-addition:lime_concrete_slab", + "vanilla-addition:green_concrete_wall", + "vanilla-addition:green_concrete_stairs", + "vanilla-addition:gray_concrete_slab", + "vanilla-addition:cyan_concrete_wall", + "vanilla-addition:cyan_concrete_stairs", + "vanilla-addition:cyan_concrete_slab", + "vanilla-addition:light_blue_concrete_wall", + "vanilla-addition:light_blue_concrete_stairs", + "vanilla-addition:light_blue_concrete_slab", + "vanilla-addition:blue_concrete_wall", + "vanilla-addition:blue_concrete_stairs", + "vanilla-addition:blue_concrete_slab", + "vanilla-addition:purple_concrete_wall", + "vanilla-addition:purple_concrete_stairs", + "vanilla-addition:purple_concrete_slab", + "vanilla-addition:magenta_concrete_wall", + "vanilla-addition:magenta_concrete_stairs", + "vanilla-addition:magenta_concrete_slab", + "vanilla-addition:pink_concrete_wall", + "vanilla-addition:pink_concrete_stairs", + "vanilla-addition:pink_concrete_slab", + "vanilla-addition:terracotta_wall", + "vanilla-addition:terracotta_stairs", + "vanilla-addition:terracotta_slab", + "vanilla-addition:white_terracotta_wall", + "vanilla-addition:white_terracotta_stairs", + "vanilla-addition:white_terracotta_slab", + "vanilla-addition:light_gray_terracotta_wall", + "vanilla-addition:light_gray_terracotta_stairs", + "vanilla-addition:light_gray_terracotta_slab", + "vanilla-addition:gray_terracotta_wall", + "vanilla-addition:gray_terracotta_stairs", + "vanilla-addition:gray_terracotta_slab", + "vanilla-addition:black_terracotta_wall", + "vanilla-addition:black_terracotta_stairs", + "vanilla-addition:black_terracotta_slab", + "vanilla-addition:brown_terracotta_wall", + "vanilla-addition:brown_terracotta_stairs", + "vanilla-addition:brown_terracotta_slab", + "vanilla-addition:red_terracotta_wall", + "vanilla-addition:red_terracotta_stairs", + "vanilla-addition:red_terracotta_slab", + "vanilla-addition:orange_terracotta_wall", + "vanilla-addition:orange_terracotta_stairs", + "vanilla-addition:orange_terracotta_slab", + "vanilla-addition:yellow_terracotta_wall", + "vanilla-addition:yellow_terracotta_stairs", + "vanilla-addition:yellow_terracotta_slab", + "vanilla-addition:lime_terracotta_wall", + "vanilla-addition:lime_terracotta_stairs", + "vanilla-addition:lime_terracotta_slab", + "vanilla-addition:green_terracotta_wall", + "vanilla-addition:green_terracotta_stairs", + "vanilla-addition:gray_terracotta_slab", + "vanilla-addition:cyan_terracotta_wall", + "vanilla-addition:cyan_terracotta_stairs", + "vanilla-addition:cyan_terracotta_slab", + "vanilla-addition:light_blue_terracotta_wall", + "vanilla-addition:light_blue_terracotta_stairs", + "vanilla-addition:light_blue_terracotta_slab", + "vanilla-addition:blue_terracotta_wall", + "vanilla-addition:blue_terracotta_stairs", + "vanilla-addition:blue_terracotta_slab", + "vanilla-addition:purple_terracotta_wall", + "vanilla-addition:purple_terracotta_stairs", + "vanilla-addition:purple_terracotta_slab", + "vanilla-addition:magenta_terracotta_wall", + "vanilla-addition:magenta_terracotta_stairs", + "vanilla-addition:magenta_terracotta_slab", + "vanilla-addition:pink_terracotta_wall", + "vanilla-addition:pink_terracotta_stairs", + "vanilla-addition:pink_terracotta_slab" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/mineable/shovel.json b/src/main/generated/data/minecraft/tags/block/mineable/shovel.json new file mode 100644 index 0000000..56fa213 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/block/mineable/shovel.json @@ -0,0 +1,13 @@ +{ + "values": [ + "vanilla-addition:dirt_wall", + "vanilla-addition:dirt_stairs", + "vanilla-addition:dirt_slab", + "vanilla-addition:mud_wall", + "vanilla-addition:mud_stairs", + "vanilla-addition:mud_slab", + "vanilla-addition:clay_wall", + "vanilla-addition:clay_stairs", + "vanilla-addition:clay_slab" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json b/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json index f72d209..2fac311 100644 --- a/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json +++ b/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json @@ -1,3 +1,10 @@ { - "values": [] + "values": [ + "vanilla-addition:obsidian_wall", + "vanilla-addition:obsidian_stairs", + "vanilla-addition:obsidian_stair", + "vanilla-addition:crying_obsidian_wall", + "vanilla-addition:crying_obsidian_stairs", + "vanilla-addition:crying_obsidian_stair" + ] } \ No newline at end of file diff --git a/src/main/generated/data/vanilla-addition/tags/block/obsidian.json b/src/main/generated/data/vanilla-addition/tags/block/obsidian.json index 756686d..15659dd 100644 --- a/src/main/generated/data/vanilla-addition/tags/block/obsidian.json +++ b/src/main/generated/data/vanilla-addition/tags/block/obsidian.json @@ -1,6 +1,12 @@ { "values": [ "minecraft:obsidian", - "minecraft:crying_obsidian" + "vanilla-addition:obsidian_wall", + "vanilla-addition:obsidian_stairs", + "vanilla-addition:obsidian_stair", + "minecraft:crying_obsidian", + "vanilla-addition:crying_obsidian_wall", + "vanilla-addition:crying_obsidian_stairs", + "vanilla-addition:crying_obsidian_stair" ] } \ No newline at end of file diff --git a/src/main/java/com/yipkei/vanilladdition/data/generator/ModBlockTagProvider.java b/src/main/java/com/yipkei/vanilladdition/data/generator/ModBlockTagProvider.java index d77f173..98fc4f9 100644 --- a/src/main/java/com/yipkei/vanilladdition/data/generator/ModBlockTagProvider.java +++ b/src/main/java/com/yipkei/vanilladdition/data/generator/ModBlockTagProvider.java @@ -19,22 +19,93 @@ public ModBlockTagProvider(FabricDataOutput output, CompletableFuture