diff --git a/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 b/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 index a0a92643..dbb44b58 100644 --- a/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 +++ b/common/src/main/generated/.cache/0863d6b6d415911b15e9b245a98fa603d174e7c6 @@ -1,9 +1,9 @@ -// 1.21.3 Bingo/Tags for minecraft:item +// 1.21.4 Release Candidate 1 Bingo/Tags for minecraft:item b6112420422099eed7aaae79f801a0250bf8764a data/bingo/tags/item/all_mineral_blocks.json 849681cfac44a9f01a440afc75340e33bcdd9c4f data/bingo/tags/item/allowed_heads.json b8fb8aac34ee76a18519bf8341cc6965f6fc775f data/bingo/tags/item/banner_patterns.json 50d93d5dff6f31f99f861c2df7c4e2dc1ec86e4b data/bingo/tags/item/basic_mineral_blocks.json -72ee76c8c074ccc46fb422ca6f71e0db6eac67b1 data/bingo/tags/item/bonemealable.json +cd2afed4cf4cca46f9e57cd552ce33cf5e2f75d2 data/bingo/tags/item/bonemealable.json fd55d4f9e6c3005580bc3aed7e6c8a10dfdf5a91 data/bingo/tags/item/climbable.json c882f1fc924c7ace24f2ece6ec48f727ede793e9 data/bingo/tags/item/concrete.json a8e3cdd07707862c9287a13bbcb1ad927c21bde8 data/bingo/tags/item/dead_coral_blocks.json @@ -11,11 +11,13 @@ a8e3cdd07707862c9287a13bbcb1ad927c21bde8 data/bingo/tags/item/dead_coral_blocks. edc1d7ae236968dab44675ce2726aa8177c35461 data/bingo/tags/item/fish_buckets.json cffae9219a2ffab50a7f48a5083429e6aaaa85f0 data/bingo/tags/item/fishing_junk.json e69e73d172c40891d65fb28f3dbbc50a77c89c3c data/bingo/tags/item/fishing_treasure.json -c05e998c718feb7c79e577ca9f09edc7225b3d22 data/bingo/tags/item/flowers.json +cefd6a45729a4b211703ecfb540481fc6931c7c6 data/bingo/tags/item/flowers.json 84ca487e773b4a6e5d2dfb9c9a4e6a7d99f6f480 data/bingo/tags/item/glazed_terracotta.json fadcbb38e7665bed6ea2c1b8876f4954189179c5 data/bingo/tags/item/gold_in_name.json 1d06a2ee122e3edcd98600fe98e131c26392d4bf data/bingo/tags/item/living_coral_blocks.json 76ff0180f4ac33ecd2e129331abfc90bb84adad2 data/bingo/tags/item/meat.json 86894fcb39eb59a6350754e0397f720fe8f95ba6 data/bingo/tags/item/not_meat.json -48828d4be77f045e1a0ff9bb1a7ae16d73d0c2fe data/bingo/tags/item/slabs.json -089d3c92d1c3cec83e79681b2d921d41af15170c data/bingo/tags/item/stairs.json +8507c2b2fef6ee4a8d7612f9a88bdbcc5ee49ba2 data/bingo/tags/item/slabs.json +fa0e5bbc7baa2a87b08d4ff060afbe8add649491 data/bingo/tags/item/stairs.json +292d60df471fb3e6039b68cd562d7197fd5b980a data/bingo/tags/item/tall_flowers.json +3d04b6a728cd0032981b253212c9037e5d66cc22 data/bingo/tags/item/trim_templates.json diff --git a/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 b/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 index f0283f0d..2bc262ea 100644 --- a/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 +++ b/common/src/main/generated/.cache/297dc8c0802911a4b1235dc7fd00d8b887ddc7b2 @@ -1,4 +1,4 @@ -// 1.21.3 Bingo/Tags for minecraft:block +// 1.21.4 Release Candidate 1 Bingo/Tags for minecraft:block b6112420422099eed7aaae79f801a0250bf8764a data/bingo/tags/block/all_mineral_blocks.json 50d93d5dff6f31f99f861c2df7c4e2dc1ec86e4b data/bingo/tags/block/basic_mineral_blocks.json 085238f24aca214ce9eb3f57ab02370467990f33 data/bingo/tags/block/copper_blocks.json diff --git a/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 b/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 index 56d80f87..431925cf 100644 --- a/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 +++ b/common/src/main/generated/.cache/5e382c1dcfdccab7d9d316094aa5b015abb24861 @@ -1,5 +1,5 @@ -// 1.21.3 Bingo/Tags for minecraft:worldgen/configured_feature +// 1.21.4 Release Candidate 1 Bingo/Tags for minecraft:worldgen/configured_feature 013d9ea62ec0ddf2721a333297ac7574249a7563 data/bingo/tags/worldgen/configured_feature/huge_fungi.json afade1a0005224f958f1e4506ac161e087293ffb data/bingo/tags/worldgen/configured_feature/huge_mushrooms.json 39430c9384ca4890a27c206f2fd4ae6bf99c8730 data/bingo/tags/worldgen/configured_feature/mega_jungle_trees.json -85165a3d13da0173035b65d069a4f37b4fe49902 data/bingo/tags/worldgen/configured_feature/trees.json +cc47aa4eafc74b65c6f6ad1a19a803477bfd88e2 data/bingo/tags/worldgen/configured_feature/trees.json diff --git a/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 b/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 index 5b3a1db8..b2c1b4fe 100644 --- a/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 +++ b/common/src/main/generated/.cache/81117bebc11de4e4a17e141516825a2dcdf80cb4 @@ -1,3 +1,3 @@ -// 1.21.3 Bingo/Tags for minecraft:damage_type +// 1.21.4 Release Candidate 1 Bingo/Tags for minecraft:damage_type 0b98089d9e5e0278007f19881ffff2e4bdd990b0 data/bingo/tags/damage_type/berry_bush.json d1ee7bd9dc6ab495ba73da1f280cf19c3e54586f data/bingo/tags/damage_type/void.json diff --git a/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 b/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 index a8550374..86bfd58a 100644 --- a/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 +++ b/common/src/main/generated/.cache/abd11bd80d925d09bec653682365b33e1c628412 @@ -1,4 +1,4 @@ -// 1.21.3 Bingo/Tags for minecraft:entity_type -d75e6edfc24a5cd791f808f13d958ee9146ad879 data/bingo/tags/entity_type/hostile.json +// 1.21.4 Release Candidate 1 Bingo/Tags for minecraft:entity_type +a7266d62674990146a1e353a2242927ac8595909 data/bingo/tags/entity_type/hostile.json c32b895c9caf0e47d56aa324a6fe36ebb50f8754 data/bingo/tags/entity_type/passive.json 98330efe44bb1f14c86f1b764de6b749e31e03b1 data/bingo/tags/entity_type/tamable.json diff --git a/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 b/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 index 9e5491a1..cc671265 100644 --- a/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 +++ b/common/src/main/generated/.cache/fc6fe7acca2b7156c3a9a1a4a9b4946c68c37823 @@ -1,4 +1,4 @@ -// 1.21.3 Bingo/Bingo goals +// 1.21.4 Release Candidate 1 Bingo/Bingo goals 60933cb93b51bc5046fb820f19ed358af2699f4d data/bingo/bingo/goal/easy/3x3x3_glass_cube.json 49041086f9176f531ee3096073f5f1230a4e0f6a data/bingo/bingo/goal/easy/4x4_paintings.json 86d1d398343deced49a4d91d7b0ca17274600842 data/bingo/bingo/goal/easy/acacia_log.json @@ -48,7 +48,7 @@ db609a040f6342c59be40ac8c35bd07bbc0174e9 data/bingo/bingo/goal/easy/cut_sandston 1602ac535923af29d61511abb1adf6fbd5b22273 data/bingo/bingo/goal/easy/dead_bush.json 22e548d31778ef763882be34fe7565dee7d74cfe data/bingo/bingo/goal/easy/different_colored_shields.json ec9ac0d68d3369392df21107a0af540942cf5ee6 data/bingo/bingo/goal/easy/different_fish.json -a44eca8d6c16189f9303314e2841bcf0bb8c0e70 data/bingo/bingo/goal/easy/different_flowers.json +8a6d82d3712de6cd0a2ed947dc50ea7f64448683 data/bingo/bingo/goal/easy/different_flowers.json 582a9ff49dc48c6c63ef1fc548bac0d957046645 data/bingo/bingo/goal/easy/different_slabs.json c334650a5ee8f28a3d95ffe6cd001af55caa52ae data/bingo/bingo/goal/easy/different_stairs.json 76e43a841dd1d1630f5517211355952f0ea94bcd data/bingo/bingo/goal/easy/disenchant.json @@ -65,7 +65,7 @@ f44d7c72b92caf7bc6def6d7a2bcf27ce78f89c5 data/bingo/bingo/goal/easy/feather.json 18a0ea4bdbc00230ac5260d53b18c9350b3c1c19 data/bingo/bingo/goal/easy/fermented_spider_eye.json d99653aa4be89ffeeeed6fb67b8aea5d850fd05f data/bingo/bingo/goal/easy/fill_bundle.json d8841bf3176d1994f76649da1849c277786bcbf1 data/bingo/bingo/goal/easy/fill_water_cauldron.json -44244e744f4b412f27766b92b468c0c9be16c766 data/bingo/bingo/goal/easy/finish_at_spawn.json +3a6453dda3d6539b84b8ee8a10f8f29566f3ca79 data/bingo/bingo/goal/easy/finish_at_spawn.json 66d844b0c71416883190edafdd93bab00daa48d9 data/bingo/bingo/goal/easy/fish_treasure_junk.json 841544c182f8ef11e603396c1d870827a55b882c data/bingo/bingo/goal/easy/flint.json 7555c1b6896e1c9220be0cb7b9d73e1bf813b6da data/bingo/bingo/goal/easy/full_iron_armor.json @@ -171,7 +171,7 @@ f70709cd3c94a8007b545409e05b4057bf284aa7 data/bingo/bingo/goal/easy/yellow_dye.j 9fc37f21d82a5a865b47f66843d45d6ae958135b data/bingo/bingo/goal/hard/6x6scaffolding.json 6798b4185a52a0db40e254189a9d9a626306c697 data/bingo/bingo/goal/hard/all_pickaxes.json dfd27dd94b993865c74b77330a527e1ddf3bce3b data/bingo/bingo/goal/hard/all_swords.json -b00e5fce751f2054c303d0508ba8044d433ae1b4 data/bingo/bingo/goal/hard/armor_trims.json +4c5ca9e23b00690c49394022dd3df62847c454e7 data/bingo/bingo/goal/hard/armor_trims.json fa792625b604cb3048b411629de819d46e034cd3 data/bingo/bingo/goal/hard/bed_row.json 6903c02e192530e725673ee97817ddef22749802 data/bingo/bingo/goal/hard/bonemealable_blocks.json fab07567003cc2fc393d2bc331bddb9d715e55db data/bingo/bingo/goal/hard/breed_pandas.json @@ -272,7 +272,7 @@ e491c360a66e40c893fd86ad586f111f7a2ec766 data/bingo/bingo/goal/medium/crouch_dis 2cf9c1433902a4d21a288d6c0e248b7edc45843d data/bingo/bingo/goal/medium/daylight_detector.json 80654013eb12a4f600e0ee2bbc214997c9cede60 data/bingo/bingo/goal/medium/diamond_block.json a85c1efd208d634d4c0ad4722bae4e372d18e067 data/bingo/bingo/goal/medium/diamond_in_name.json -50cbe7be09bbb6499eba01039e95c361f2c14461 data/bingo/bingo/goal/medium/different_flowers.json +5ff022dffb0d0a7b2e88a3202d6f08bb34b927f0 data/bingo/bingo/goal/medium/different_flowers.json 97f5fbe190aa5363bef9aa30eb4cedcd4eaae21a data/bingo/bingo/goal/medium/different_saplings.json 524ae877758ea21323b4347a0f3c508a912ba00c data/bingo/bingo/goal/medium/dried_kelp_block.json 5eab18305e8491e81710a522e272c71bbb17c98e data/bingo/bingo/goal/medium/edible_items.json @@ -307,7 +307,7 @@ d2b0d6a8dd9714a472882be430c222fe5e9dfa96 data/bingo/bingo/goal/medium/iron_block 7ecc63a47d4bf00f5b213f0b80520132c66e89a3 data/bingo/bingo/goal/medium/item_frame.json 9f205d2007a3791aa17edf9007a23dfd8c54cf62 data/bingo/bingo/goal/medium/kill_golem.json 8ab402836b2aa0e439183086ce11a00fd7f6f37d data/bingo/bingo/goal/medium/kill_hostile_with_berries.json -242dca53b8ab66574739eda45b7e4b3a109f3f75 data/bingo/bingo/goal/medium/kill_mobs.json +eea754fc0a38c7f4254a324bd5fecf3c09dd0e7a data/bingo/bingo/goal/medium/kill_mobs.json b04f0d5f09b51bf2f355fb424b6868fd022549b9 data/bingo/bingo/goal/medium/kill_self_with_arrow.json 3b5fc34fac71fcd63d5c059ed20982f7443e724a data/bingo/bingo/goal/medium/kill_with_crystal.json 3d89fa541171469d187a87186d3181d868e31717 data/bingo/bingo/goal/medium/lapis_block.json @@ -457,7 +457,7 @@ b3e51f0f2da51866b5c0e5c9a5bcb3e5a0c2c0a4 data/bingo/bingo/goal/very_hard/all_dye 22839d439d819fb145097f7d1c6fb2886c38e199 data/bingo/bingo/goal/very_hard/all_goat_horns.json 1b5dcc05ad69d41307f26e44aec797f6ec8b6616 data/bingo/bingo/goal/very_hard/all_mineral_blocks.json 23c837332ca49cc2bce7da669f49b653e3905efa data/bingo/bingo/goal/very_hard/any_head.json -0dc93b63e5f54acc0eed302e556798653f1fec29 data/bingo/bingo/goal/very_hard/armor_trims.json +ea1d89d2fcd20a02a96e77ac76b3b9d6fc900c7b data/bingo/bingo/goal/very_hard/armor_trims.json 5d44aa401fd646bc31cbd1acd7a415d55c7fa8a1 data/bingo/bingo/goal/very_hard/beacon_regen.json 06c419b8517777c09d474aba8098c00c3ef7b218 data/bingo/bingo/goal/very_hard/bed_row.json 3e9359c857a0c0f3eafec86a6b59ea9d5dcdd777 data/bingo/bingo/goal/very_hard/blue_ice.json diff --git a/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed b/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed index dc66bfb8..641dfedd 100644 --- a/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed +++ b/common/src/main/generated/.cache/fd92b0e9e07895138b66a79af3d38ddbb4f5c5ed @@ -1,4 +1,4 @@ -// 1.21.3 Bingo/Bingo registries +// 1.21.4 Release Candidate 1 Bingo/Bingo registries a9f72075009412853f311f802e5a8cc82026e3b1 data/bingo/bingo/difficulty/easy.json c9569c8872f3f25555109253e266f5c683ed2377 data/bingo/bingo/difficulty/hard.json de8a0760a96282ce0120de5a0068c43bd439bbbe data/bingo/bingo/difficulty/medium.json diff --git a/common/src/main/generated/data/bingo/bingo/goal/easy/different_flowers.json b/common/src/main/generated/data/bingo/bingo/goal/easy/different_flowers.json index 621df938..12e703f5 100644 --- a/common/src/main/generated/data/bingo/bingo/goal/easy/different_flowers.json +++ b/common/src/main/generated/data/bingo/bingo/goal/easy/different_flowers.json @@ -17,7 +17,7 @@ "bingo_type": "bingo:sub", "key": "count" }, - "tag": "minecraft:flowers" + "tag": "bingo:flowers" }, "trigger": "bingo:has_some_items_from_tag" } @@ -29,7 +29,7 @@ "bingo_type": "bingo:sub", "key": "count" }, - "tag": "minecraft:flowers" + "tag": "bingo:flowers" }, "infrequency": 2, "name": { diff --git a/common/src/main/generated/data/bingo/bingo/goal/easy/finish_at_spawn.json b/common/src/main/generated/data/bingo/bingo/goal/easy/finish_at_spawn.json index 652ad2b9..172c0394 100644 --- a/common/src/main/generated/data/bingo/bingo/goal/easy/finish_at_spawn.json +++ b/common/src/main/generated/data/bingo/bingo/goal/easy/finish_at_spawn.json @@ -3,6 +3,12 @@ "nearby": { "conditions": { "player": [ + { + "condition": "minecraft:location_check", + "predicate": { + "dimension": "minecraft:overworld" + } + }, { "condition": "bingo:distance_from_spawn", "distance": { diff --git a/common/src/main/generated/data/bingo/bingo/goal/hard/armor_trims.json b/common/src/main/generated/data/bingo/bingo/goal/hard/armor_trims.json index 00bbcc65..c93858fc 100644 --- a/common/src/main/generated/data/bingo/bingo/goal/hard/armor_trims.json +++ b/common/src/main/generated/data/bingo/bingo/goal/hard/armor_trims.json @@ -4,7 +4,7 @@ "obtain": { "conditions": { "required_count": 3, - "tag": "minecraft:trim_templates" + "tag": "bingo:trim_templates" }, "trigger": "bingo:has_some_items_from_tag" } @@ -13,7 +13,7 @@ "icon": { "type": "bingo:item_tag_cycle", "count": 3, - "tag": "minecraft:trim_templates" + "tag": "bingo:trim_templates" }, "name": { "translate": "bingo.goal.armor_trims", diff --git a/common/src/main/generated/data/bingo/bingo/goal/medium/different_flowers.json b/common/src/main/generated/data/bingo/bingo/goal/medium/different_flowers.json index 12177a23..2ec743fe 100644 --- a/common/src/main/generated/data/bingo/bingo/goal/medium/different_flowers.json +++ b/common/src/main/generated/data/bingo/bingo/goal/medium/different_flowers.json @@ -17,7 +17,7 @@ "bingo_type": "bingo:sub", "key": "count" }, - "tag": "minecraft:flowers" + "tag": "bingo:flowers" }, "trigger": "bingo:has_some_items_from_tag" } @@ -29,7 +29,7 @@ "bingo_type": "bingo:sub", "key": "count" }, - "tag": "minecraft:flowers" + "tag": "bingo:flowers" }, "infrequency": 2, "name": { diff --git a/common/src/main/generated/data/bingo/bingo/goal/medium/kill_mobs.json b/common/src/main/generated/data/bingo/bingo/goal/medium/kill_mobs.json index 0e158f5a..8f07c47d 100644 --- a/common/src/main/generated/data/bingo/bingo/goal/medium/kill_mobs.json +++ b/common/src/main/generated/data/bingo/bingo/goal/medium/kill_mobs.json @@ -147,6 +147,14 @@ "id": "minecraft:cow_spawn_egg" } }, + { + "type": "bingo:entity", + "entity": "minecraft:creaking", + "item": { + "count": 1, + "id": "minecraft:creaking_spawn_egg" + } + }, { "type": "bingo:entity", "entity": "minecraft:creeper", diff --git a/common/src/main/generated/data/bingo/bingo/goal/very_hard/armor_trims.json b/common/src/main/generated/data/bingo/bingo/goal/very_hard/armor_trims.json index 4b7c70b3..59dac437 100644 --- a/common/src/main/generated/data/bingo/bingo/goal/very_hard/armor_trims.json +++ b/common/src/main/generated/data/bingo/bingo/goal/very_hard/armor_trims.json @@ -4,7 +4,7 @@ "obtain": { "conditions": { "required_count": 5, - "tag": "minecraft:trim_templates" + "tag": "bingo:trim_templates" }, "trigger": "bingo:has_some_items_from_tag" } @@ -13,7 +13,7 @@ "icon": { "type": "bingo:item_tag_cycle", "count": 5, - "tag": "minecraft:trim_templates" + "tag": "bingo:trim_templates" }, "name": { "translate": "bingo.goal.armor_trims", diff --git a/common/src/main/generated/data/bingo/tags/entity_type/hostile.json b/common/src/main/generated/data/bingo/tags/entity_type/hostile.json index 7f9c71dc..3f93d63b 100644 --- a/common/src/main/generated/data/bingo/tags/entity_type/hostile.json +++ b/common/src/main/generated/data/bingo/tags/entity_type/hostile.json @@ -5,7 +5,6 @@ "minecraft:breeze", "minecraft:cave_spider", "minecraft:creaking", - "minecraft:creaking_transient", "minecraft:creeper", "minecraft:drowned", "minecraft:elder_guardian", diff --git a/common/src/main/generated/data/bingo/tags/item/bonemealable.json b/common/src/main/generated/data/bingo/tags/item/bonemealable.json index 7136e0f6..7779c397 100644 --- a/common/src/main/generated/data/bingo/tags/item/bonemealable.json +++ b/common/src/main/generated/data/bingo/tags/item/bonemealable.json @@ -2,7 +2,7 @@ "values": [ "#minecraft:villager_plantable_seeds", "#minecraft:saplings", - "#minecraft:tall_flowers", + "#bingo:tall_flowers", "minecraft:bamboo", "minecraft:big_dripleaf", "minecraft:small_dripleaf", diff --git a/common/src/main/generated/data/bingo/tags/item/flowers.json b/common/src/main/generated/data/bingo/tags/item/flowers.json index 4aa35cef..843703f9 100644 --- a/common/src/main/generated/data/bingo/tags/item/flowers.json +++ b/common/src/main/generated/data/bingo/tags/item/flowers.json @@ -1,6 +1,6 @@ { "values": [ "#minecraft:small_flowers", - "#minecraft:tall_flowers" + "#bingo:tall_flowers" ] } \ No newline at end of file diff --git a/common/src/main/generated/data/bingo/tags/item/slabs.json b/common/src/main/generated/data/bingo/tags/item/slabs.json index 7f543ffa..ef85d171 100644 --- a/common/src/main/generated/data/bingo/tags/item/slabs.json +++ b/common/src/main/generated/data/bingo/tags/item/slabs.json @@ -41,6 +41,7 @@ "minecraft:prismarine_slab", "minecraft:prismarine_brick_slab", "minecraft:dark_prismarine_slab", + "minecraft:resin_brick_slab", "minecraft:polished_granite_slab", "minecraft:smooth_red_sandstone_slab", "minecraft:mossy_stone_brick_slab", diff --git a/common/src/main/generated/data/bingo/tags/item/stairs.json b/common/src/main/generated/data/bingo/tags/item/stairs.json index 8272a603..69301006 100644 --- a/common/src/main/generated/data/bingo/tags/item/stairs.json +++ b/common/src/main/generated/data/bingo/tags/item/stairs.json @@ -13,6 +13,7 @@ "minecraft:waxed_oxidized_cut_copper_stairs", "minecraft:purpur_stairs", "minecraft:cobblestone_stairs", + "minecraft:resin_brick_stairs", "minecraft:brick_stairs", "minecraft:stone_brick_stairs", "minecraft:mud_brick_stairs", diff --git a/common/src/main/generated/data/bingo/tags/item/tall_flowers.json b/common/src/main/generated/data/bingo/tags/item/tall_flowers.json new file mode 100644 index 00000000..02602649 --- /dev/null +++ b/common/src/main/generated/data/bingo/tags/item/tall_flowers.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lilac", + "minecraft:peony", + "minecraft:pitcher_plant", + "minecraft:rose_bush", + "minecraft:sunflower" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/bingo/tags/item/trim_templates.json b/common/src/main/generated/data/bingo/tags/item/trim_templates.json new file mode 100644 index 00000000..230a9a38 --- /dev/null +++ b/common/src/main/generated/data/bingo/tags/item/trim_templates.json @@ -0,0 +1,22 @@ +{ + "values": [ + "minecraft:bolt_armor_trim_smithing_template", + "minecraft:coast_armor_trim_smithing_template", + "minecraft:dune_armor_trim_smithing_template", + "minecraft:eye_armor_trim_smithing_template", + "minecraft:flow_armor_trim_smithing_template", + "minecraft:host_armor_trim_smithing_template", + "minecraft:raiser_armor_trim_smithing_template", + "minecraft:rib_armor_trim_smithing_template", + "minecraft:sentry_armor_trim_smithing_template", + "minecraft:shaper_armor_trim_smithing_template", + "minecraft:silence_armor_trim_smithing_template", + "minecraft:snout_armor_trim_smithing_template", + "minecraft:spire_armor_trim_smithing_template", + "minecraft:tide_armor_trim_smithing_template", + "minecraft:vex_armor_trim_smithing_template", + "minecraft:ward_armor_trim_smithing_template", + "minecraft:wayfinder_armor_trim_smithing_template", + "minecraft:wild_armor_trim_smithing_template" + ] +} \ No newline at end of file diff --git a/common/src/main/generated/data/bingo/tags/worldgen/configured_feature/trees.json b/common/src/main/generated/data/bingo/tags/worldgen/configured_feature/trees.json index 7b3a5b90..0cea846f 100644 --- a/common/src/main/generated/data/bingo/tags/worldgen/configured_feature/trees.json +++ b/common/src/main/generated/data/bingo/tags/worldgen/configured_feature/trees.json @@ -3,6 +3,7 @@ "minecraft:oak", "minecraft:dark_oak", "minecraft:pale_oak", + "minecraft:pale_oak_bonemeal", "minecraft:pale_oak_creaking", "minecraft:birch", "minecraft:acacia", diff --git a/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinEntity.java b/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinEntity.java index 82f8e5c9..39c6326d 100644 --- a/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinEntity.java +++ b/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinEntity.java @@ -58,7 +58,7 @@ private void setDroppedBy(ServerLevel serverLevel, ItemStack itemStack, float f, shift = At.Shift.AFTER ) ) - private void customTrigger(Entity killed, int scoreValue, DamageSource source, CallbackInfo ci) { + private void customTrigger(Entity killed, DamageSource source, CallbackInfo ci) { BingoTriggers.ENTITY_KILLED_PLAYER.get().trigger((ServerPlayer)killed, (Entity)(Object)this, source); } } diff --git a/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinServerPlayer.java b/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinServerPlayer.java index ba3c630f..1dd09657 100644 --- a/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinServerPlayer.java +++ b/common/src/main/java/io/github/gaming32/bingo/mixin/common/MixinServerPlayer.java @@ -48,7 +48,7 @@ private void itemPickedUpTrigger(ItemEntity itemEntity, CallbackInfo ci) { @Inject(method = "awardKillScore", at = @At("HEAD")) @SuppressWarnings("UnreachableCode") - private void killSelfTrigger(Entity killed, int scoreValue, DamageSource source, CallbackInfo ci) { + private void killSelfTrigger(Entity killed, DamageSource source, CallbackInfo ci) { if (killed == (Object)this) { BingoTriggers.KILL_SELF.get().trigger((ServerPlayer)killed, source); }