diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 7197da27..d1e0a488 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,2 +1,2 @@ -// 1.20.1 2025-01-01T18:10:35.0971097 Registries +// 1.20.1 2025-01-02T20:11:28.4760901 Registries 77422dea3ce6602affa188bd5310f28b50571911 data/collectorsreap/trim_material/pearl.json diff --git a/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 b/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 index adb7a147..5c8790ab 100644 --- a/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 +++ b/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.1011125 Tags for minecraft:item mod id collectorsreap +// 1.20.1 2025-01-02T23:25:05.902131 Tags for minecraft:item mod id collectorsreap ae7e08f92dd075f34544c04d30c8a274b27bd792 data/atmospheric/tags/items/aloe_leaves.json b1c02044b6eb4060b19a0ed4f40cbeaca19822c9 data/atmospheric/tags/items/passion_fruit.json a740abeb613a7024a35910efe912a50a6ee62045 data/atmospheric/tags/items/yucca_fruit.json @@ -15,8 +15,7 @@ d0e079fbaabb8a11fc5541c60876765c04dbbe59 data/forge/tags/items/cooked_fishes/bas 824d63187983d41e32a95b9690792003758245ee data/forge/tags/items/cooked_prawn.json 7104c9e7bbc91243f65e443d91a4f12d11ba75d9 data/forge/tags/items/cookies.json 14d6fc1de29292b23a30a4290f741045aec41515 data/forge/tags/items/crab_meat.json -bc4befdd0c870f923b7e89bcb378e5b716e1b907 data/forge/tags/items/eggs.json -58ed56c78305d506ad08c53db0b6256782c8fe64 data/forge/tags/items/eggs/bird.json +ebd61208c46d8566aa1b8d9a574e938b725b71b9 data/forge/tags/items/eggs.json e4b369230d9eb6fc4f89aac9c8e5d3b6ad4bfd84 data/forge/tags/items/fruits.json 5c3c13634904bcd833fabcdc78b9af0b418ded45 data/forge/tags/items/fruits/citrus.json fa07aedec09509ee2c2a73ad09d57ccd453566f3 data/forge/tags/items/fruits/lime.json diff --git a/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e b/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e index fe651166..fb21a2ba 100644 --- a/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e +++ b/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.0891042 Block States: collectorsreap +// 1.20.1 2025-01-02T20:11:28.458047 Block States: collectorsreap e674cff0fcbb19f9b0afff4f1e477315d0cae326 assets/collectorsreap/blockstates/black_candle_lime_cake.json 8dfd84c574e9c7ee59198b0943b5aac0e8b28740 assets/collectorsreap/blockstates/black_candle_pomegranate_cake.json 6d6114f63bd694ebbf674057ebd45184487bbaf1 assets/collectorsreap/blockstates/blue_candle_lime_cake.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index f2f6633d..af66cdb2 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.0951084 Loot Tables +// 1.20.1 2025-01-02T20:11:28.4730873 Loot Tables f4a3c88fc95a893f684db7cc68e3f910e18b85fe data/collectorsreap/loot_tables/blocks/black_candle_lime_cake.json d1c4a614122d59c6e0b808daecf41bda624609db data/collectorsreap/loot_tables/blocks/black_candle_pomegranate_cake.json f88a0ece599f6eb71b969a4b3262f221540435a9 data/collectorsreap/loot_tables/blocks/blue_candle_lime_cake.json diff --git a/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e b/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e index 64ebcb94..fe4ee7a3 100644 --- a/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e +++ b/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:11:56.311827 Tags for minecraft:worldgen/biome mod id collectorsreap +// 1.20.1 2025-01-02T20:11:28.4836179 Tags for minecraft:worldgen/biome mod id collectorsreap 331fc3ce2bd75fa0bde7d7339ca74f6f9791fb50 data/collectorsreap/tags/worldgen/biome/has_spawn/chieftain_crab.json 74a855e481dd684fc14e843ffbf7634328669190 data/collectorsreap/tags/worldgen/biome/has_spawn/clam.json 4301fee991060a44225e5c74bedfd95e386538e1 data/collectorsreap/tags/worldgen/biome/has_spawn/lime.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index ec844a96..34d10cbe 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.0971097 Recipes +// 1.20.1 2025-01-02T20:11:28.4770911 Recipes 6bed5b7d715399840f10473875efca57540c42e3 data/collectorsreap/advancements/recipes/chiseled_urchin_test_bricks.json ffff41205e9b83cc8ab9d38ce39c06fa7e8f6ae7 data/collectorsreap/advancements/recipes/cutting/chieftain_claw.json 51d613fd6d246740518e1ed57afea6e6deea518e data/collectorsreap/advancements/recipes/cutting/chieftain_crab.json @@ -176,7 +176,7 @@ c22fdf3e9d57fc6bd8c10e5ac0ea1788cae4b772 data/collectorsreap/recipes/food/chieft 0cc3a18e12ec2af4bff56273e575505f75ee836f data/collectorsreap/recipes/food/chocolate_arils.json 581a8406a683e41bfbfc720da982ce619d9b6b42 data/collectorsreap/recipes/food/clam_chowder.json 12bc15d5a5cb08c984040b9ab9061041c0c19afe data/collectorsreap/recipes/food/clam_meatball_stew.json -ed996e6c4a0613bd20dce853834667dc5ec4020c data/collectorsreap/recipes/food/clam_pasta.json +40d3c7fbca9d44e2d4e3cb71bd70491b4b311c01 data/collectorsreap/recipes/food/clam_pasta.json 43f9670a9bd28d041dbafa84265f32a0469f21b7 data/collectorsreap/recipes/food/clam_roll.json e430305e741547c6c13e3293e790cf87175f8fe5 data/collectorsreap/recipes/food/cod_ceviche.json 8fce84da27881c7c06f72f0c077d1baf229fb40d data/collectorsreap/recipes/food/crab_lasagna.json @@ -189,12 +189,12 @@ f0330f53039dd44d4243e5b865fac928391cfbeb data/collectorsreap/recipes/food/honey_ 0eb4048d8f956391bb3f3eb66361901ecdd89193 data/collectorsreap/recipes/food/land_and_sea_burger.json 68973f90ab0982b1f155e62a6f74094591aab62c data/collectorsreap/recipes/food/land_and_sea_burger_from_bun.json 1ad606b6ff97667869681746b1113221b6af59b7 data/collectorsreap/recipes/food/limeade.json -f21f977b5e5ceb3bb64ee24ed25650c3cae2fb6d data/collectorsreap/recipes/food/lime_cake.json +bf8d67ef9ebd487245acda6ec27f4b945e81f56d data/collectorsreap/recipes/food/lime_cake.json ea5c8b3362334881e050700f8a9fe9a5c4453e58 data/collectorsreap/recipes/food/lime_cake_from_slices.json fdd7ad9c0c6962ae0cce3814f3dc30293225d4e5 data/collectorsreap/recipes/food/lime_cookie.json c63c049a625d452fa7b47e1d31c38742de1d46e9 data/collectorsreap/recipes/food/lime_ice_cream.json 25889e219ed1e4bbe8bb6a80881bc9a2253ac96d data/collectorsreap/recipes/food/lime_milkshake.json -4ea418bf7d292e63edff56ff47a4c20ba6fa0ce5 data/collectorsreap/recipes/food/lime_pie.json +f373c5411a5f636fd0a2ea68439fe546e4da0bb8 data/collectorsreap/recipes/food/lime_pie.json ac4f6f409fd97e0fe350effc2e2d1e0169ac2da8 data/collectorsreap/recipes/food/lime_pie_from_slices.json 70da8ebd9410983f53a7f80c6d054974c9aaa417 data/collectorsreap/recipes/food/mediterranean_salmon.json c7c7df6813f6ad104aa82c0dbca5ab885ad64777 data/collectorsreap/recipes/food/mint_limeade.json @@ -203,10 +203,10 @@ a01379a14d8ff1bd04dbcc58c9bfe795ec748612 data/collectorsreap/recipes/food/pink_l baa41a1feb6e1edf9dc607b721a3f517f8747da0 data/collectorsreap/recipes/food/pink_limeade_from_limeade.json 100b966357c2659448077a30caef9be1d9e2a0a9 data/collectorsreap/recipes/food/platinum_bass_stew.json ba6b723eadc5032fabc11d2d0fc1a174263f0345 data/collectorsreap/recipes/food/pomegranate_bean_salad.json -1ea3ea26cfa0b8a358a6a9ef6e363e140f2fecba data/collectorsreap/recipes/food/pomegranate_cake.json +c68e5579d54a3f9647705e3ca630d08f956947bd data/collectorsreap/recipes/food/pomegranate_cake.json e5c45e1625df8dec5238302d3c04f84cc28d6170 data/collectorsreap/recipes/food/pomegranate_cake_from_slices.json f50fdb42ee8421b55b02bbddb11b7a10756cfd97 data/collectorsreap/recipes/food/pomegranate_chicken.json -eaf5273b05e2890aea6b225a8e9b858d1240f777 data/collectorsreap/recipes/food/pomegranate_custard.json +a78a807359981eb6d310e4eb4b20e3df0147b0b0 data/collectorsreap/recipes/food/pomegranate_custard.json 4eccc136615476383af244b98c75967ecd543ade data/collectorsreap/recipes/food/pomegranate_ice_cream.json 1e9279d86eadfdec212fc674cdf4f274b5bed737 data/collectorsreap/recipes/food/pomegranate_milkshake.json 5f35d840e76f9ab8b373929df32760798a2f70a4 data/collectorsreap/recipes/food/pomegranate_mutton.json @@ -216,7 +216,7 @@ eaf5273b05e2890aea6b225a8e9b858d1240f777 data/collectorsreap/recipes/food/pomegr a6c23fc787bb0d2e895aae5b8da2826b7a15caa0 data/collectorsreap/recipes/food/portobello_burger.json 0fff010c2b4fecd6405b66dc50ed1848a737c4e2 data/collectorsreap/recipes/food/portobello_burger_from_bun.json cefc969ffe566e613f41b3826b3daa5e6c454bb5 data/collectorsreap/recipes/food/portobello_pasta.json -af341e67c9cdd9dff652f29011887f03a574c6e1 data/collectorsreap/recipes/food/portobello_quiche.json +bbe416d9c211b022f52b9bcc9fff79ae2921cfc0 data/collectorsreap/recipes/food/portobello_quiche.json fb5bb3f79593ad7c93584e37f923d37abace1139 data/collectorsreap/recipes/food/portobello_quiche_from_slices.json bdc036d43af455269f92ddca9220c899672741cf data/collectorsreap/recipes/food/portobello_rice_soup.json 1ed425e4a708b1dfb3040d10ce4ca6b336be2674 data/collectorsreap/recipes/food/portobello_risotto.json @@ -225,9 +225,9 @@ e785b13d289b9c27ebcd4cfa4a96801fd7e5fd56 data/collectorsreap/recipes/food/portob 683871651e1d774fc8d8143ef50ad35872eca6b3 data/collectorsreap/recipes/food/potato_fritters.json 2e64360d282c6a3cb454adb3a4c5153a4406a0b2 data/collectorsreap/recipes/food/prawn_ceviche.json c2e08a568c61d6a7215d6775dbb7e19d782b057c data/collectorsreap/recipes/food/prawn_noodles.json -43cb52c2930374a1ab9e9943e564f4dc2b7adde2 data/collectorsreap/recipes/food/prawn_po_boy.json +f337151fba53d7c612e1e112e3dbaa56ccc4981a data/collectorsreap/recipes/food/prawn_po_boy.json 8f992bd5606a4a4d1e789933affe28b2a77c8c08 data/collectorsreap/recipes/food/prawn_roll.json -d3449b5ea3c393fc428b9ae88359f62d12f41ad7 data/collectorsreap/recipes/food/prawn_stew.json +9f887133429b3d2b69da4092419e4a18e7aa6ff9 data/collectorsreap/recipes/food/prawn_stew.json a034913c1540d0ae6f9b11c14b6fcc6b1c80d1f2 data/collectorsreap/recipes/food/salmon_tartare.json d69ad32c074a0f883ea9255a1bbd2a3bb195a9e7 data/collectorsreap/recipes/food/salmon_wrapped_prawn.json b70a6260e6d3d0b2e5ca6fc341a778bff9b53393 data/collectorsreap/recipes/food/sea_wrap.json diff --git a/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 b/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 index a1ed772b..efe60202 100644 --- a/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 +++ b/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.096109 Global Loot Modifiers : collectorsreap +// 1.20.1 2025-01-02T20:11:28.475089 Global Loot Modifiers : collectorsreap 48ba606dd1af587f71212a0501539edb8b011f1e data/collectorsreap/loot_modifiers/cr_fishing.json fc90485601f70b14ac274d5d5179aa07d47b040f data/collectorsreap/loot_modifiers/lime_in_abandoned_mineshaft.json 753e8d670c790ed4fa156b208d70e62856229cf5 data/collectorsreap/loot_modifiers/lime_seeds_in_dungeon.json diff --git a/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 b/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 index 677b6bba..025a248a 100644 --- a/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 +++ b/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.0931069 Tags for minecraft:block mod id collectorsreap +// 1.20.1 2025-01-02T20:11:28.4645735 Tags for minecraft:block mod id collectorsreap 748e9338cb0e08e973af854da7e0a45c328db6fb data/autumnity/tags/blocks/snail_snacks.json 69bfc567eebda2cc6321f420e07d43720e9719f7 data/collectorsreap/tags/blocks/crab_spawnable_on.json 9fcca766e6223fb4dff1774d187235e66cf1ee7b data/collectorsreap/tags/blocks/pomegranate_fast_on.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 470c622a..9baf5930 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2025-01-01T18:10:35.100112 Languages: en_us +// 1.20.1 2025-01-02T20:11:28.4846183 Languages: en_us 93352f1a6d13cbb07c494466723c8e350dae0ba8 assets/collectorsreap/lang/en_us.json diff --git a/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 b/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 index 0e0d40c9..0f080485 100644 --- a/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 +++ b/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 @@ -1,3 +1,3 @@ -// 1.20.1 2025-01-01T18:10:35.0931069 Tags for minecraft:entity_type mod id collectorsreap +// 1.20.1 2025-01-02T20:11:28.4675758 Tags for minecraft:entity_type mod id collectorsreap ddd907b6cb1b03c93f42247088b1f1fa5a81084f data/collectorsreap/tags/entity_types/involatile.json 01c3f5cebabec10bf259b13ce1d6ce40be8bda20 data/collectorsreap/tags/entity_types/volatility_immune.json diff --git a/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 b/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 index b672c6c0..1fc7cd09 100644 --- a/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 +++ b/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-01T18:10:35.0941076 Item Models: collectorsreap +// 1.20.1 2025-01-02T20:11:28.4685767 Item Models: collectorsreap b183daae948efe76cbf209119af41701e5b72e95 assets/collectorsreap/models/item/adzuki_gummy.json 56db9a7317e6d5a63c63af71a4011b16c66c00e7 assets/collectorsreap/models/item/aloe_gummy.json b27cb012c75da3137768f12a8074eab65874647a assets/collectorsreap/models/item/apple_gummy.json diff --git a/src/generated/resources/data/collectorsreap/recipes/food/clam_pasta.json b/src/generated/resources/data/collectorsreap/recipes/food/clam_pasta.json index f8b3580a..15af814e 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/clam_pasta.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/clam_pasta.json @@ -26,7 +26,7 @@ "tag": "forge:milk" }, { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, { "tag": "forge:vegetables/tomato" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/lime_cake.json b/src/generated/resources/data/collectorsreap/recipes/food/lime_cake.json index 4cddea68..6684a93f 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/lime_cake.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/lime_cake.json @@ -13,7 +13,7 @@ "category": "misc", "key": { "e": { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, "l": { "tag": "forge:fruits/lime" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/lime_pie.json b/src/generated/resources/data/collectorsreap/recipes/food/lime_pie.json index 0b39532b..930714b0 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/lime_pie.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/lime_pie.json @@ -16,7 +16,7 @@ "item": "farmersdelight:pie_crust" }, "e": { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, "l": { "tag": "collectorsreap:lime_or_slice" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_cake.json b/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_cake.json index d6071c46..b89cb945 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_cake.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_cake.json @@ -13,7 +13,7 @@ "category": "misc", "key": { "e": { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, "m": { "tag": "forge:milk" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_custard.json b/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_custard.json index 9e37445b..a42585c7 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_custard.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/pomegranate_custard.json @@ -23,7 +23,7 @@ "tag": "forge:milk" }, { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, { "item": "minecraft:sugar" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/portobello_quiche.json b/src/generated/resources/data/collectorsreap/recipes/food/portobello_quiche.json index dc33915c..aeb82de7 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/portobello_quiche.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/portobello_quiche.json @@ -16,7 +16,7 @@ "item": "farmersdelight:pie_crust" }, "e": { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, "m": { "tag": "forge:milk" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/prawn_po_boy.json b/src/generated/resources/data/collectorsreap/recipes/food/prawn_po_boy.json index fa9314e7..f4fe65b4 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/prawn_po_boy.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/prawn_po_boy.json @@ -19,7 +19,7 @@ "tag": "forge:cooked_prawn" }, { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, { "tag": "forge:salad_ingredients/cabbage" diff --git a/src/generated/resources/data/collectorsreap/recipes/food/prawn_stew.json b/src/generated/resources/data/collectorsreap/recipes/food/prawn_stew.json index 50182225..d6a4b95e 100644 --- a/src/generated/resources/data/collectorsreap/recipes/food/prawn_stew.json +++ b/src/generated/resources/data/collectorsreap/recipes/food/prawn_stew.json @@ -26,7 +26,7 @@ "tag": "forge:milk" }, { - "tag": "forge:eggs/bird" + "tag": "forge:eggs" }, { "tag": "forge:vegetables/potato" diff --git a/src/generated/resources/data/forge/tags/items/eggs.json b/src/generated/resources/data/forge/tags/items/eggs.json index e2cb403a..bef2e719 100644 --- a/src/generated/resources/data/forge/tags/items/eggs.json +++ b/src/generated/resources/data/forge/tags/items/eggs.json @@ -1,5 +1,25 @@ { "values": [ - "#forge:eggs/bird" + "minecraft:turtle_egg", + { + "id": "sullysmod:tortoise_egg", + "required": false + }, + { + "id": "naturalist:tortoise_egg", + "required": false + }, + { + "id": "naturalist:duck_egg", + "required": false + }, + { + "id": "autumnity:turkey_egg", + "required": false + }, + { + "id": "deep_aether:quail_egg", + "required": false + } ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/eggs/bird.json b/src/generated/resources/data/forge/tags/items/eggs/bird.json deleted file mode 100644 index 48f6d764..00000000 --- a/src/generated/resources/data/forge/tags/items/eggs/bird.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "values": [ - "minecraft:egg", - { - "id": "naturalist:duck_egg", - "required": false - }, - { - "id": "autumnity:turkey_egg", - "required": false - }, - { - "id": "deep_aether:quail_egg", - "required": false - } - ] -} \ No newline at end of file diff --git a/src/main/java/net/brdle/collectorsreap/data/CRItemTags.java b/src/main/java/net/brdle/collectorsreap/data/CRItemTags.java index 8d292d53..a4969518 100644 --- a/src/main/java/net/brdle/collectorsreap/data/CRItemTags.java +++ b/src/main/java/net/brdle/collectorsreap/data/CRItemTags.java @@ -4,6 +4,7 @@ import net.brdle.collectorsreap.Util; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; +import net.minecraftforge.common.Tags; public class CRItemTags { @@ -30,7 +31,6 @@ public class CRItemTags { public static final TagKey RAW_HOGLIN = forge("raw_hoglin"); public static final TagKey RAW_STRIDER = forge("raw_strider"); public static final TagKey COOKIES = forge("cookies"); - public static final TagKey EGGS_BIRD = forge("eggs/bird"); // CR public static final TagKey GUMMIES = cr("gummies"); diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java b/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java index 860bbd77..1aa82415 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/CRItemTagProvider.java @@ -127,13 +127,13 @@ public void addTags(HolderLookup.@NotNull Provider provider) { .add(CRItems.LIME_COOKIE.get()); this.tag(CRItemTags.SUPP_COOKIES) .addTag(CRItemTags.COOKIES); - this.tag(CRItemTags.EGGS_BIRD) - .add(Items.EGG) + this.tag(Tags.Items.EGGS) + .add(Items.TURTLE_EGG) + .addOptional(Util.rl("sullysmod", "tortoise_egg")) + .addOptional(Util.rl("naturalist", "tortoise_egg")) .addOptional(Util.rl("naturalist", "duck_egg")) .addOptional(Util.rl("autumnity", "turkey_egg")) .addOptional(Util.rl("deep_aether", "quail_egg")); - this.tag(ForgeTags.EGGS) - .addTag(CRItemTags.EGGS_BIRD); this.tag(CRItemTags.DART_SHOOTERS) .add(Items.BAMBOO); diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/CRRecipeProvider.java b/src/main/java/net/brdle/collectorsreap/data/gen/CRRecipeProvider.java index 32c0a0e8..525a0a29 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/CRRecipeProvider.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/CRRecipeProvider.java @@ -205,7 +205,7 @@ protected void buildRecipes(@NotNull Consumer finished) { wrap(CookingPotRecipeBuilder.cookingPotRecipe(CRItems.POMEGRANATE_CUSTARD.get(), 1, 200, 1.0F, Items.GLASS_BOTTLE) .addIngredient(CRItemTags.FRUITS_POMEGRANATE) .addIngredient(ForgeTags.MILK) - .addIngredient(CRItemTags.EGGS_BIRD) + .addIngredient(Tags.Items.EGGS) .addIngredient(Items.SUGAR) .unlockedBy("has_pomegranate_slice", has(CRItemTags.FRUITS_POMEGRANATE)), "food/pomegranate_custard", finished, enabled(CRItems.POMEGRANATE_CUSTARD)); @@ -261,7 +261,7 @@ protected void buildRecipes(@NotNull Consumer finished) { .addIngredient(CRItemTags.RAW_CLAM) .addIngredient(ForgeTags.PASTA) .addIngredient(ForgeTags.MILK) - .addIngredient(CRItemTags.EGGS_BIRD) + .addIngredient(Tags.Items.EGGS) .addIngredient(ForgeTags.VEGETABLES_TOMATO) .addIngredient(ForgeTags.VEGETABLES_ONION) .unlockedBy("has_clam_meat", has(CRItems.CLAM_MEAT.get())), @@ -285,7 +285,7 @@ protected void buildRecipes(@NotNull Consumer finished) { .addIngredient(CRItemTags.COOKED_PRAWN) .addIngredient(ModItems.TOMATO_SAUCE.get()) .addIngredient(ForgeTags.MILK) - .addIngredient(CRItemTags.EGGS_BIRD) + .addIngredient(Tags.Items.EGGS) .addIngredient(ForgeTags.VEGETABLES_POTATO) .unlockedBy("has_cooked_prawn", has(CRItemTags.COOKED_PRAWN)), "food/prawn_stew", finished, enabled(CRItems.PRAWN_STEW)); @@ -512,7 +512,7 @@ protected void buildRecipes(@NotNull Consumer finished) { wrap(shapeless(RecipeCategory.FOOD, CRItems.PRAWN_PO_BOY) .requires(ForgeTags.BREAD) .requires(CRItemTags.COOKED_PRAWN) - .requires(CRItemTags.EGGS_BIRD) + .requires(Tags.Items.EGGS) .requires(ForgeTags.SALAD_INGREDIENTS_CABBAGE) .requires(ForgeTags.VEGETABLES_TOMATO) .requires(ForgeTags.VEGETABLES_ONION) @@ -590,7 +590,7 @@ protected void buildRecipes(@NotNull Consumer finished) { .pattern("eme") .pattern("ooo") .pattern("pcp") - .define('e', CRItemTags.EGGS_BIRD) + .define('e', Tags.Items.EGGS) .define('m', ForgeTags.MILK) .define('o', ForgeTags.VEGETABLES_ONION) .define('p', CRItems.BAKED_PORTOBELLO_CAP.get()) @@ -606,7 +606,7 @@ protected void buildRecipes(@NotNull Consumer finished) { .pattern("lll") .pattern("scm") .define('l', CRItemTags.LIME_OR_SLICE) - .define('e', CRItemTags.EGGS_BIRD) + .define('e', Tags.Items.EGGS) .define('s', Items.SUGAR) .define('m', ForgeTags.MILK) .define('c', ModItems.PIE_CRUST.get()) @@ -626,7 +626,7 @@ protected void buildRecipes(@NotNull Consumer finished) { .pattern("mlm") .pattern("ses") .pattern("wlw") - .define('e', CRItemTags.EGGS_BIRD) + .define('e', Tags.Items.EGGS) .define('m', ForgeTags.MILK) .define('l', CRItemTags.FRUITS_LIME) .define('s', Items.SUGAR) @@ -641,7 +641,7 @@ protected void buildRecipes(@NotNull Consumer finished) { .pattern("mpm") .pattern("ses") .pattern("wpw") - .define('e', CRItemTags.EGGS_BIRD) + .define('e', Tags.Items.EGGS) .define('m', ForgeTags.MILK) .define('p', CRItemTags.FRUITS_POMEGRANATE) .define('s', Items.SUGAR)