diff --git a/MCprep_addon/MCprep_resources/mcprep_data_update.json b/MCprep_addon/MCprep_resources/mcprep_data_update.json index f3c3b494..7bc8dbcb 100644 --- a/MCprep_addon/MCprep_resources/mcprep_data_update.json +++ b/MCprep_addon/MCprep_resources/mcprep_data_update.json @@ -869,7 +869,7 @@ "absorbing_hardcore_half": "gui/sprites/hud/heart/absorbing_hardcore_half", "absorbing_hardcore_half_blinking": "gui/sprites/hud/heart/absorbing_hardcore_half_blinking", "absorption": "mob_effect/absorption", - "acacia": "entity/chest_boat/acacia", + "acacia": "entity/signs/acacia", "acacia_door_bottom": "acacia_door_bottom", "acacia_door_top": "acacia_door_top", "acacia_leaves": "acacia_leaves", @@ -885,7 +885,7 @@ "activator_rail": "activator_rail", "activator_rail_on": "activator_rail_on", "advancement": "gui/sprites/toast/advancement", - "adventure": "gui/advancements/backgrounds/adventure", + "adventure": "gui/realms/adventure", "aggressive_panda": "entity/panda/aggressive_panda", "air": "gui/sprites/hud/air", "air_bursting": "gui/sprites/hud/air_bursting", @@ -906,6 +906,7 @@ "anvil_top": "anvil_top", "archer_pottery_pattern": "entity/decorated_pot/archer_pottery_pattern", "ari": "entity/player/wide/ari", + "armadillo": "entity/armadillo", "armor_empty": "gui/sprites/hud/armor_empty", "armor_full": "gui/sprites/hud/armor_full", "armor_half": "gui/sprites/hud/armor_half", @@ -933,7 +934,8 @@ "back": "painting/back", "background": "gui/sprites/social_interactions/background", "bad_omen": "mob_effect/bad_omen", - "bamboo": "entity/chest_boat/bamboo", + "bad_omen_121": "mob_effect/bad_omen_121", + "bamboo": "entity/signs/bamboo", "bamboo_block": "bamboo_block", "bamboo_block_top": "bamboo_block_top", "bamboo_door_bottom": "bamboo_door_bottom", @@ -1002,7 +1004,7 @@ "big_smoke_7": "particle/big_smoke_7", "big_smoke_8": "particle/big_smoke_8", "big_smoke_9": "particle/big_smoke_9", - "birch": "entity/chest_boat/birch", + "birch": "entity/signs/birch", "birch_door_bottom": "birch_door_bottom", "birch_door_top": "birch_door_top", "birch_leaves": "birch_leaves", @@ -1011,7 +1013,8 @@ "birch_planks": "birch_planks", "birch_sapling": "birch_sapling", "birch_trapdoor": "birch_trapdoor", - "black": "entity/cat/black", + "black": "entity/llama/decor/black", + "black_banner": "map/decorations/black_banner", "black_candle": "black_candle", "black_candle_lit": "black_candle_lit", "black_concrete": "black_concrete", @@ -1036,12 +1039,14 @@ "blocked_slot": "gui/sprites/container/bundle/blocked_slot", "blue": "entity/llama/decor/blue", "blue_background": "gui/sprites/boss_bar/blue_background", + "blue_banner": "map/decorations/blue_banner", "blue_candle": "blue_candle", "blue_candle_lit": "blue_candle_lit", "blue_concrete": "blue_concrete", "blue_concrete_powder": "blue_concrete_powder", "blue_glazed_terracotta": "blue_glazed_terracotta", "blue_ice": "blue_ice", + "blue_marker": "map/decorations/blue_marker", "blue_orchid": "blue_orchid", "blue_progress": "gui/sprites/boss_bar/blue_progress", "blue_shulker_box": "blue_shulker_box", @@ -1049,6 +1054,10 @@ "blue_stained_glass_pane_top": "blue_stained_glass_pane_top", "blue_terracotta": "blue_terracotta", "blue_wool": "blue_wool", + "bogged": "entity/skeleton/bogged", + "bogged_overlay": "entity/skeleton/bogged_overlay", + "bolt": "trims/models/armor/bolt", + "bolt_leggings": "trims/models/armor/bolt_leggings", "bomb": "painting/bomb", "bone_block_side": "bone_block_side", "bone_block_top": "bone_block_top", @@ -1063,6 +1072,7 @@ "brain_coral_fan": "brain_coral_fan", "break_particle": "entity/conduit/break_particle", "breeze": "entity/breeze/breeze", + "breeze_eyes": "entity/breeze/breeze_eyes", "breeze_wind": "entity/breeze/breeze_wind", "brew_progress": "gui/sprites/container/brewing_stand/brew_progress", "brewer_pottery_pattern": "entity/decorated_pot/brewer_pottery_pattern", @@ -1071,6 +1081,7 @@ "bricks": "bricks", "british_shorthair": "entity/cat/british_shorthair", "brown": "entity/llama/decor/brown", + "brown_banner": "map/decorations/brown_banner", "brown_candle": "brown_candle", "brown_candle_lit": "brown_candle_lit", "brown_concrete": "brown_concrete", @@ -1097,13 +1108,13 @@ "bubbles": "gui/sprites/container/brewing_stand/bubbles", "budding_amethyst": "budding_amethyst", "burn_pottery_pattern": "entity/decorated_pot/burn_pottery_pattern", - "burn_progress": "gui/sprites/container/furnace/burn_progress", + "burn_progress": "gui/sprites/container/blast_furnace/burn_progress", "burning_skull": "painting/burning_skull", "bust": "painting/bust", "butcher": "entity/villager/profession/butcher", - "button": "gui/sprites/recipe_book/button", + "button": "gui/sprites/widget/button", "button_disabled": "gui/sprites/widget/button_disabled", - "button_highlighted": "gui/sprites/recipe_book/button_highlighted", + "button_highlighted": "gui/sprites/widget/button_highlighted", "button_selected": "gui/sprites/container/beacon/button_selected", "cactus_bottom": "cactus_bottom", "cactus_side": "cactus_side", @@ -1156,15 +1167,13 @@ "chainmail_layer_2": "models/armor/chainmail_layer_2", "challenge_frame_obtained": "gui/sprites/advancements/challenge_frame_obtained", "challenge_frame_unobtained": "gui/sprites/advancements/challenge_frame_unobtained", - "changes": "gui/sprites/backup/changes", - "changes_highlighted": "gui/sprites/backup/changes_highlighted", "chat_modified": "gui/sprites/icon/chat_modified", "checkbox": "gui/sprites/widget/checkbox", "checkbox_highlighted": "gui/sprites/widget/checkbox_highlighted", "checkbox_selected": "gui/sprites/widget/checkbox_selected", "checkbox_selected_highlighted": "gui/sprites/widget/checkbox_selected_highlighted", "checkmark": "gui/sprites/icon/checkmark", - "cherry": "entity/chest_boat/cherry", + "cherry": "entity/signs/cherry", "cherry_0": "particle/cherry_0", "cherry_1": "particle/cherry_1", "cherry_10": "particle/cherry_10", @@ -1293,6 +1302,7 @@ "crafting_table_side": "crafting_table_side", "crafting_table_top": "crafting_table_top", "creamy": "entity/llama/creamy", + "credits_vignette": "misc/credits_vignette", "creebet": "painting/creebet", "creeper": "entity/banner/creeper", "creeper_armor": "entity/creeper/creeper_armor", @@ -1322,6 +1332,7 @@ "cut_red_sandstone": "cut_red_sandstone", "cut_sandstone": "cut_sandstone", "cyan": "entity/llama/decor/cyan", + "cyan_banner": "map/decorations/cyan_banner", "cyan_candle": "cyan_candle", "cyan_candle_lit": "cyan_candle_lit", "cyan_concrete": "cyan_concrete", @@ -1336,7 +1347,7 @@ "damaged_anvil_top": "damaged_anvil_top", "dandelion": "dandelion", "danger_pottery_pattern": "entity/decorated_pot/danger_pottery_pattern", - "dark_oak": "entity/chest_boat/dark_oak", + "dark_oak": "entity/signs/hanging/dark_oak", "dark_oak_door_bottom": "dark_oak_door_bottom", "dark_oak_door_top": "dark_oak_door_top", "dark_oak_leaves": "dark_oak_leaves", @@ -1384,6 +1395,7 @@ "deepslate_top": "deepslate_top", "demo_background": "gui/demo_background", "desert": "entity/villager/type/desert", + "desert_village": "map/decorations/desert_village", "destroy_stage_0": "destroy_stage_0", "destroy_stage_1": "destroy_stage_1", "destroy_stage_2": "destroy_stage_2", @@ -1554,6 +1566,9 @@ "fletching_table_front": "fletching_table_front", "fletching_table_side": "fletching_table_side", "fletching_table_top": "fletching_table_top", + "flow": "entity/banner/flow", + "flow_leggings": "trims/models/armor/flow_leggings", + "flow_pottery_pattern": "entity/decorated_pot/flow_pottery_pattern", "flower": "entity/banner/flower", "flower_pot": "flower_pot", "flowering_azalea_leaves": "flowering_azalea_leaves", @@ -1570,6 +1585,7 @@ "forcefield": "misc/forcefield", "fox": "entity/fox/fox", "fox_sleep": "entity/fox/fox_sleep", + "frame": "map/decorations/frame", "friend_pottery_pattern": "entity/decorated_pot/friend_pottery_pattern", "frogspawn": "frogspawn", "frosted_ice_0": "frosted_ice_0", @@ -1653,7 +1669,8 @@ "grass_block_snow": "grass_block_snow", "grass_block_top": "grass_block_top", "gravel": "gravel", - "gray": "entity/llama/gray", + "gray": "entity/llama/decor/gray", + "gray_banner": "map/decorations/gray_banner", "gray_candle": "gray_candle", "gray_candle_lit": "gray_candle_lit", "gray_concrete": "gray_concrete", @@ -1666,6 +1683,7 @@ "gray_wool": "gray_wool", "green": "entity/llama/decor/green", "green_background": "gui/sprites/boss_bar/green_background", + "green_banner": "map/decorations/green_banner", "green_candle": "green_candle", "green_candle_lit": "green_candle_lit", "green_concrete": "green_concrete", @@ -1696,6 +1714,8 @@ "gust_7": "particle/gust_7", "gust_8": "particle/gust_8", "gust_9": "particle/gust_9", + "guster": "entity/banner/guster", + "guster_pottery_pattern": "entity/decorated_pot/guster_pottery_pattern", "half": "gui/sprites/hud/heart/half", "half_blinking": "gui/sprites/hud/heart/half_blinking", "half_horizontal": "entity/banner/half_horizontal", @@ -1716,6 +1736,7 @@ "heart": "particle/heart", "heart_pottery_pattern": "entity/decorated_pot/heart_pottery_pattern", "heartbreak_pottery_pattern": "entity/decorated_pot/heartbreak_pottery_pattern", + "heavy_core": "heavy_core", "helmet_trim": "trims/items/helmet_trim", "hero_of_the_village": "mob_effect/hero_of_the_village", "hoglin": "entity/hoglin/hoglin", @@ -1763,6 +1784,7 @@ "ice": "ice", "illusioner": "entity/illager/illusioner", "incompatible": "gui/sprites/server_list/incompatible", + "infested": "mob_effect/infested", "info": "gui/sprites/icon/info", "inspiration": "gui/realms/inspiration", "instant_damage": "mob_effect/instant_damage", @@ -1770,6 +1792,10 @@ "inventory": "gui/container/inventory", "invisibility": "mob_effect/invisibility", "invite": "gui/sprites/icon/invite", + "inworld_footer_separator": "gui/inworld_footer_separator", + "inworld_header_separator": "gui/inworld_header_separator", + "inworld_menu_background": "gui/inworld_menu_background", + "inworld_menu_list_background": "gui/inworld_menu_list_background", "iron": "entity/villager/profession_level/iron", "iron_bars": "iron_bars", "iron_block": "iron_block", @@ -1805,7 +1831,7 @@ "jump_bar_cooldown": "gui/sprites/hud/jump_bar_cooldown", "jump_bar_progress": "gui/sprites/hud/jump_bar_progress", "jump_boost": "mob_effect/jump_boost", - "jungle": "entity/villager/type/jungle", + "jungle": "entity/signs/jungle", "jungle_door_bottom": "jungle_door_bottom", "jungle_door_top": "jungle_door_top", "jungle_leaves": "jungle_leaves", @@ -1813,6 +1839,7 @@ "jungle_log_top": "jungle_log_top", "jungle_planks": "jungle_planks", "jungle_sapling": "jungle_sapling", + "jungle_temple": "map/decorations/jungle_temple", "jungle_trapdoor": "jungle_trapdoor", "kai": "entity/player/wide/kai", "kebab": "painting/kebab", @@ -1851,6 +1878,7 @@ "levitation": "mob_effect/levitation", "librarian": "entity/villager/profession/librarian", "light_blue": "entity/llama/decor/light_blue", + "light_blue_banner": "map/decorations/light_blue_banner", "light_blue_candle": "light_blue_candle", "light_blue_candle_lit": "light_blue_candle_lit", "light_blue_concrete": "light_blue_concrete", @@ -1861,8 +1889,8 @@ "light_blue_stained_glass_pane_top": "light_blue_stained_glass_pane_top", "light_blue_terracotta": "light_blue_terracotta", "light_blue_wool": "light_blue_wool", - "light_dirt_background": "gui/light_dirt_background", "light_gray": "entity/llama/decor/light_gray", + "light_gray_banner": "map/decorations/light_gray_banner", "light_gray_candle": "light_gray_candle", "light_gray_candle_lit": "light_gray_candle_lit", "light_gray_concrete": "light_gray_concrete", @@ -1880,6 +1908,7 @@ "lily_of_the_valley": "lily_of_the_valley", "lily_pad": "lily_pad", "lime": "entity/llama/decor/lime", + "lime_banner": "map/decorations/lime_banner", "lime_candle": "lime_candle", "lime_candle_lit": "lime_candle_lit", "lime_concrete": "lime_concrete", @@ -1892,7 +1921,7 @@ "lime_wool": "lime_wool", "link": "gui/sprites/icon/link", "link_highlighted": "gui/sprites/icon/link_highlighted", - "lit_progress": "gui/sprites/container/furnace/lit_progress", + "lit_progress": "gui/sprites/container/blast_furnace/lit_progress", "llama_armor_slot": "gui/sprites/container/horse/llama_armor_slot", "locked": "gui/sprites/container/cartography_table/locked", "locked_button": "gui/sprites/widget/locked_button", @@ -1907,6 +1936,7 @@ "loom_top": "loom_top", "luck": "mob_effect/luck", "magenta": "entity/llama/decor/magenta", + "magenta_banner": "map/decorations/magenta_banner", "magenta_candle": "magenta_candle", "magenta_candle_lit": "magenta_candle_lit", "magenta_concrete": "magenta_concrete", @@ -1920,9 +1950,8 @@ "magma": "magma", "magmacube": "entity/slime/magmacube", "make_operator": "gui/sprites/player_list/make_operator", - "make_operator_highlighted": "gui/sprites/player_list/make_operator_highlighted", "makena": "entity/player/wide/makena", - "mangrove": "entity/chest_boat/mangrove", + "mangrove": "entity/signs/mangrove", "mangrove_door_bottom": "mangrove_door_bottom", "mangrove_door_top": "mangrove_door_top", "mangrove_leaves": "mangrove_leaves", @@ -1937,7 +1966,6 @@ "map": "gui/sprites/container/cartography_table/map", "map_background": "map/map_background", "map_background_checkerboard": "map/map_background_checkerboard", - "map_icons": "map/map_icons", "marked_join": "gui/sprites/world_list/marked_join", "marked_join_highlighted": "gui/sprites/world_list/marked_join_highlighted", "mason": "entity/villager/profession/mason", @@ -1946,6 +1974,8 @@ "melon_side": "melon_side", "melon_stem": "melon_stem", "melon_top": "melon_top", + "menu_background": "gui/menu_background", + "menu_list_background": "gui/menu_list_background", "minceraft": "gui/title/minceraft", "minecart": "entity/minecart", "minecraft": "gui/title/minecraft", @@ -1960,10 +1990,10 @@ "mossy_stone_bricks": "mossy_stone_bricks", "mourner_pottery_pattern": "entity/decorated_pot/mourner_pottery_pattern", "mouse": "gui/sprites/toast/mouse", - "move_down": "gui/sprites/server_list/move_down", - "move_down_highlighted": "gui/sprites/server_list/move_down_highlighted", - "move_up": "gui/sprites/server_list/move_up", - "move_up_highlighted": "gui/sprites/server_list/move_up_highlighted", + "move_down": "gui/sprites/transferable_list/move_down", + "move_down_highlighted": "gui/sprites/transferable_list/move_down_highlighted", + "move_up": "gui/sprites/transferable_list/move_up", + "move_up_highlighted": "gui/sprites/transferable_list/move_up_highlighted", "movement_keys": "gui/sprites/toast/movement_keys", "mud": "mud", "mud_bricks": "mud_bricks", @@ -1976,7 +2006,7 @@ "mute_button_highlighted": "gui/sprites/social_interactions/mute_button_highlighted", "mycelium_side": "mycelium_side", "mycelium_top": "mycelium_top", - "nausea": "misc/nausea", + "nausea": "mob_effect/nausea", "nautilus": "particle/nautilus", "nether": "gui/advancements/backgrounds/nether", "nether_bricks": "nether_bricks", @@ -2015,7 +2045,7 @@ "notched_6_progress": "gui/sprites/boss_bar/notched_6_progress", "note": "particle/note", "note_block": "note_block", - "oak": "entity/chest_boat/oak", + "oak": "entity/signs/hanging/oak", "oak_door_bottom": "oak_door_bottom", "oak_door_top": "oak_door_top", "oak_leaves": "oak_leaves", @@ -2030,13 +2060,16 @@ "observer_side": "observer_side", "observer_top": "observer_top", "obsidian": "obsidian", + "ocean_monument": "map/decorations/ocean_monument", "ocelot": "entity/cat/ocelot", "ochre_froglight_side": "ochre_froglight_side", "ochre_froglight_top": "ochre_froglight_top", + "ominous_spawning": "particle/ominous_spawning", + "oozing": "mob_effect/oozing", "open": "gui/sprites/realm_status/open", "open_eye": "entity/conduit/open_eye", - "options_background": "gui/options_background", "orange": "entity/llama/decor/orange", + "orange_banner": "map/decorations/orange_banner", "orange_candle": "orange_candle", "orange_candle_lit": "orange_candle_lit", "orange_concrete": "orange_concrete", @@ -2065,10 +2098,10 @@ "pack": null, "packed_ice": "packed_ice", "packed_mud": "packed_mud", - "page_backward": "gui/sprites/recipe_book/page_backward", - "page_backward_highlighted": "gui/sprites/recipe_book/page_backward_highlighted", - "page_forward": "gui/sprites/recipe_book/page_forward", - "page_forward_highlighted": "gui/sprites/recipe_book/page_forward_highlighted", + "page_backward": "gui/sprites/widget/page_backward", + "page_backward_highlighted": "gui/sprites/widget/page_backward_highlighted", + "page_forward": "gui/sprites/widget/page_forward", + "page_forward_highlighted": "gui/sprites/widget/page_forward_highlighted", "panda": "entity/panda/panda", "panorama_0": "gui/title/background/panorama_0", "panorama_1": "gui/title/background/panorama_1", @@ -2095,15 +2128,15 @@ "phantom_eyes": "entity/phantom_eyes", "pig": "entity/pig/pig", "pig_saddle": "entity/pig/pig_saddle", - "piglin": "entity/piglin/piglin", + "piglin": "entity/banner/piglin", "piglin_brute": "entity/piglin/piglin_brute", "pigscene": "painting/pigscene", "pillager": "entity/illager/pillager", - "ping_1": "gui/sprites/server_list/ping_1", - "ping_2": "gui/sprites/server_list/ping_2", - "ping_3": "gui/sprites/server_list/ping_3", - "ping_4": "gui/sprites/server_list/ping_4", - "ping_5": "gui/sprites/server_list/ping_5", + "ping_1": "gui/sprites/icon/ping_1", + "ping_2": "gui/sprites/icon/ping_2", + "ping_3": "gui/sprites/icon/ping_3", + "ping_4": "gui/sprites/icon/ping_4", + "ping_5": "gui/sprites/icon/ping_5", "ping_unknown": "gui/sprites/icon/ping_unknown", "pinging_1": "gui/sprites/server_list/pinging_1", "pinging_2": "gui/sprites/server_list/pinging_2", @@ -2112,6 +2145,7 @@ "pinging_5": "gui/sprites/server_list/pinging_5", "pink": "entity/llama/decor/pink", "pink_background": "gui/sprites/boss_bar/pink_background", + "pink_banner": "map/decorations/pink_banner", "pink_candle": "pink_candle", "pink_candle_lit": "pink_candle_lit", "pink_concrete": "pink_concrete", @@ -2141,7 +2175,11 @@ "pitcher_crop_top_stage_3": "pitcher_crop_top_stage_3", "pitcher_crop_top_stage_4": "pitcher_crop_top_stage_4", "plains": "entity/villager/type/plains", + "plains_village": "map/decorations/plains_village", "plant": "painting/plant", + "player": "map/decorations/player", + "player_off_limits": "map/decorations/player_off_limits", + "player_off_map": "map/decorations/player_off_map", "playful_panda": "entity/panda/playful_panda", "plenty_pottery_pattern": "entity/decorated_pot/plenty_pottery_pattern", "podzol_side": "podzol_side", @@ -2203,6 +2241,7 @@ "pumpkinblur": "misc/pumpkinblur", "purple": "entity/llama/decor/purple", "purple_background": "gui/sprites/boss_bar/purple_background", + "purple_banner": "map/decorations/purple_banner", "purple_candle": "purple_candle", "purple_candle_lit": "purple_candle_lit", "purple_concrete": "purple_concrete", @@ -2225,6 +2264,7 @@ "quartz_pillar": "quartz_pillar", "quartz_pillar_top": "quartz_pillar_top", "ragdoll": "entity/cat/ragdoll", + "raid_omen": "mob_effect/raid_omen", "rail": "rail", "rail_corner": "rail_corner", "rain": "environment/rain", @@ -2239,13 +2279,15 @@ "recipe_book": "gui/recipe_book", "recipe_highlighted": "gui/sprites/container/stonecutter/recipe_highlighted", "recipe_selected": "gui/sprites/container/stonecutter/recipe_selected", - "red": "entity/cat/red", + "red": "entity/llama/decor/red", "red_background": "gui/sprites/boss_bar/red_background", + "red_banner": "map/decorations/red_banner", "red_candle": "red_candle", "red_candle_lit": "red_candle_lit", "red_concrete": "red_concrete", "red_concrete_powder": "red_concrete_powder", "red_glazed_terracotta": "red_glazed_terracotta", + "red_marker": "map/decorations/red_marker", "red_mooshroom": "entity/cow/red_mooshroom", "red_mushroom": "red_mushroom", "red_mushroom_block": "red_mushroom_block", @@ -2261,6 +2303,7 @@ "red_terracotta": "red_terracotta", "red_tulip": "red_tulip", "red_wool": "red_wool", + "red_x": "map/decorations/red_x", "redstone": "trims/color_palettes/redstone", "redstone_block": "redstone_block", "redstone_dust_dot": "redstone_dust_dot", @@ -2279,9 +2322,7 @@ "reject": "gui/sprites/pending_invite/reject", "reject_highlighted": "gui/sprites/pending_invite/reject_highlighted", "remove_operator": "gui/sprites/player_list/remove_operator", - "remove_operator_highlighted": "gui/sprites/player_list/remove_operator_highlighted", "remove_player": "gui/sprites/player_list/remove_player", - "remove_player_highlighted": "gui/sprites/player_list/remove_player_highlighted", "repeater": "repeater", "repeater_on": "repeater_on", "repeating_command_block_back": "repeating_command_block_back", @@ -2300,8 +2341,6 @@ "respawn_anchor_side4": "respawn_anchor_side4", "respawn_anchor_top": "respawn_anchor_top", "respawn_anchor_top_off": "respawn_anchor_top_off", - "restore": "gui/sprites/backup/restore", - "restore_highlighted": "gui/sprites/backup/restore_highlighted", "rhombus": "entity/banner/rhombus", "rib": "trims/models/armor/rib", "rib_leggings": "trims/models/armor/rib_leggings", @@ -2318,14 +2357,17 @@ "sandstone_top": "sandstone_top", "saturation": "mob_effect/saturation", "savanna": "entity/villager/type/savanna", + "savanna_village": "map/decorations/savanna_village", "scaffolding_bottom": "scaffolding_bottom", "scaffolding_side": "scaffolding_side", "scaffolding_top": "scaffolding_top", "scaled_map": "gui/sprites/container/cartography_table/scaled_map", + "scrape_pottery_pattern": "entity/decorated_pot/scrape_pottery_pattern", "scroll_left": "gui/sprites/spectator/scroll_left", "scroll_right": "gui/sprites/spectator/scroll_right", "scroller": "gui/sprites/widget/scroller", - "scroller_disabled": "gui/sprites/container/creative_inventory/scroller_disabled", + "scroller_background": "gui/sprites/widget/scroller_background", + "scroller_disabled": "gui/sprites/container/loom/scroller_disabled", "sculk": "sculk", "sculk_catalyst_bottom": "sculk_catalyst_bottom", "sculk_catalyst_side": "sculk_catalyst_side", @@ -2459,6 +2501,13 @@ "small_dripleaf_stem_bottom": "small_dripleaf_stem_bottom", "small_dripleaf_stem_top": "small_dripleaf_stem_top", "small_dripleaf_top": "small_dripleaf_top", + "small_gust_0": "particle/small_gust_0", + "small_gust_1": "particle/small_gust_1", + "small_gust_2": "particle/small_gust_2", + "small_gust_3": "particle/small_gust_3", + "small_gust_4": "particle/small_gust_4", + "small_gust_5": "particle/small_gust_5", + "small_gust_6": "particle/small_gust_6", "small_stripes": "entity/banner/small_stripes", "smithing": "gui/container/smithing", "smithing_table_bottom": "smithing_table_bottom", @@ -2501,6 +2550,7 @@ "snow_fox": "entity/fox/snow_fox", "snow_fox_sleep": "entity/fox/snow_fox_sleep", "snow_golem": "entity/snow_golem", + "snowy_village": "map/decorations/snowy_village", "social_interactions": "gui/sprites/toast/social_interactions", "sonic_boom_0": "particle/sonic_boom_0", "sonic_boom_1": "particle/sonic_boom_1", @@ -2572,7 +2622,7 @@ "sponge": "sponge", "spore_blossom": "spore_blossom", "spore_blossom_base": "spore_blossom_base", - "spruce": "entity/chest_boat/spruce", + "spruce": "entity/signs/spruce", "spruce_door_bottom": "spruce_door_bottom", "spruce_door_top": "spruce_door_top", "spruce_leaves": "spruce_leaves", @@ -2656,6 +2706,7 @@ "suspicious_sand_2": "suspicious_sand_2", "suspicious_sand_3": "suspicious_sand_3", "swamp": "entity/villager/type/swamp", + "swamp_hut": "map/decorations/swamp_hut", "sweep_0": "particle/sweep_0", "sweep_1": "particle/sweep_1", "sweep_2": "particle/sweep_2", @@ -2669,7 +2720,7 @@ "sweet_berry_bush_stage2": "sweet_berry_bush_stage2", "sweet_berry_bush_stage3": "sweet_berry_bush_stage3", "system": "gui/sprites/toast/system", - "tab": "gui/sprites/recipe_book/tab", + "tab": "gui/sprites/widget/tab", "tab_above_left": "gui/sprites/advancements/tab_above_left", "tab_above_left_selected": "gui/sprites/advancements/tab_above_left_selected", "tab_above_middle": "gui/sprites/advancements/tab_above_middle", @@ -2696,6 +2747,7 @@ "tab_bottom_unselected_5": "gui/sprites/container/creative_inventory/tab_bottom_unselected_5", "tab_bottom_unselected_6": "gui/sprites/container/creative_inventory/tab_bottom_unselected_6", "tab_bottom_unselected_7": "gui/sprites/container/creative_inventory/tab_bottom_unselected_7", + "tab_header_background": "gui/tab_header_background", "tab_highlighted": "gui/sprites/widget/tab_highlighted", "tab_inventory": "gui/container/creative_inventory/tab_inventory", "tab_item_search": "gui/container/creative_inventory/tab_item_search", @@ -2712,7 +2764,7 @@ "tab_right_middle_selected": "gui/sprites/advancements/tab_right_middle_selected", "tab_right_top": "gui/sprites/advancements/tab_right_top", "tab_right_top_selected": "gui/sprites/advancements/tab_right_top_selected", - "tab_selected": "gui/sprites/recipe_book/tab_selected", + "tab_selected": "gui/sprites/widget/tab_selected", "tab_selected_highlighted": "gui/sprites/widget/tab_selected_highlighted", "tab_top_selected_1": "gui/sprites/container/creative_inventory/tab_top_selected_1", "tab_top_selected_2": "gui/sprites/container/creative_inventory/tab_top_selected_2", @@ -2731,12 +2783,15 @@ "tabby": "entity/cat/tabby", "tadpole": "entity/tadpole/tadpole", "taiga": "entity/villager/type/taiga", + "taiga_village": "map/decorations/taiga_village", "tall_grass_bottom": "tall_grass_bottom", "tall_grass_top": "tall_grass_top", "tall_seagrass_bottom": "tall_seagrass_bottom", "tall_seagrass_top": "tall_seagrass_top", + "target_point": "map/decorations/target_point", "target_side": "target_side", "target_top": "target_top", + "target_x": "map/decorations/target_x", "task_frame_obtained": "gui/sprites/advancements/task_frame_obtained", "task_frame_unobtained": "gui/sprites/advancements/task_frame_unobtained", "teleport_to_player": "gui/sprites/spectator/teleport_to_player", @@ -2768,17 +2823,29 @@ "trapped_right": "entity/chest/trapped_right", "tree": "gui/sprites/toast/tree", "trial_available": "gui/sprites/icon/trial_available", + "trial_chambers": "map/decorations/trial_chambers", + "trial_omen": "mob_effect/trial_omen", "trial_spawner_bottom": "trial_spawner_bottom", "trial_spawner_detection_0": "particle/trial_spawner_detection_0", "trial_spawner_detection_1": "particle/trial_spawner_detection_1", "trial_spawner_detection_2": "particle/trial_spawner_detection_2", "trial_spawner_detection_3": "particle/trial_spawner_detection_3", "trial_spawner_detection_4": "particle/trial_spawner_detection_4", + "trial_spawner_detection_ominous_0": "particle/trial_spawner_detection_ominous_0", + "trial_spawner_detection_ominous_1": "particle/trial_spawner_detection_ominous_1", + "trial_spawner_detection_ominous_2": "particle/trial_spawner_detection_ominous_2", + "trial_spawner_detection_ominous_3": "particle/trial_spawner_detection_ominous_3", + "trial_spawner_detection_ominous_4": "particle/trial_spawner_detection_ominous_4", "trial_spawner_side_active": "trial_spawner_side_active", + "trial_spawner_side_active_ominous": "trial_spawner_side_active_ominous", "trial_spawner_side_inactive": "trial_spawner_side_inactive", + "trial_spawner_side_inactive_ominous": "trial_spawner_side_inactive_ominous", "trial_spawner_top_active": "trial_spawner_top_active", + "trial_spawner_top_active_ominous": "trial_spawner_top_active_ominous", "trial_spawner_top_ejecting_reward": "trial_spawner_top_ejecting_reward", + "trial_spawner_top_ejecting_reward_ominous": "trial_spawner_top_ejecting_reward_ominous", "trial_spawner_top_inactive": "trial_spawner_top_inactive", + "trial_spawner_top_inactive_ominous": "trial_spawner_top_inactive_ominous", "triangle_bottom": "entity/banner/triangle_bottom", "triangle_top": "entity/banner/triangle_top", "triangles_bottom": "entity/banner/triangles_bottom", @@ -2829,6 +2896,23 @@ "unselect": "gui/sprites/transferable_list/unselect", "unselect_highlighted": "gui/sprites/transferable_list/unselect_highlighted", "upload": "gui/realms/upload", + "vault_bottom": "vault_bottom", + "vault_bottom_ominous": "vault_bottom_ominous", + "vault_connection": "particle/vault_connection", + "vault_front_ejecting": "vault_front_ejecting", + "vault_front_ejecting_ominous": "vault_front_ejecting_ominous", + "vault_front_off": "vault_front_off", + "vault_front_off_ominous": "vault_front_off_ominous", + "vault_front_on": "vault_front_on", + "vault_front_on_ominous": "vault_front_on_ominous", + "vault_side_off": "vault_side_off", + "vault_side_off_ominous": "vault_side_off_ominous", + "vault_side_on": "vault_side_on", + "vault_side_on_ominous": "vault_side_on_ominous", + "vault_top": "vault_top", + "vault_top_ejecting": "vault_top_ejecting", + "vault_top_ejecting_ominous": "vault_top_ejecting_ominous", + "vault_top_ominous": "vault_top_ominous", "vehicle_container": "gui/sprites/hud/heart/vehicle_container", "vehicle_full": "gui/sprites/hud/heart/vehicle_full", "vehicle_half": "gui/sprites/hud/heart/vehicle_half", @@ -2892,6 +2976,7 @@ "weathered_copper_grate": "weathered_copper_grate", "weathered_copper_trapdoor": "weathered_copper_trapdoor", "weathered_cut_copper": "weathered_cut_copper", + "weaving": "mob_effect/weaving", "weeping_vines": "weeping_vines", "weeping_vines_plant": "weeping_vines_plant", "wet_sponge": "wet_sponge", @@ -2903,8 +2988,9 @@ "wheat_stage5": "wheat_stage5", "wheat_stage6": "wheat_stage6", "wheat_stage7": "wheat_stage7", - "white": "entity/cat/white", + "white": "entity/llama/decor/white", "white_background": "gui/sprites/boss_bar/white_background", + "white_banner": "map/decorations/white_banner", "white_candle": "white_candle", "white_candle_lit": "white_candle_lit", "white_concrete": "white_concrete", @@ -2922,10 +3008,11 @@ "wild_leggings": "trims/models/armor/wild_leggings", "wind": "entity/conduit/wind", "wind_charge": "entity/projectiles/wind_charge", + "wind_charged": "mob_effect/wind_charged", "wind_vertical": "entity/conduit/wind_vertical", "window": "gui/advancements/window", "witch": "entity/witch", - "wither": "entity/wither/wither", + "wither": "mob_effect/wither", "wither_armor": "entity/wither/wither_armor", "wither_invulnerable": "entity/wither/wither_invulnerable", "wither_rose": "wither_rose", @@ -2940,13 +3027,44 @@ "withered_hardcore_half_blinking": "gui/sprites/hud/heart/withered_hardcore_half_blinking", "wolf": "entity/wolf/wolf", "wolf_angry": "entity/wolf/wolf_angry", + "wolf_armor": "entity/wolf/wolf_armor", + "wolf_armor_crackiness_high": "entity/wolf/wolf_armor_crackiness_high", + "wolf_armor_crackiness_low": "entity/wolf/wolf_armor_crackiness_low", + "wolf_armor_crackiness_medium": "entity/wolf/wolf_armor_crackiness_medium", + "wolf_armor_overlay": "entity/wolf/wolf_armor_overlay", + "wolf_ashen": "entity/wolf/wolf_ashen", + "wolf_ashen_angry": "entity/wolf/wolf_ashen_angry", + "wolf_ashen_tame": "entity/wolf/wolf_ashen_tame", + "wolf_black": "entity/wolf/wolf_black", + "wolf_black_angry": "entity/wolf/wolf_black_angry", + "wolf_black_tame": "entity/wolf/wolf_black_tame", + "wolf_chestnut": "entity/wolf/wolf_chestnut", + "wolf_chestnut_angry": "entity/wolf/wolf_chestnut_angry", + "wolf_chestnut_tame": "entity/wolf/wolf_chestnut_tame", "wolf_collar": "entity/wolf/wolf_collar", + "wolf_rusty": "entity/wolf/wolf_rusty", + "wolf_rusty_angry": "entity/wolf/wolf_rusty_angry", + "wolf_rusty_tame": "entity/wolf/wolf_rusty_tame", + "wolf_snowy": "entity/wolf/wolf_snowy", + "wolf_snowy_angry": "entity/wolf/wolf_snowy_angry", + "wolf_snowy_tame": "entity/wolf/wolf_snowy_tame", + "wolf_spotted": "entity/wolf/wolf_spotted", + "wolf_spotted_angry": "entity/wolf/wolf_spotted_angry", + "wolf_spotted_tame": "entity/wolf/wolf_spotted_tame", + "wolf_striped": "entity/wolf/wolf_striped", + "wolf_striped_angry": "entity/wolf/wolf_striped_angry", + "wolf_striped_tame": "entity/wolf/wolf_striped_tame", "wolf_tame": "entity/wolf/wolf_tame", + "wolf_woods": "entity/wolf/wolf_woods", + "wolf_woods_angry": "entity/wolf/wolf_woods_angry", + "wolf_woods_tame": "entity/wolf/wolf_woods_tame", "wood": "entity/armorstand/wood", "wooden_planks": "gui/sprites/toast/wooden_planks", + "woodland_mansion": "map/decorations/woodland_mansion", "worried_panda": "entity/panda/worried_panda", "yellow": "entity/llama/decor/yellow", "yellow_background": "gui/sprites/boss_bar/yellow_background", + "yellow_banner": "map/decorations/yellow_banner", "yellow_candle": "yellow_candle", "yellow_candle_lit": "yellow_candle_lit", "yellow_concrete": "yellow_concrete", diff --git a/run_tests.py b/run_tests.py index f9356bbb..3dac6f68 100644 --- a/run_tests.py +++ b/run_tests.py @@ -41,7 +41,7 @@ import time -COMPILE_CMD = ["bpy-addon-build", "--during-build", "dev"] +COMPILE_CMD = ["bab", "-b", "dev"] DATA_CMD = ["python", "mcprep_data_refresh.py", "-auto"] # TODO, include in build DCC_EXES = "blender_execs.txt" TEST_RUNNER = os.path.join("test_files", "test_runner.py")