From a849ae479e5235b848fc70a1248e607b60485c54 Mon Sep 17 00:00:00 2001 From: RK_01 <50594595+RaphiMC@users.noreply.github.com> Date: Thu, 16 May 2024 10:23:10 +0200 Subject: [PATCH] Add a lot of missing tags mappings (#23) --- mappings/diff/mapping-1.13.2to1.14.json | 193 +++ mappings/diff/mapping-1.14to1.15.json | 96 +- mappings/diff/mapping-1.15to1.16.json | 235 +++- mappings/diff/mapping-1.16.2to1.17.json | 1112 +++++++++-------- mappings/diff/mapping-1.16to1.16.2.json | 29 +- mappings/diff/mapping-1.17to1.18.json | 230 +++- mappings/diff/mapping-1.18to1.19.json | 145 ++- mappings/diff/mapping-1.19.3to1.19.4.json | 122 ++ mappings/diff/mapping-1.19.4to1.20.json | 483 +++++-- mappings/diff/mapping-1.19to1.19.3.json | 47 +- mappings/diff/mapping-1.20.2to1.20.3.json | 58 +- mappings/diff/mapping-1.20.3to1.20.5.json | 836 ++++++++++++- mappings/diff/mapping-1.20to1.20.2.json | 51 +- mappings/mapping-1.12.json | 1017 ++++++++------- output_hashes.json | 52 +- .../mappingsgenerator/MappingsOptimizer.java | 7 +- 16 files changed, 3608 insertions(+), 1105 deletions(-) create mode 100644 mappings/diff/mapping-1.13.2to1.14.json create mode 100644 mappings/diff/mapping-1.19.3to1.19.4.json diff --git a/mappings/diff/mapping-1.13.2to1.14.json b/mappings/diff/mapping-1.13.2to1.14.json new file mode 100644 index 0000000..33b8f66 --- /dev/null +++ b/mappings/diff/mapping-1.13.2to1.14.json @@ -0,0 +1,193 @@ +{ + "tags": { + "item": { + "arrows": [ + "arrow", + "spectral_arrow", + "tipped_arrow" + ], + "beds": [ + "gray_bed", + "green_bed", + "purple_bed", + "blue_bed", + "red_bed", + "black_bed", + "light_gray_bed", + "yellow_bed", + "orange_bed", + "cyan_bed", + "light_blue_bed", + "brown_bed", + "magenta_bed", + "white_bed", + "pink_bed", + "lime_bed" + ], + "coals": [ + "coal", + "charcoal" + ], + "fences": [ + "birch_fence", + "dark_oak_fence", + "jungle_fence", + "oak_fence", + "nether_brick_fence", + "acacia_fence", + "spruce_fence" + ], + "music_discs": [ + "music_disc_mall", + "music_disc_11", + "music_disc_wait", + "music_disc_cat", + "music_disc_stal", + "music_disc_chirp", + "music_disc_strad", + "music_disc_blocks", + "music_disc_13", + "music_disc_far", + "music_disc_mellohi", + "music_disc_ward" + ], + "signs": [ + "oak_sign" + ], + "small_flowers": [ + "red_tulip", + "azure_bluet", + "allium", + "dandelion", + "pink_tulip", + "blue_orchid", + "white_tulip", + "poppy", + "orange_tulip", + "oxeye_daisy" + ], + "walls": [ + "cobblestone_wall", + "mossy_cobblestone_wall" + ], + "wooden_fences": [ + "birch_fence", + "dark_oak_fence", + "jungle_fence", + "oak_fence", + "acacia_fence", + "spruce_fence" + ] + }, + "block": { + "beds": [ + "black_bed", + "gray_bed", + "blue_bed", + "brown_bed", + "red_bed", + "orange_bed", + "magenta_bed", + "white_bed", + "pink_bed", + "green_bed", + "cyan_bed", + "yellow_bed", + "light_blue_bed", + "light_gray_bed", + "lime_bed", + "purple_bed" + ], + "dirt_like": [ + "grass_block", + "mycelium", + "dirt", + "podzol", + "coarse_dirt" + ], + "dragon_immune": [ + "bedrock", + "structure_block", + "end_portal_frame", + "iron_bars", + "end_stone", + "barrier", + "end_gateway", + "command_block", + "obsidian", + "moving_piston", + "chain_command_block", + "end_portal", + "repeating_command_block" + ], + "fences": [ + "acacia_fence", + "birch_fence", + "dark_oak_fence", + "jungle_fence", + "nether_brick_fence", + "oak_fence", + "spruce_fence" + ], + "signs": [ + "oak_sign", + "oak_wall_sign" + ], + "small_flowers": [ + "allium", + "azure_bluet", + "blue_orchid", + "dandelion", + "orange_tulip", + "oxeye_daisy", + "pink_tulip", + "poppy", + "red_tulip", + "white_tulip" + ], + "standing_signs": [ + "oak_sign" + ], + "wall_signs": [ + "oak_wall_sign" + ], + "walls": [ + "cobblestone_wall", + "mossy_cobblestone_wall" + ], + "wither_immune": [ + "barrier", + "bedrock", + "chain_command_block", + "command_block", + "end_gateway", + "end_portal", + "end_portal_frame", + "moving_piston", + "repeating_command_block", + "structure_block" + ], + "wooden_fences": [ + "acacia_fence", + "birch_fence", + "dark_oak_fence", + "jungle_fence", + "oak_fence", + "spruce_fence" + ] + }, + "entity_type": { + "raiders": [ + "vindicator", + "evoker", + "illusioner", + "witch" + ], + "skeletons": [ + "skeleton", + "wither_skeleton", + "stray" + ] + } + } +} diff --git a/mappings/diff/mapping-1.14to1.15.json b/mappings/diff/mapping-1.14to1.15.json index 033049a..1e46828 100644 --- a/mappings/diff/mapping-1.14to1.15.json +++ b/mappings/diff/mapping-1.14to1.15.json @@ -23,5 +23,99 @@ "entity.parrot.imitate.polar_bear": "", "entity.parrot.imitate.wolf": "", "entity.parrot.imitate.zombie_pigman": "" + }, + "tags": { + "item": { + "flowers": [ + "allium", + "azure_bluet", + "blue_orchid", + "cornflower", + "dandelion", + "lilac", + "lily_of_the_valley", + "orange_tulip", + "oxeye_daisy", + "peony", + "pink_tulip", + "poppy", + "red_tulip", + "rose_bush", + "sunflower", + "white_tulip", + "wither_rose" + ], + "tall_flowers": [ + "lilac", + "peony", + "rose_bush", + "sunflower" + ] + }, + "block": { + "crops": [ + "beetroots", + "carrots", + "melon_stem", + "potatoes", + "pumpkin_stem", + "wheat" + ], + "flowers": [ + "allium", + "azure_bluet", + "blue_orchid", + "cornflower", + "dandelion", + "lilac", + "lily_of_the_valley", + "orange_tulip", + "oxeye_daisy", + "peony", + "pink_tulip", + "poppy", + "red_tulip", + "rose_bush", + "sunflower", + "white_tulip", + "wither_rose" + ], + "portals": [ + "end_gateway", + "end_portal", + "nether_portal" + ], + "shulker_boxes": [ + "black_shulker_box", + "blue_shulker_box", + "brown_shulker_box", + "cyan_shulker_box", + "gray_shulker_box", + "green_shulker_box", + "light_blue_shulker_box", + "light_gray_shulker_box", + "lime_shulker_box", + "magenta_shulker_box", + "orange_shulker_box", + "pink_shulker_box", + "purple_shulker_box", + "red_shulker_box", + "shulker_box", + "white_shulker_box", + "yellow_shulker_box" + ], + "tall_flowers": [ + "lilac", + "peony", + "rose_bush", + "sunflower" + ] + }, + "entity_type": { + "arrows": [ + "arrow", + "spectral_arrow" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.15to1.16.json b/mappings/diff/mapping-1.15to1.16.json index 97a3e56..723c426 100644 --- a/mappings/diff/mapping-1.15to1.16.json +++ b/mappings/diff/mapping-1.15to1.16.json @@ -915,5 +915,238 @@ "11275": "jigsaw[orientation=west_up]", "11276": "jigsaw[orientation=up_east]", "11277": "jigsaw[orientation=down_east]" + }, + "tags": { + "item": { + "beacon_payment_items": [ + "diamond", + "emerald", + "gold_ingot", + "iron_ingot" + ], + "creeper_drop_music_discs": [ + "music_disc_11", + "music_disc_13", + "music_disc_blocks", + "music_disc_cat", + "music_disc_chirp", + "music_disc_far", + "music_disc_mall", + "music_disc_mellohi", + "music_disc_stal", + "music_disc_strad", + "music_disc_wait", + "music_disc_ward" + ], + "furnace_materials": [ + "cobblestone" + ], + "gold_ores": [ + "gold_ore" + ], + "logs_that_burn": [ + "acacia_log", + "acacia_wood", + "birch_log", + "birch_wood", + "dark_oak_log", + "dark_oak_wood", + "jungle_log", + "jungle_wood", + "oak_log", + "oak_wood", + "spruce_log", + "spruce_wood", + "stripped_acacia_log", + "stripped_acacia_wood", + "stripped_birch_log", + "stripped_birch_wood", + "stripped_dark_oak_log", + "stripped_dark_oak_wood", + "stripped_jungle_log", + "stripped_jungle_wood", + "stripped_oak_log", + "stripped_oak_wood", + "stripped_spruce_log", + "stripped_spruce_wood" + ], + "stone_tool_materials": [ + "cobblestone" + ] + }, + "block": { + "beacon_base_blocks": [ + "diamond_block", + "emerald_block", + "gold_block", + "iron_block" + ], + "campfires": [ + "campfire" + ], + "climbable": [ + "ladder", + "scaffolding", + "vine" + ], + "fence_gates": [ + "acacia_fence_gate", + "birch_fence_gate", + "dark_oak_fence_gate", + "jungle_fence_gate", + "oak_fence_gate", + "spruce_fence_gate" + ], + "fire": [ + "fire" + ], + "gold_ores": [ + "gold_ore" + ], + "infiniburn_end": [ + "bedrock", + "magma_block", + "netherrack" + ], + "infiniburn_nether": [ + "magma_block", + "netherrack" + ], + "infiniburn_overworld": [ + "magma_block", + "netherrack" + ], + "logs_that_burn": [ + "acacia_log", + "acacia_wood", + "birch_log", + "birch_wood", + "dark_oak_log", + "dark_oak_wood", + "jungle_log", + "jungle_wood", + "oak_log", + "oak_wood", + "spruce_log", + "spruce_wood", + "stripped_acacia_log", + "stripped_acacia_wood", + "stripped_birch_log", + "stripped_birch_wood", + "stripped_dark_oak_log", + "stripped_dark_oak_wood", + "stripped_jungle_log", + "stripped_jungle_wood", + "stripped_oak_log", + "stripped_oak_wood", + "stripped_spruce_log", + "stripped_spruce_wood" + ], + "pressure_plates": [ + "acacia_pressure_plate", + "birch_pressure_plate", + "dark_oak_pressure_plate", + "heavy_weighted_pressure_plate", + "jungle_pressure_plate", + "light_weighted_pressure_plate", + "oak_pressure_plate", + "spruce_pressure_plate", + "stone_pressure_plate" + ], + "prevent_mob_spawning_inside": [ + "activator_rail", + "detector_rail", + "powered_rail", + "rail" + ], + "stone_pressure_plates": [ + "stone_pressure_plate" + ], + "unstable_bottom_center": [ + "acacia_fence_gate", + "birch_fence_gate", + "dark_oak_fence_gate", + "jungle_fence_gate", + "oak_fence_gate", + "spruce_fence_gate" + ], + "wall_post_override": [ + "acacia_pressure_plate", + "acacia_sign", + "acacia_wall_sign", + "birch_pressure_plate", + "birch_sign", + "birch_wall_sign", + "black_banner", + "black_wall_banner", + "blue_banner", + "blue_wall_banner", + "brown_banner", + "brown_wall_banner", + "cyan_banner", + "cyan_wall_banner", + "dark_oak_pressure_plate", + "dark_oak_sign", + "dark_oak_wall_sign", + "gray_banner", + "gray_wall_banner", + "green_banner", + "green_wall_banner", + "heavy_weighted_pressure_plate", + "jungle_pressure_plate", + "jungle_sign", + "jungle_wall_sign", + "light_blue_banner", + "light_blue_wall_banner", + "light_gray_banner", + "light_gray_wall_banner", + "light_weighted_pressure_plate", + "lime_banner", + "lime_wall_banner", + "magenta_banner", + "magenta_wall_banner", + "oak_pressure_plate", + "oak_sign", + "oak_wall_sign", + "orange_banner", + "orange_wall_banner", + "pink_banner", + "pink_wall_banner", + "purple_banner", + "purple_wall_banner", + "red_banner", + "red_wall_banner", + "redstone_torch", + "spruce_pressure_plate", + "spruce_sign", + "spruce_wall_sign", + "stone_pressure_plate", + "torch", + "tripwire", + "white_banner", + "white_wall_banner", + "yellow_banner", + "yellow_wall_banner" + ], + "wart_blocks": [ + "nether_wart_block" + ], + "wither_summon_base_blocks": [ + "soul_sand" + ] + }, + "entity_type": { + "impact_projectiles": [ + "arrow", + "dragon_fireball", + "egg", + "fireball", + "small_fireball", + "snowball", + "spectral_arrow", + "trident", + "wither_skull" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.16.2to1.17.json b/mappings/diff/mapping-1.16.2to1.17.json index 910f3b1..0a20a27 100644 --- a/mappings/diff/mapping-1.16.2to1.17.json +++ b/mappings/diff/mapping-1.16.2to1.17.json @@ -62,80 +62,131 @@ "372": "dirt_path" }, "tags": { - "block": { - "dirt": [ - "dirt", - "grass_block", - "podzol", - "coarse_dirt", - "mycelium", - "rooted_dirt", - "moss_block" + "item": { + "coal_ores": [ + "coal_ore" ], + "diamond_ores": [ + "diamond_ore" + ], + "emerald_ores": [ + "emerald_ore" + ], + "fox_food": [ + "sweet_berries" + ], + "ignored_by_piglin_babies": [ + "leather" + ], + "iron_ores": [ + "iron_ore" + ], + "lapis_ores": [ + "lapis_ore" + ], + "piglin_food": [ + "cooked_porkchop", + "porkchop" + ], + "redstone_ores": [ + "redstone_ore" + ] + }, + "block": { "cauldrons": [ "cauldron" ], - "mineable/hoe": [ - "nether_wart_block", - "warped_wart_block", - "hay_block", - "dried_kelp_block", - "target", - "shroomlight", - "sponge", - "wet_sponge", + "coal_ores": [ + "coal_ore" + ], + "diamond_ores": [ + "diamond_ore" + ], + "dirt": [ + "coarse_dirt", + "dirt", + "grass_block", + "mycelium", + "podzol" + ], + "emerald_ores": [ + "emerald_ore" + ], + "features_cannot_replace": [ + "bedrock", + "chest", + "end_portal_frame", + "spawner" + ], + "inside_step_sound_blocks": [ + "snow" + ], + "iron_ores": [ + "iron_ore" + ], + "lapis_ores": [ + "lapis_ore" + ], + "lava_pool_stone_replaceables": [ + "acacia_leaves", + "bedrock", + "birch_leaves", + "chest", + "dark_oak_leaves", + "end_portal_frame", "jungle_leaves", "oak_leaves", - "spruce_leaves", - "dark_oak_leaves", - "acacia_leaves", - "birch_leaves" - ], - "mineable/shovel": [ - "clay", - "dirt", - "coarse_dirt", - "podzol", - "farmland", - "grass_block", - "gravel", - "mycelium", - "sand", - "red_sand", - "snow_block", - "snow", - "soul_sand", - "dirt_path", - "white_concrete_powder", - "orange_concrete_powder", - "magenta_concrete_powder", - "light_blue_concrete_powder", - "yellow_concrete_powder", - "lime_concrete_powder", - "pink_concrete_powder", - "gray_concrete_powder", - "light_gray_concrete_powder", - "cyan_concrete_powder", - "purple_concrete_powder", - "blue_concrete_powder", - "brown_concrete_powder", - "green_concrete_powder", - "red_concrete_powder", - "black_concrete_powder", - "soul_soil" + "spawner", + "spruce_leaves" ], "mineable/axe": [ - "note_block", + "acacia_button", + "acacia_door", + "acacia_fence", + "acacia_fence_gate", + "acacia_log", + "acacia_planks", + "acacia_pressure_plate", + "acacia_sapling", + "acacia_sign", + "acacia_slab", + "acacia_stairs", + "acacia_trapdoor", + "acacia_wall_sign", + "acacia_wood", + "allium", "attached_melon_stem", "attached_pumpkin_stem", + "azure_bluet", "bamboo", "barrel", "bee_nest", "beehive", "beetroots", + "birch_button", + "birch_door", + "birch_fence", + "birch_fence_gate", + "birch_log", + "birch_planks", + "birch_pressure_plate", + "birch_sapling", + "birch_sign", + "birch_slab", + "birch_stairs", + "birch_trapdoor", + "birch_wall_sign", + "birch_wood", + "black_banner", + "black_wall_banner", + "blue_banner", + "blue_orchid", + "blue_wall_banner", "bookshelf", - "brown_mushroom_block", + "brown_banner", "brown_mushroom", + "brown_mushroom_block", + "brown_wall_banner", "campfire", "carrots", "cartography_table", @@ -145,521 +196,533 @@ "chorus_plant", "cocoa", "composter", + "cornflower", "crafting_table", + "crimson_button", + "crimson_door", + "crimson_fence", + "crimson_fence_gate", "crimson_fungus", + "crimson_hyphae", + "crimson_planks", + "crimson_pressure_plate", + "crimson_sign", + "crimson_slab", + "crimson_stairs", + "crimson_stem", + "crimson_trapdoor", + "crimson_wall_sign", + "cyan_banner", + "cyan_wall_banner", + "dandelion", + "dark_oak_button", + "dark_oak_door", + "dark_oak_fence", + "dark_oak_fence_gate", + "dark_oak_log", + "dark_oak_planks", + "dark_oak_pressure_plate", + "dark_oak_sapling", + "dark_oak_sign", + "dark_oak_slab", + "dark_oak_stairs", + "dark_oak_trapdoor", + "dark_oak_wall_sign", + "dark_oak_wood", "daylight_detector", "dead_bush", "fern", "fletching_table", "grass", + "gray_banner", + "gray_wall_banner", + "green_banner", + "green_wall_banner", "jack_o_lantern", "jukebox", + "jungle_button", + "jungle_door", + "jungle_fence", + "jungle_fence_gate", + "jungle_log", + "jungle_planks", + "jungle_pressure_plate", + "jungle_sapling", + "jungle_sign", + "jungle_slab", + "jungle_stairs", + "jungle_trapdoor", + "jungle_wall_sign", + "jungle_wood", "ladder", "large_fern", "lectern", + "light_blue_banner", + "light_blue_wall_banner", + "light_gray_banner", + "light_gray_wall_banner", + "lilac", + "lily_of_the_valley", "lily_pad", + "lime_banner", + "lime_wall_banner", "loom", - "melon_stem", + "magenta_banner", + "magenta_wall_banner", "melon", + "melon_stem", "mushroom_stem", "nether_wart", + "note_block", + "oak_button", + "oak_door", + "oak_fence", + "oak_fence_gate", + "oak_log", + "oak_planks", + "oak_pressure_plate", + "oak_sapling", + "oak_sign", + "oak_slab", + "oak_stairs", + "oak_trapdoor", + "oak_wall_sign", + "oak_wood", + "orange_banner", + "orange_tulip", + "orange_wall_banner", + "oxeye_daisy", + "peony", + "pink_banner", + "pink_tulip", + "pink_wall_banner", + "poppy", "potatoes", - "pumpkin_stem", "pumpkin", - "red_mushroom_block", + "pumpkin_stem", + "purple_banner", + "purple_wall_banner", + "red_banner", "red_mushroom", + "red_mushroom_block", + "red_tulip", + "red_wall_banner", + "rose_bush", "scaffolding", "smithing_table", "soul_campfire", + "spruce_button", + "spruce_door", + "spruce_fence", + "spruce_fence_gate", + "spruce_log", + "spruce_planks", + "spruce_pressure_plate", + "spruce_sapling", + "spruce_sign", + "spruce_slab", + "spruce_stairs", + "spruce_trapdoor", + "spruce_wall_sign", + "spruce_wood", + "stripped_acacia_log", + "stripped_acacia_wood", + "stripped_birch_log", + "stripped_birch_wood", + "stripped_crimson_hyphae", + "stripped_crimson_stem", + "stripped_dark_oak_log", + "stripped_dark_oak_wood", + "stripped_jungle_log", + "stripped_jungle_wood", + "stripped_oak_log", + "stripped_oak_wood", + "stripped_spruce_log", + "stripped_spruce_wood", + "stripped_warped_hyphae", + "stripped_warped_stem", "sugar_cane", + "sunflower", "sweet_berry_bush", "tall_grass", "trapped_chest", - "twisting_vines_plant", "twisting_vines", + "twisting_vines_plant", "vine", + "warped_button", + "warped_door", + "warped_fence", + "warped_fence_gate", "warped_fungus", - "weeping_vines_plant", + "warped_hyphae", + "warped_planks", + "warped_pressure_plate", + "warped_sign", + "warped_slab", + "warped_stairs", + "warped_stem", + "warped_trapdoor", + "warped_wall_sign", "weeping_vines", + "weeping_vines_plant", "wheat", "white_banner", - "orange_banner", - "magenta_banner", - "light_blue_banner", - "yellow_banner", - "lime_banner", - "pink_banner", - "gray_banner", - "light_gray_banner", - "cyan_banner", - "purple_banner", - "blue_banner", - "brown_banner", - "green_banner", - "red_banner", - "black_banner", - "white_wall_banner", - "orange_wall_banner", - "magenta_wall_banner", - "light_blue_wall_banner", - "yellow_wall_banner", - "lime_wall_banner", - "pink_wall_banner", - "gray_wall_banner", - "light_gray_wall_banner", - "cyan_wall_banner", - "purple_wall_banner", - "blue_wall_banner", - "brown_wall_banner", - "green_wall_banner", - "red_wall_banner", - "black_wall_banner", - "acacia_fence_gate", - "birch_fence_gate", - "dark_oak_fence_gate", - "jungle_fence_gate", - "oak_fence_gate", - "spruce_fence_gate", - "crimson_fence_gate", - "warped_fence_gate", - "dandelion", - "poppy", - "blue_orchid", - "allium", - "azure_bluet", - "red_tulip", - "orange_tulip", "white_tulip", - "pink_tulip", - "oxeye_daisy", - "cornflower", - "lily_of_the_valley", + "white_wall_banner", "wither_rose", - "sunflower", - "lilac", - "peony", - "rose_bush", - "dark_oak_log", - "dark_oak_wood", - "stripped_dark_oak_log", - "stripped_dark_oak_wood", - "oak_log", - "oak_wood", - "stripped_oak_log", - "stripped_oak_wood", - "acacia_log", - "acacia_wood", - "stripped_acacia_log", - "stripped_acacia_wood", - "birch_log", - "birch_wood", - "stripped_birch_log", - "stripped_birch_wood", - "jungle_log", - "jungle_wood", - "stripped_jungle_log", - "stripped_jungle_wood", - "spruce_log", - "spruce_wood", - "stripped_spruce_log", - "stripped_spruce_wood", - "crimson_stem", - "stripped_crimson_stem", - "crimson_hyphae", - "stripped_crimson_hyphae", - "warped_stem", - "stripped_warped_stem", - "warped_hyphae", - "stripped_warped_hyphae", - "oak_planks", - "spruce_planks", - "birch_planks", - "jungle_planks", - "acacia_planks", - "dark_oak_planks", - "crimson_planks", - "warped_planks", - "oak_sapling", - "spruce_sapling", - "birch_sapling", - "jungle_sapling", - "acacia_sapling", - "dark_oak_sapling", - "oak_sign", - "spruce_sign", - "birch_sign", - "acacia_sign", - "jungle_sign", - "dark_oak_sign", - "crimson_sign", - "warped_sign", - "oak_wall_sign", - "spruce_wall_sign", - "birch_wall_sign", - "acacia_wall_sign", - "jungle_wall_sign", - "dark_oak_wall_sign", - "crimson_wall_sign", - "warped_wall_sign", - "oak_button", - "spruce_button", - "birch_button", - "jungle_button", - "acacia_button", - "dark_oak_button", - "crimson_button", - "warped_button", - "oak_door", - "spruce_door", - "birch_door", - "jungle_door", - "acacia_door", - "dark_oak_door", - "crimson_door", - "warped_door", - "oak_fence", - "acacia_fence", - "dark_oak_fence", - "spruce_fence", - "birch_fence", - "jungle_fence", - "crimson_fence", - "warped_fence", - "oak_pressure_plate", - "spruce_pressure_plate", - "birch_pressure_plate", - "jungle_pressure_plate", - "acacia_pressure_plate", - "dark_oak_pressure_plate", - "crimson_pressure_plate", - "warped_pressure_plate", - "oak_slab", - "spruce_slab", - "birch_slab", - "jungle_slab", - "acacia_slab", - "dark_oak_slab", - "crimson_slab", - "warped_slab", - "oak_stairs", - "spruce_stairs", - "birch_stairs", - "jungle_stairs", - "acacia_stairs", - "dark_oak_stairs", - "crimson_stairs", - "warped_stairs", - "acacia_trapdoor", - "birch_trapdoor", - "dark_oak_trapdoor", - "jungle_trapdoor", - "oak_trapdoor", - "spruce_trapdoor", - "crimson_trapdoor", - "warped_trapdoor" + "yellow_banner", + "yellow_wall_banner" + ], + "mineable/hoe": [ + "acacia_leaves", + "birch_leaves", + "dark_oak_leaves", + "dried_kelp_block", + "hay_block", + "jungle_leaves", + "nether_wart_block", + "oak_leaves", + "shroomlight", + "sponge", + "spruce_leaves", + "target", + "warped_wart_block", + "wet_sponge" ], "mineable/pickaxe": [ - "stone", - "granite", - "polished_granite", - "diorite", - "polished_diorite", - "andesite", - "polished_andesite", - "cobblestone", - "gold_ore", - "iron_ore", - "coal_ore", - "nether_gold_ore", - "lapis_ore", - "lapis_block", - "dispenser", - "sandstone", - "chiseled_sandstone", - "cut_sandstone", - "gold_block", - "iron_block", - "bricks", - "mossy_cobblestone", - "obsidian", - "spawner", - "diamond_ore", - "diamond_block", - "furnace", - "cobblestone_stairs", - "stone_pressure_plate", - "iron_door", - "redstone_ore", - "netherrack", - "basalt", - "polished_basalt", - "stone_bricks", - "mossy_stone_bricks", - "cracked_stone_bricks", - "chiseled_stone_bricks", - "iron_bars", - "chain", - "brick_stairs", - "stone_brick_stairs", - "nether_bricks", - "nether_brick_fence", - "nether_brick_stairs", - "enchanting_table", - "brewing_stand", - "end_stone", - "sandstone_stairs", - "emerald_ore", - "ender_chest", - "emerald_block", - "light_weighted_pressure_plate", - "heavy_weighted_pressure_plate", - "redstone_block", - "nether_quartz_ore", - "hopper", - "quartz_block", - "chiseled_quartz_block", - "quartz_pillar", - "quartz_stairs", - "dropper", - "white_terracotta", - "orange_terracotta", - "magenta_terracotta", - "light_blue_terracotta", - "yellow_terracotta", - "lime_terracotta", - "pink_terracotta", - "gray_terracotta", - "light_gray_terracotta", - "cyan_terracotta", - "purple_terracotta", - "blue_terracotta", - "brown_terracotta", - "green_terracotta", - "red_terracotta", - "black_terracotta", - "iron_trapdoor", - "prismarine", - "prismarine_bricks", - "dark_prismarine", - "prismarine_stairs", - "prismarine_brick_stairs", - "dark_prismarine_stairs", - "prismarine_slab", - "prismarine_brick_slab", - "dark_prismarine_slab", - "terracotta", - "coal_block", - "red_sandstone", - "chiseled_red_sandstone", - "cut_red_sandstone", - "red_sandstone_stairs", - "stone_slab", - "smooth_stone_slab", - "sandstone_slab", - "cut_sandstone_slab", - "petrified_oak_slab", - "cobblestone_slab", - "brick_slab", - "stone_brick_slab", - "nether_brick_slab", - "quartz_slab", - "red_sandstone_slab", - "cut_red_sandstone_slab", - "purpur_slab", - "smooth_stone", - "smooth_sandstone", - "smooth_quartz", - "smooth_red_sandstone", - "purpur_block", - "purpur_pillar", - "purpur_stairs", - "end_stone_bricks", - "magma_block", - "red_nether_bricks", - "bone_block", - "observer", - "white_glazed_terracotta", - "orange_glazed_terracotta", - "magenta_glazed_terracotta", - "light_blue_glazed_terracotta", - "yellow_glazed_terracotta", - "lime_glazed_terracotta", - "pink_glazed_terracotta", - "gray_glazed_terracotta", - "light_gray_glazed_terracotta", - "cyan_glazed_terracotta", - "purple_glazed_terracotta", - "blue_glazed_terracotta", - "brown_glazed_terracotta", - "green_glazed_terracotta", - "red_glazed_terracotta", - "black_glazed_terracotta", - "white_concrete", - "orange_concrete", - "magenta_concrete", - "light_blue_concrete", - "yellow_concrete", - "lime_concrete", - "pink_concrete", - "gray_concrete", - "light_gray_concrete", - "cyan_concrete", - "purple_concrete", - "blue_concrete", - "brown_concrete", - "green_concrete", - "red_concrete", - "black_concrete", - "dead_tube_coral_block", - "dead_brain_coral_block", - "dead_bubble_coral_block", - "dead_fire_coral_block", - "dead_horn_coral_block", - "tube_coral_block", - "brain_coral_block", - "bubble_coral_block", - "fire_coral_block", - "horn_coral_block", - "dead_tube_coral", - "dead_brain_coral", - "dead_bubble_coral", - "dead_fire_coral", - "dead_horn_coral", - "dead_tube_coral_fan", - "dead_brain_coral_fan", - "dead_bubble_coral_fan", - "dead_fire_coral_fan", - "dead_horn_coral_fan", - "dead_tube_coral_wall_fan", - "dead_brain_coral_wall_fan", - "dead_bubble_coral_wall_fan", - "dead_fire_coral_wall_fan", - "dead_horn_coral_wall_fan", - "polished_granite_stairs", - "smooth_red_sandstone_stairs", - "mossy_stone_brick_stairs", - "polished_diorite_stairs", - "mossy_cobblestone_stairs", - "end_stone_brick_stairs", - "stone_stairs", - "smooth_sandstone_stairs", - "smooth_quartz_stairs", - "granite_stairs", - "andesite_stairs", - "red_nether_brick_stairs", - "polished_andesite_stairs", - "diorite_stairs", - "polished_granite_slab", - "smooth_red_sandstone_slab", - "mossy_stone_brick_slab", - "polished_diorite_slab", - "mossy_cobblestone_slab", - "end_stone_brick_slab", - "smooth_sandstone_slab", - "smooth_quartz_slab", - "granite_slab", - "andesite_slab", - "red_nether_brick_slab", - "polished_andesite_slab", - "diorite_slab", - "smoker", - "blast_furnace", - "grindstone", - "stonecutter", - "bell", - "lantern", - "soul_lantern", - "warped_nylium", - "crimson_nylium", - "netherite_block", + "activator_rail", "ancient_debris", - "crying_obsidian", - "respawn_anchor", - "lodestone", + "andesite", + "andesite_slab", + "andesite_stairs", + "andesite_wall", + "anvil", + "basalt", + "bell", + "black_concrete", + "black_glazed_terracotta", + "black_shulker_box", + "black_terracotta", "blackstone", - "blackstone_stairs", "blackstone_slab", - "polished_blackstone", - "polished_blackstone_bricks", - "cracked_polished_blackstone_bricks", + "blackstone_stairs", + "blackstone_wall", + "blast_furnace", + "blue_concrete", + "blue_glazed_terracotta", + "blue_ice", + "blue_shulker_box", + "blue_terracotta", + "bone_block", + "brain_coral_block", + "brewing_stand", + "brick_slab", + "brick_stairs", + "brick_wall", + "bricks", + "brown_concrete", + "brown_glazed_terracotta", + "brown_shulker_box", + "brown_terracotta", + "bubble_coral_block", + "cauldron", + "chain", + "chipped_anvil", + "chiseled_nether_bricks", "chiseled_polished_blackstone", + "chiseled_quartz_block", + "chiseled_red_sandstone", + "chiseled_sandstone", + "chiseled_stone_bricks", + "coal_block", + "coal_ore", + "cobblestone", + "cobblestone_slab", + "cobblestone_stairs", + "cobblestone_wall", + "cracked_nether_bricks", + "cracked_polished_blackstone_bricks", + "cracked_stone_bricks", + "crimson_nylium", + "crying_obsidian", + "cut_red_sandstone", + "cut_red_sandstone_slab", + "cut_sandstone", + "cut_sandstone_slab", + "cyan_concrete", + "cyan_glazed_terracotta", + "cyan_shulker_box", + "cyan_terracotta", + "damaged_anvil", + "dark_prismarine", + "dark_prismarine_slab", + "dark_prismarine_stairs", + "dead_brain_coral", + "dead_brain_coral_block", + "dead_brain_coral_fan", + "dead_brain_coral_wall_fan", + "dead_bubble_coral", + "dead_bubble_coral_block", + "dead_bubble_coral_fan", + "dead_bubble_coral_wall_fan", + "dead_fire_coral", + "dead_fire_coral_block", + "dead_fire_coral_fan", + "dead_fire_coral_wall_fan", + "dead_horn_coral", + "dead_horn_coral_block", + "dead_horn_coral_fan", + "dead_horn_coral_wall_fan", + "dead_tube_coral", + "dead_tube_coral_block", + "dead_tube_coral_fan", + "dead_tube_coral_wall_fan", + "detector_rail", + "diamond_block", + "diamond_ore", + "diorite", + "diorite_slab", + "diorite_stairs", + "diorite_wall", + "dispenser", + "dropper", + "emerald_block", + "emerald_ore", + "enchanting_table", + "end_stone", + "end_stone_brick_slab", + "end_stone_brick_stairs", + "end_stone_brick_wall", + "end_stone_bricks", + "ender_chest", + "fire_coral_block", + "furnace", + "gilded_blackstone", + "gold_block", + "gold_ore", + "granite", + "granite_slab", + "granite_stairs", + "granite_wall", + "gray_concrete", + "gray_glazed_terracotta", + "gray_shulker_box", + "gray_terracotta", + "green_concrete", + "green_glazed_terracotta", + "green_shulker_box", + "green_terracotta", + "grindstone", + "heavy_weighted_pressure_plate", + "hopper", + "horn_coral_block", + "ice", + "infested_chiseled_stone_bricks", + "infested_cobblestone", + "infested_cracked_stone_bricks", + "infested_mossy_stone_bricks", + "infested_stone", + "infested_stone_bricks", + "iron_bars", + "iron_block", + "iron_door", + "iron_ore", + "iron_trapdoor", + "lantern", + "lapis_block", + "lapis_ore", + "light_blue_concrete", + "light_blue_glazed_terracotta", + "light_blue_shulker_box", + "light_blue_terracotta", + "light_gray_concrete", + "light_gray_glazed_terracotta", + "light_gray_shulker_box", + "light_gray_terracotta", + "light_weighted_pressure_plate", + "lime_concrete", + "lime_glazed_terracotta", + "lime_shulker_box", + "lime_terracotta", + "lodestone", + "magenta_concrete", + "magenta_glazed_terracotta", + "magenta_shulker_box", + "magenta_terracotta", + "magma_block", + "mossy_cobblestone", + "mossy_cobblestone_slab", + "mossy_cobblestone_stairs", + "mossy_cobblestone_wall", + "mossy_stone_brick_slab", + "mossy_stone_brick_stairs", + "mossy_stone_brick_wall", + "mossy_stone_bricks", + "nether_brick_fence", + "nether_brick_slab", + "nether_brick_stairs", + "nether_brick_wall", + "nether_bricks", + "nether_gold_ore", + "nether_quartz_ore", + "netherite_block", + "netherrack", + "observer", + "obsidian", + "orange_concrete", + "orange_glazed_terracotta", + "orange_shulker_box", + "orange_terracotta", + "packed_ice", + "petrified_oak_slab", + "pink_concrete", + "pink_glazed_terracotta", + "pink_shulker_box", + "pink_terracotta", + "piston", + "piston_head", + "polished_andesite", + "polished_andesite_slab", + "polished_andesite_stairs", + "polished_basalt", + "polished_blackstone", "polished_blackstone_brick_slab", "polished_blackstone_brick_stairs", - "gilded_blackstone", - "polished_blackstone_stairs", - "polished_blackstone_slab", - "polished_blackstone_pressure_plate", - "chiseled_nether_bricks", - "cracked_nether_bricks", - "quartz_bricks", - "ice", - "packed_ice", - "blue_ice", - "stone_button", - "piston", - "sticky_piston", - "piston_head", - "infested_cobblestone", - "infested_chiseled_stone_bricks", - "infested_cracked_stone_bricks", - "infested_stone", - "infested_mossy_stone_bricks", - "infested_stone_bricks", - "cobblestone_wall", - "mossy_cobblestone_wall", - "brick_wall", - "prismarine_wall", - "red_sandstone_wall", - "mossy_stone_brick_wall", - "granite_wall", - "stone_brick_wall", - "nether_brick_wall", - "andesite_wall", - "red_nether_brick_wall", - "sandstone_wall", - "end_stone_brick_wall", - "diorite_wall", - "blackstone_wall", "polished_blackstone_brick_wall", + "polished_blackstone_bricks", + "polished_blackstone_pressure_plate", + "polished_blackstone_slab", + "polished_blackstone_stairs", "polished_blackstone_wall", - "shulker_box", - "black_shulker_box", - "blue_shulker_box", - "brown_shulker_box", - "cyan_shulker_box", - "gray_shulker_box", - "green_shulker_box", - "light_blue_shulker_box", - "light_gray_shulker_box", - "lime_shulker_box", - "magenta_shulker_box", - "orange_shulker_box", - "pink_shulker_box", - "purple_shulker_box", - "red_shulker_box", - "white_shulker_box", - "yellow_shulker_box", - "anvil", - "chipped_anvil", - "damaged_anvil", - "cauldron", - "rail", + "polished_diorite", + "polished_diorite_slab", + "polished_diorite_stairs", + "polished_granite", + "polished_granite_slab", + "polished_granite_stairs", "powered_rail", - "detector_rail", - "activator_rail" + "prismarine", + "prismarine_brick_slab", + "prismarine_brick_stairs", + "prismarine_bricks", + "prismarine_slab", + "prismarine_stairs", + "prismarine_wall", + "purple_concrete", + "purple_glazed_terracotta", + "purple_shulker_box", + "purple_terracotta", + "purpur_block", + "purpur_pillar", + "purpur_slab", + "purpur_stairs", + "quartz_block", + "quartz_bricks", + "quartz_pillar", + "quartz_slab", + "quartz_stairs", + "rail", + "red_concrete", + "red_glazed_terracotta", + "red_nether_brick_slab", + "red_nether_brick_stairs", + "red_nether_brick_wall", + "red_nether_bricks", + "red_sandstone", + "red_sandstone_slab", + "red_sandstone_stairs", + "red_sandstone_wall", + "red_shulker_box", + "red_terracotta", + "redstone_block", + "redstone_ore", + "respawn_anchor", + "sandstone", + "sandstone_slab", + "sandstone_stairs", + "sandstone_wall", + "shulker_box", + "smoker", + "smooth_quartz", + "smooth_quartz_slab", + "smooth_quartz_stairs", + "smooth_red_sandstone", + "smooth_red_sandstone_slab", + "smooth_red_sandstone_stairs", + "smooth_sandstone", + "smooth_sandstone_slab", + "smooth_sandstone_stairs", + "smooth_stone", + "smooth_stone_slab", + "soul_lantern", + "spawner", + "sticky_piston", + "stone", + "stone_brick_slab", + "stone_brick_stairs", + "stone_brick_wall", + "stone_bricks", + "stone_button", + "stone_pressure_plate", + "stone_slab", + "stone_stairs", + "stonecutter", + "terracotta", + "tube_coral_block", + "warped_nylium", + "white_concrete", + "white_glazed_terracotta", + "white_shulker_box", + "white_terracotta", + "yellow_concrete", + "yellow_glazed_terracotta", + "yellow_shulker_box", + "yellow_terracotta" + ], + "mineable/shovel": [ + "black_concrete_powder", + "blue_concrete_powder", + "brown_concrete_powder", + "clay", + "coarse_dirt", + "cyan_concrete_powder", + "dirt", + "farmland", + "grass_block", + "gravel", + "gray_concrete_powder", + "green_concrete_powder", + "light_blue_concrete_powder", + "light_gray_concrete_powder", + "lime_concrete_powder", + "magenta_concrete_powder", + "mycelium", + "orange_concrete_powder", + "pink_concrete_powder", + "podzol", + "purple_concrete_powder", + "red_concrete_powder", + "red_sand", + "sand", + "snow", + "snow_block", + "soul_sand", + "soul_soil", + "white_concrete_powder", + "yellow_concrete_powder" ], "needs_diamond_tool": [ - "obsidian", + "ancient_debris", "crying_obsidian", "netherite_block", - "respawn_anchor", - "ancient_debris" + "obsidian", + "respawn_anchor" ], "needs_iron_tool": [ "diamond_block", "diamond_ore", - "emerald_ore", "emerald_block", + "emerald_ore", "gold_block", "gold_ore", "redstone_ore" @@ -669,7 +732,20 @@ "iron_ore", "lapis_block", "lapis_ore" + ], + "redstone_ores": [ + "redstone_ore" + ], + "snow": [ + "snow", + "snow_block" + ], + "stone_ore_replaceables": [ + "andesite", + "diorite", + "granite", + "stone" ] } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.16to1.16.2.json b/mappings/diff/mapping-1.16to1.16.2.json index be2ab56..af682e1 100644 --- a/mappings/diff/mapping-1.16to1.16.2.json +++ b/mappings/diff/mapping-1.16to1.16.2.json @@ -6,5 +6,32 @@ "14887": "lantern[hanging=false,waterlogged=false]", "14888": "soul_lantern[hanging=true,waterlogged=false]", "14889": "soul_lantern[hanging=false,waterlogged=false]" + }, + "tags": { + "item": { + "stone_crafting_materials": [ + "blackstone", + "cobblestone" + ] + }, + "block": { + "base_stone_nether": [ + "basalt", + "blackstone", + "netherrack" + ], + "base_stone_overworld": [ + "andesite", + "diorite", + "granite", + "stone" + ], + "mushroom_grow_block": [ + "crimson_nylium", + "mycelium", + "podzol", + "warped_nylium" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.17to1.18.json b/mappings/diff/mapping-1.17to1.18.json index b4847cc..20417c2 100644 --- a/mappings/diff/mapping-1.17to1.18.json +++ b/mappings/diff/mapping-1.17to1.18.json @@ -2,5 +2,233 @@ "particles": { "barrier": "block_marker", "light": "block_marker" + }, + "tags": { + "item": { + "dirt": [ + "coarse_dirt", + "dirt", + "grass_block", + "moss_block", + "mycelium", + "podzol", + "rooted_dirt" + ], + "terracotta": [ + "black_terracotta", + "blue_terracotta", + "brown_terracotta", + "cyan_terracotta", + "gray_terracotta", + "green_terracotta", + "light_blue_terracotta", + "light_gray_terracotta", + "lime_terracotta", + "magenta_terracotta", + "orange_terracotta", + "pink_terracotta", + "purple_terracotta", + "red_terracotta", + "terracotta", + "white_terracotta", + "yellow_terracotta" + ] + }, + "block": { + "animals_spawnable_on": [ + "grass_block" + ], + "axolotls_spawnable_on": [ + "clay" + ], + "azalea_grows_on": [ + "black_terracotta", + "blue_terracotta", + "brown_terracotta", + "coarse_dirt", + "cyan_terracotta", + "dirt", + "grass_block", + "gray_terracotta", + "green_terracotta", + "light_blue_terracotta", + "light_gray_terracotta", + "lime_terracotta", + "magenta_terracotta", + "moss_block", + "mycelium", + "orange_terracotta", + "pink_terracotta", + "podzol", + "powder_snow", + "purple_terracotta", + "red_sand", + "red_terracotta", + "rooted_dirt", + "sand", + "snow_block", + "terracotta", + "white_terracotta", + "yellow_terracotta" + ], + "azalea_root_replaceable": [ + "andesite", + "black_terracotta", + "blue_terracotta", + "brown_terracotta", + "cave_vines", + "cave_vines_plant", + "clay", + "coarse_dirt", + "cyan_terracotta", + "deepslate", + "diorite", + "dirt", + "granite", + "grass_block", + "gravel", + "gray_terracotta", + "green_terracotta", + "light_blue_terracotta", + "light_gray_terracotta", + "lime_terracotta", + "magenta_terracotta", + "moss_block", + "mycelium", + "orange_terracotta", + "pink_terracotta", + "podzol", + "purple_terracotta", + "red_sand", + "red_terracotta", + "rooted_dirt", + "sand", + "stone", + "terracotta", + "tuff", + "white_terracotta", + "yellow_terracotta" + ], + "big_dripleaf_placeable": [ + "clay", + "coarse_dirt", + "dirt", + "farmland", + "grass_block", + "moss_block", + "mycelium", + "podzol", + "rooted_dirt" + ], + "foxes_spawnable_on": [ + "coarse_dirt", + "grass_block", + "podzol", + "snow", + "snow_block" + ], + "goats_spawnable_on": [ + "gravel", + "packed_ice", + "powder_snow", + "snow", + "snow_block", + "stone" + ], + "mooshrooms_spawnable_on": [ + "mycelium" + ], + "parrots_spawnable_on": [ + "acacia_leaves", + "acacia_log", + "acacia_wood", + "air", + "azalea_leaves", + "birch_leaves", + "birch_log", + "birch_wood", + "crimson_hyphae", + "crimson_stem", + "dark_oak_leaves", + "dark_oak_log", + "dark_oak_wood", + "flowering_azalea_leaves", + "grass_block", + "jungle_leaves", + "jungle_log", + "jungle_wood", + "oak_leaves", + "oak_log", + "oak_wood", + "spruce_leaves", + "spruce_log", + "spruce_wood", + "stripped_acacia_log", + "stripped_acacia_wood", + "stripped_birch_log", + "stripped_birch_wood", + "stripped_crimson_hyphae", + "stripped_crimson_stem", + "stripped_dark_oak_log", + "stripped_dark_oak_wood", + "stripped_jungle_log", + "stripped_jungle_wood", + "stripped_oak_log", + "stripped_oak_wood", + "stripped_spruce_log", + "stripped_spruce_wood", + "stripped_warped_hyphae", + "stripped_warped_stem", + "warped_hyphae", + "warped_stem" + ], + "polar_bears_spawnable_on_in_frozen_ocean": [ + "ice" + ], + "rabbits_spawnable_on": [ + "grass_block", + "sand", + "snow", + "snow_block" + ], + "replaceable_plants": [ + "dead_bush", + "fern", + "glow_lichen", + "grass", + "hanging_roots", + "large_fern", + "lilac", + "peony", + "rose_bush", + "sunflower", + "tall_grass", + "vine" + ], + "terracotta": [ + "black_terracotta", + "blue_terracotta", + "brown_terracotta", + "cyan_terracotta", + "gray_terracotta", + "green_terracotta", + "light_blue_terracotta", + "light_gray_terracotta", + "lime_terracotta", + "magenta_terracotta", + "orange_terracotta", + "pink_terracotta", + "purple_terracotta", + "red_terracotta", + "terracotta", + "white_terracotta", + "yellow_terracotta" + ], + "wolves_spawnable_on": [ + "grass_block", + "snow", + "snow_block" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.18to1.19.json b/mappings/diff/mapping-1.18to1.19.json index ccfb4b1..716ed1c 100644 --- a/mappings/diff/mapping-1.18to1.19.json +++ b/mappings/diff/mapping-1.18to1.19.json @@ -196,5 +196,148 @@ "6849": "trapped_chest[type=left,facing=east,waterlogged=false]", "6850": "trapped_chest[type=right,facing=east,waterlogged=true]", "6851": "trapped_chest[type=right,facing=east,waterlogged=false]" + }, + "tags": { + "item": { + "compasses": [ + "compass" + ], + "completes_find_tree_tutorial": [ + "acacia_leaves", + "acacia_log", + "acacia_wood", + "azalea_leaves", + "birch_leaves", + "birch_log", + "birch_wood", + "crimson_hyphae", + "crimson_stem", + "dark_oak_leaves", + "dark_oak_log", + "dark_oak_wood", + "flowering_azalea_leaves", + "jungle_leaves", + "jungle_log", + "jungle_wood", + "nether_wart_block", + "oak_leaves", + "oak_log", + "oak_wood", + "spruce_leaves", + "spruce_log", + "spruce_wood", + "stripped_acacia_log", + "stripped_acacia_wood", + "stripped_birch_log", + "stripped_birch_wood", + "stripped_crimson_hyphae", + "stripped_crimson_stem", + "stripped_dark_oak_log", + "stripped_dark_oak_wood", + "stripped_jungle_log", + "stripped_jungle_wood", + "stripped_oak_log", + "stripped_oak_wood", + "stripped_spruce_log", + "stripped_spruce_wood", + "stripped_warped_hyphae", + "stripped_warped_stem", + "warped_hyphae", + "warped_stem", + "warped_wart_block" + ], + "wart_blocks": [ + "nether_wart_block", + "warped_wart_block" + ] + }, + "block": { + "completes_find_tree_tutorial": [ + "acacia_leaves", + "acacia_log", + "acacia_wood", + "azalea_leaves", + "birch_leaves", + "birch_log", + "birch_wood", + "crimson_hyphae", + "crimson_stem", + "dark_oak_leaves", + "dark_oak_log", + "dark_oak_wood", + "flowering_azalea_leaves", + "jungle_leaves", + "jungle_log", + "jungle_wood", + "nether_wart_block", + "oak_leaves", + "oak_log", + "oak_wood", + "spruce_leaves", + "spruce_log", + "spruce_wood", + "stripped_acacia_log", + "stripped_acacia_wood", + "stripped_birch_log", + "stripped_birch_wood", + "stripped_crimson_hyphae", + "stripped_crimson_stem", + "stripped_dark_oak_log", + "stripped_dark_oak_wood", + "stripped_jungle_log", + "stripped_jungle_wood", + "stripped_oak_log", + "stripped_oak_wood", + "stripped_spruce_log", + "stripped_spruce_wood", + "stripped_warped_hyphae", + "stripped_warped_stem", + "warped_hyphae", + "warped_stem", + "warped_wart_block" + ], + "dead_bush_may_place_on": [ + "black_terracotta", + "blue_terracotta", + "brown_terracotta", + "coarse_dirt", + "cyan_terracotta", + "dirt", + "grass_block", + "gray_terracotta", + "green_terracotta", + "light_blue_terracotta", + "light_gray_terracotta", + "lime_terracotta", + "magenta_terracotta", + "moss_block", + "mycelium", + "orange_terracotta", + "pink_terracotta", + "podzol", + "purple_terracotta", + "red_sand", + "red_terracotta", + "rooted_dirt", + "sand", + "terracotta", + "white_terracotta", + "yellow_terracotta" + ], + "dragon_transparent": [ + "fire", + "light", + "soul_fire" + ], + "snow_layer_can_survive_on": [ + "honey_block", + "soul_sand" + ], + "snow_layer_cannot_survive_on": [ + "barrier", + "ice", + "packed_ice" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.19.3to1.19.4.json b/mappings/diff/mapping-1.19.3to1.19.4.json new file mode 100644 index 0000000..af15302 --- /dev/null +++ b/mappings/diff/mapping-1.19.3to1.19.4.json @@ -0,0 +1,122 @@ +{ + "tags": { + "item": { + "axes": [ + "diamond_axe", + "golden_axe", + "iron_axe", + "netherite_axe", + "stone_axe", + "wooden_axe" + ], + "hoes": [ + "diamond_hoe", + "golden_hoe", + "iron_hoe", + "netherite_hoe", + "stone_hoe", + "wooden_hoe" + ], + "pickaxes": [ + "diamond_pickaxe", + "golden_pickaxe", + "iron_pickaxe", + "netherite_pickaxe", + "stone_pickaxe", + "wooden_pickaxe" + ], + "shovels": [ + "diamond_shovel", + "golden_shovel", + "iron_shovel", + "netherite_shovel", + "stone_shovel", + "wooden_shovel" + ], + "smelts_to_glass": [ + "red_sand", + "sand" + ], + "swords": [ + "diamond_sword", + "golden_sword", + "iron_sword", + "netherite_sword", + "stone_sword", + "wooden_sword" + ], + "tools": [ + "diamond_axe", + "diamond_hoe", + "diamond_pickaxe", + "diamond_shovel", + "diamond_sword", + "golden_axe", + "golden_hoe", + "golden_pickaxe", + "golden_shovel", + "golden_sword", + "iron_axe", + "iron_hoe", + "iron_pickaxe", + "iron_shovel", + "iron_sword", + "netherite_axe", + "netherite_hoe", + "netherite_pickaxe", + "netherite_shovel", + "netherite_sword", + "stone_axe", + "stone_hoe", + "stone_pickaxe", + "stone_shovel", + "stone_sword", + "trident", + "wooden_axe", + "wooden_hoe", + "wooden_pickaxe", + "wooden_shovel", + "wooden_sword" + ] + }, + "block": { + "smelts_to_glass": [ + "red_sand", + "sand" + ] + }, + "entity_type": { + "dismounts_underwater": [ + "camel", + "chicken", + "donkey", + "horse", + "llama", + "mule", + "pig", + "ravager", + "spider", + "strider", + "trader_llama", + "zombie_horse" + ], + "fall_damage_immune": [ + "allay", + "bat", + "bee", + "blaze", + "cat", + "chicken", + "ghast", + "iron_golem", + "magma_cube", + "ocelot", + "parrot", + "phantom", + "shulker", + "snow_golem", + "wither" + ] + } + } +} diff --git a/mappings/diff/mapping-1.19.4to1.20.json b/mappings/diff/mapping-1.19.4to1.20.json index d979996..a0b85fa 100644 --- a/mappings/diff/mapping-1.19.4to1.20.json +++ b/mappings/diff/mapping-1.19.4to1.20.json @@ -65,90 +65,433 @@ "legacy_smithing": "anvil" }, "tags": { + "item": { + "bamboo_blocks": [ + "bamboo_block", + "stripped_bamboo_block" + ], + "bookshelf_books": [ + "book", + "enchanted_book", + "knowledge_book", + "writable_book", + "written_book" + ], + "breaks_decorated_pots": [ + "diamond_axe", + "diamond_hoe", + "diamond_pickaxe", + "diamond_shovel", + "diamond_sword", + "golden_axe", + "golden_hoe", + "golden_pickaxe", + "golden_shovel", + "golden_sword", + "iron_axe", + "iron_hoe", + "iron_pickaxe", + "iron_shovel", + "iron_sword", + "netherite_axe", + "netherite_hoe", + "netherite_pickaxe", + "netherite_shovel", + "netherite_sword", + "stone_axe", + "stone_hoe", + "stone_pickaxe", + "stone_shovel", + "stone_sword", + "trident", + "wooden_axe", + "wooden_hoe", + "wooden_pickaxe", + "wooden_shovel", + "wooden_sword" + ], + "cherry_logs": [ + "cherry_log", + "cherry_wood", + "stripped_cherry_log", + "stripped_cherry_wood" + ], + "hanging_signs": [ + "acacia_hanging_sign", + "bamboo_hanging_sign", + "birch_hanging_sign", + "cherry_hanging_sign", + "crimson_hanging_sign", + "dark_oak_hanging_sign", + "jungle_hanging_sign", + "mangrove_hanging_sign", + "oak_hanging_sign", + "spruce_hanging_sign", + "warped_hanging_sign" + ], + "noteblock_top_instruments": [ + "creeper_head", + "dragon_head", + "piglin_head", + "player_head", + "skeleton_skull", + "wither_skeleton_skull", + "zombie_head" + ], + "sniffer_food": [ + "torchflower_seeds" + ], + "stone_buttons": [ + "polished_blackstone_button", + "stone_button" + ], + "trim_materials": [ + "amethyst_shard", + "copper_ingot", + "diamond", + "emerald", + "gold_ingot", + "iron_ingot", + "lapis_lazuli", + "netherite_ingot", + "quartz", + "redstone" + ], + "trim_templates": [ + "coast_armor_trim_smithing_template", + "dune_armor_trim_smithing_template", + "eye_armor_trim_smithing_template", + "rib_armor_trim_smithing_template", + "sentry_armor_trim_smithing_template", + "snout_armor_trim_smithing_template", + "spire_armor_trim_smithing_template", + "tide_armor_trim_smithing_template", + "vex_armor_trim_smithing_template", + "ward_armor_trim_smithing_template", + "wild_armor_trim_smithing_template" + ], + "trimmable_armor": [ + "chainmail_boots", + "chainmail_chestplate", + "chainmail_helmet", + "chainmail_leggings", + "diamond_boots", + "diamond_chestplate", + "diamond_helmet", + "diamond_leggings", + "golden_boots", + "golden_chestplate", + "golden_helmet", + "golden_leggings", + "iron_boots", + "iron_chestplate", + "iron_helmet", + "iron_leggings", + "leather_boots", + "leather_chestplate", + "leather_helmet", + "leather_leggings", + "netherite_boots", + "netherite_chestplate", + "netherite_helmet", + "netherite_leggings", + "turtle_helmet" + ], + "villager_plantable_seeds": [ + "beetroot_seeds", + "carrot", + "potato", + "torchflower_seeds", + "wheat_seeds" + ] + }, "block": { - "sword_efficient": [ - "oak_leaves", - "spruce_leaves", - "birch_leaves", - "jungle_leaves", - "acacia_leaves", - "cherry_leaves", - "dark_oak_leaves", - "mangrove_leaves", - "azalea_leaves", - "flowering_azalea_leaves", - "oak_sapling", - "spruce_sapling", - "birch_sapling", - "jungle_sapling", - "acacia_sapling", - "cherry_sapling", - "dark_oak_sapling", - "bamboo_sapling", + "all_hanging_signs": [ + "acacia_hanging_sign", + "acacia_wall_hanging_sign", + "bamboo_hanging_sign", + "bamboo_wall_hanging_sign", + "birch_hanging_sign", + "birch_wall_hanging_sign", + "cherry_hanging_sign", + "cherry_wall_hanging_sign", + "crimson_hanging_sign", + "crimson_wall_hanging_sign", + "dark_oak_hanging_sign", + "dark_oak_wall_hanging_sign", + "jungle_hanging_sign", + "jungle_wall_hanging_sign", + "mangrove_hanging_sign", + "mangrove_wall_hanging_sign", + "oak_hanging_sign", + "oak_wall_hanging_sign", + "spruce_hanging_sign", + "spruce_wall_hanging_sign", + "warped_hanging_sign", + "warped_wall_hanging_sign" + ], + "bamboo_blocks": [ + "bamboo_block", + "stripped_bamboo_block" + ], + "ceiling_hanging_signs": [ + "acacia_hanging_sign", + "bamboo_hanging_sign", + "birch_hanging_sign", + "cherry_hanging_sign", + "crimson_hanging_sign", + "dark_oak_hanging_sign", + "jungle_hanging_sign", + "mangrove_hanging_sign", + "oak_hanging_sign", + "spruce_hanging_sign", + "warped_hanging_sign" + ], + "cherry_logs": [ + "cherry_log", + "cherry_wood", + "stripped_cherry_log", + "stripped_cherry_wood" + ], + "combination_step_sound_blocks": [ + "black_carpet", + "blue_carpet", + "brown_carpet", + "crimson_roots", + "cyan_carpet", + "gray_carpet", + "green_carpet", + "light_blue_carpet", + "light_gray_carpet", + "lime_carpet", + "magenta_carpet", + "moss_carpet", + "nether_sprouts", + "orange_carpet", + "pink_carpet", + "purple_carpet", + "red_carpet", + "snow", + "warped_roots", + "white_carpet", + "yellow_carpet" + ], + "enchantment_power_provider": [ + "bookshelf" + ], + "enchantment_power_transmitter": [ + "air", + "bubble_column", + "cave_air", + "crimson_roots", + "dead_bush", + "fern", + "fire", + "glow_lichen", + "grass", + "hanging_roots", + "large_fern", + "lava", + "light", + "nether_sprouts", + "seagrass", + "snow", + "soul_fire", + "structure_void", + "tall_grass", + "tall_seagrass", + "vine", + "void_air", + "warped_roots", + "water" + ], + "maintains_farmland": [ + "attached_melon_stem", + "attached_pumpkin_stem", "beetroots", "carrots", - "potatoes", - "wheat", "melon_stem", + "potatoes", "pumpkin_stem", - "dandelion", - "poppy", - "blue_orchid", - "allium", - "azure_bluet", - "red_tulip", - "orange_tulip", - "white_tulip", - "pink_tulip", - "oxeye_daisy", - "cornflower", - "lily_of_the_valley", - "wither_rose", - "cornflower", - "grass", - "fern", + "torchflower", + "torchflower_crop", + "wheat" + ], + "replaceable": [ + "air", + "bubble_column", + "cave_air", + "crimson_roots", "dead_bush", - "vine", + "fern", + "fire", "glow_lichen", - "sunflower", - "lilac", - "rose_bush", - "peony", - "tall_grass", - "large_fern", + "grass", "hanging_roots", - "brown_mushroom", - "red_mushroom", - "sugar_cane", - "pumpkin", - "carved_pumpkin", - "jack_o_lantern", - "melon", - "attached_pumpkin_stem", + "large_fern", + "lava", + "light", + "nether_sprouts", + "seagrass", + "snow", + "soul_fire", + "structure_void", + "tall_grass", + "tall_seagrass", + "vine", + "void_air", + "warped_roots", + "water" + ], + "replaceable_by_trees": [ + "acacia_leaves", + "azalea_leaves", + "birch_leaves", + "cherry_leaves", + "crimson_roots", + "dark_oak_leaves", + "dead_bush", + "fern", + "flowering_azalea_leaves", + "glow_lichen", + "grass", + "hanging_roots", + "jungle_leaves", + "large_fern", + "lilac", + "mangrove_leaves", + "nether_sprouts", + "oak_leaves", + "peony", + "rose_bush", + "seagrass", + "spruce_leaves", + "sunflower", + "tall_grass", + "tall_seagrass", + "vine", + "warped_roots", + "water" + ], + "sniffer_diggable_block": [ + "coarse_dirt", + "dirt", + "grass_block", + "moss_block", + "mud", + "muddy_mangrove_roots", + "podzol", + "rooted_dirt" + ], + "sniffer_egg_hatch_boost": [ + "moss_block" + ], + "stone_buttons": [ + "polished_blackstone_button", + "stone_button" + ], + "sword_efficient": [ + "acacia_leaves", + "acacia_sapling", + "allium", "attached_melon_stem", - "lily_pad", - "cocoa", - "sweet_berry_bush", - "cave_vines", - "cave_vines_plant", - "spore_blossom", - "moss_carpet", - "pink_petals", + "attached_pumpkin_stem", + "azalea", + "azalea_leaves", + "azure_bluet", + "beetroots", "big_dripleaf", "big_dripleaf_stem", - "small_dripleaf", - "nether_wart", - "warped_fungus", - "warped_roots", - "nether_sprouts", + "birch_leaves", + "birch_sapling", + "blue_orchid", + "brown_mushroom", + "carrots", + "carved_pumpkin", + "cave_vines", + "cave_vines_plant", + "cherry_leaves", + "cherry_sapling", + "chorus_flower", + "chorus_plant", + "cocoa", + "cornflower", "crimson_fungus", - "weeping_vines", - "weeping_vines_plant", + "crimson_roots", + "dandelion", + "dark_oak_leaves", + "dark_oak_sapling", + "dead_bush", + "fern", + "flowering_azalea", + "flowering_azalea_leaves", + "glow_lichen", + "grass", + "hanging_roots", + "jack_o_lantern", + "jungle_leaves", + "jungle_sapling", + "large_fern", + "lilac", + "lily_of_the_valley", + "lily_pad", + "mangrove_leaves", + "mangrove_propagule", + "melon", + "melon_stem", + "moss_carpet", + "nether_sprouts", + "nether_wart", + "oak_leaves", + "oak_sapling", + "orange_tulip", + "oxeye_daisy", + "peony", + "pink_petals", + "pink_tulip", + "poppy", + "potatoes", + "pumpkin", + "pumpkin_stem", + "red_mushroom", + "red_tulip", + "rose_bush", + "small_dripleaf", + "spore_blossom", + "spruce_leaves", + "spruce_sapling", + "sugar_cane", + "sunflower", + "sweet_berry_bush", + "tall_grass", + "torchflower", + "torchflower_crop", "twisting_vines", "twisting_vines_plant", - "crimson_roots", - "chorus_plant", - "chorus_flower" + "vine", + "warped_fungus", + "warped_roots", + "weeping_vines", + "weeping_vines_plant", + "wheat", + "white_tulip", + "wither_rose" + ], + "vibration_resonators": [ + "amethyst_block" + ], + "wall_hanging_signs": [ + "acacia_wall_hanging_sign", + "bamboo_wall_hanging_sign", + "birch_wall_hanging_sign", + "cherry_wall_hanging_sign", + "crimson_wall_hanging_sign", + "dark_oak_wall_hanging_sign", + "jungle_wall_hanging_sign", + "mangrove_wall_hanging_sign", + "oak_wall_hanging_sign", + "spruce_wall_hanging_sign", + "warped_wall_hanging_sign" ] } } diff --git a/mappings/diff/mapping-1.19to1.19.3.json b/mappings/diff/mapping-1.19to1.19.3.json index a510f06..cc50785 100644 --- a/mappings/diff/mapping-1.19to1.19.3.json +++ b/mappings/diff/mapping-1.19to1.19.3.json @@ -3,5 +3,50 @@ "item_enchantment": "resource", "mob_effect": "resource", "entity_summon": "resource" + }, + "tags": { + "item": { + "creeper_igniters": [ + "fire_charge", + "flint_and_steel" + ], + "fence_gates": [ + "acacia_fence_gate", + "birch_fence_gate", + "crimson_fence_gate", + "dark_oak_fence_gate", + "jungle_fence_gate", + "mangrove_fence_gate", + "oak_fence_gate", + "spruce_fence_gate", + "warped_fence_gate" + ] + }, + "block": { + "all_signs": [ + "acacia_sign", + "acacia_wall_sign", + "birch_sign", + "birch_wall_sign", + "crimson_sign", + "crimson_wall_sign", + "dark_oak_sign", + "dark_oak_wall_sign", + "jungle_sign", + "jungle_wall_sign", + "mangrove_sign", + "mangrove_wall_sign", + "oak_sign", + "oak_wall_sign", + "spruce_sign", + "spruce_wall_sign", + "warped_sign", + "warped_wall_sign" + ], + "invalid_spawn_inside": [ + "end_gateway", + "end_portal" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.20.2to1.20.3.json b/mappings/diff/mapping-1.20.2to1.20.3.json index 980ae6f..c028f1e 100644 --- a/mappings/diff/mapping-1.20.2to1.20.3.json +++ b/mappings/diff/mapping-1.20.2to1.20.3.json @@ -7,5 +7,61 @@ }, "items": { "grass": "short_grass" + }, + "tags": { + "entity_type": { + "can_breathe_under_water": [ + "armor_stand", + "axolotl", + "cod", + "drowned", + "elder_guardian", + "frog", + "glow_squid", + "guardian", + "husk", + "phantom", + "pufferfish", + "salmon", + "skeleton", + "skeleton_horse", + "squid", + "stray", + "tadpole", + "tropical_fish", + "turtle", + "wither", + "wither_skeleton", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ], + "undead": [ + "drowned", + "husk", + "phantom", + "skeleton", + "skeleton_horse", + "stray", + "wither", + "wither_skeleton", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ], + "zombies": [ + "drowned", + "husk", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.20.3to1.20.5.json b/mappings/diff/mapping-1.20.3to1.20.5.json index 94843ea..7517fc2 100644 --- a/mappings/diff/mapping-1.20.3to1.20.5.json +++ b/mappings/diff/mapping-1.20.3to1.20.5.json @@ -26,6 +26,538 @@ }, "tags": { "item": { + "armadillo_food": [ + "spider_eye" + ], + "bee_food": [ + "allium", + "azure_bluet", + "blue_orchid", + "cherry_leaves", + "chorus_flower", + "cornflower", + "dandelion", + "flowering_azalea", + "flowering_azalea_leaves", + "lilac", + "lily_of_the_valley", + "mangrove_propagule", + "orange_tulip", + "oxeye_daisy", + "peony", + "pink_petals", + "pink_tulip", + "pitcher_plant", + "poppy", + "red_tulip", + "rose_bush", + "spore_blossom", + "sunflower", + "torchflower", + "white_tulip", + "wither_rose" + ], + "camel_food": [ + "cactus" + ], + "cat_food": [ + "cod", + "salmon" + ], + "chest_armor": [ + "chainmail_chestplate", + "diamond_chestplate", + "golden_chestplate", + "iron_chestplate", + "leather_chestplate", + "netherite_chestplate" + ], + "chicken_food": [ + "beetroot_seeds", + "melon_seeds", + "pitcher_pod", + "pumpkin_seeds", + "torchflower_seeds", + "wheat_seeds" + ], + "cow_food": [ + "wheat" + ], + "dyeable": [ + "leather_boots", + "leather_chestplate", + "leather_helmet", + "leather_horse_armor", + "leather_leggings" + ], + "enchantable/armor": [ + "chainmail_boots", + "chainmail_chestplate", + "chainmail_helmet", + "chainmail_leggings", + "diamond_boots", + "diamond_chestplate", + "diamond_helmet", + "diamond_leggings", + "golden_boots", + "golden_chestplate", + "golden_helmet", + "golden_leggings", + "iron_boots", + "iron_chestplate", + "iron_helmet", + "iron_leggings", + "leather_boots", + "leather_chestplate", + "leather_helmet", + "leather_leggings", + "netherite_boots", + "netherite_chestplate", + "netherite_helmet", + "netherite_leggings", + "turtle_helmet" + ], + "enchantable/bow": [ + "bow" + ], + "enchantable/chest_armor": [ + "chainmail_chestplate", + "diamond_chestplate", + "golden_chestplate", + "iron_chestplate", + "leather_chestplate", + "netherite_chestplate" + ], + "enchantable/crossbow": [ + "crossbow" + ], + "enchantable/durability": [ + "bow", + "brush", + "carrot_on_a_stick", + "chainmail_boots", + "chainmail_chestplate", + "chainmail_helmet", + "chainmail_leggings", + "crossbow", + "diamond_axe", + "diamond_boots", + "diamond_chestplate", + "diamond_helmet", + "diamond_hoe", + "diamond_leggings", + "diamond_pickaxe", + "diamond_shovel", + "diamond_sword", + "elytra", + "fishing_rod", + "flint_and_steel", + "golden_axe", + "golden_boots", + "golden_chestplate", + "golden_helmet", + "golden_hoe", + "golden_leggings", + "golden_pickaxe", + "golden_shovel", + "golden_sword", + "iron_axe", + "iron_boots", + "iron_chestplate", + "iron_helmet", + "iron_hoe", + "iron_leggings", + "iron_pickaxe", + "iron_shovel", + "iron_sword", + "leather_boots", + "leather_chestplate", + "leather_helmet", + "leather_leggings", + "netherite_axe", + "netherite_boots", + "netherite_chestplate", + "netherite_helmet", + "netherite_hoe", + "netherite_leggings", + "netherite_pickaxe", + "netherite_shovel", + "netherite_sword", + "shears", + "shield", + "stone_axe", + "stone_hoe", + "stone_pickaxe", + "stone_shovel", + "stone_sword", + "trident", + "turtle_helmet", + "warped_fungus_on_a_stick", + "wooden_axe", + "wooden_hoe", + "wooden_pickaxe", + "wooden_shovel", + "wooden_sword" + ], + "enchantable/equippable": [ + "carved_pumpkin", + "chainmail_boots", + "chainmail_chestplate", + "chainmail_helmet", + "chainmail_leggings", + "creeper_head", + "diamond_boots", + "diamond_chestplate", + "diamond_helmet", + "diamond_leggings", + "dragon_head", + "elytra", + "golden_boots", + "golden_chestplate", + "golden_helmet", + "golden_leggings", + "iron_boots", + "iron_chestplate", + "iron_helmet", + "iron_leggings", + "leather_boots", + "leather_chestplate", + "leather_helmet", + "leather_leggings", + "netherite_boots", + "netherite_chestplate", + "netherite_helmet", + "netherite_leggings", + "piglin_head", + "player_head", + "skeleton_skull", + "turtle_helmet", + "wither_skeleton_skull", + "zombie_head" + ], + "enchantable/fire_aspect": [ + "diamond_sword", + "golden_sword", + "iron_sword", + "netherite_sword", + "stone_sword", + "wooden_sword" + ], + "enchantable/fishing": [ + "fishing_rod" + ], + "enchantable/foot_armor": [ + "chainmail_boots", + "diamond_boots", + "golden_boots", + "iron_boots", + "leather_boots", + "netherite_boots" + ], + "enchantable/head_armor": [ + "chainmail_helmet", + "diamond_helmet", + "golden_helmet", + "iron_helmet", + "leather_helmet", + "netherite_helmet", + "turtle_helmet" + ], + "enchantable/leg_armor": [ + "chainmail_leggings", + "diamond_leggings", + "golden_leggings", + "iron_leggings", + "leather_leggings", + "netherite_leggings" + ], + "enchantable/mining": [ + "diamond_axe", + "diamond_hoe", + "diamond_pickaxe", + "diamond_shovel", + "golden_axe", + "golden_hoe", + "golden_pickaxe", + "golden_shovel", + "iron_axe", + "iron_hoe", + "iron_pickaxe", + "iron_shovel", + "netherite_axe", + "netherite_hoe", + "netherite_pickaxe", + "netherite_shovel", + "shears", + "stone_axe", + "stone_hoe", + "stone_pickaxe", + "stone_shovel", + "wooden_axe", + "wooden_hoe", + "wooden_pickaxe", + "wooden_shovel" + ], + "enchantable/mining_loot": [ + "diamond_axe", + "diamond_hoe", + "diamond_pickaxe", + "diamond_shovel", + "golden_axe", + "golden_hoe", + "golden_pickaxe", + "golden_shovel", + "iron_axe", + "iron_hoe", + "iron_pickaxe", + "iron_shovel", + "netherite_axe", + "netherite_hoe", + "netherite_pickaxe", + "netherite_shovel", + "stone_axe", + "stone_hoe", + "stone_pickaxe", + "stone_shovel", + "wooden_axe", + "wooden_hoe", + "wooden_pickaxe", + "wooden_shovel" + ], + "enchantable/sharp_weapon": [ + "diamond_axe", + "diamond_sword", + "golden_axe", + "golden_sword", + "iron_axe", + "iron_sword", + "netherite_axe", + "netherite_sword", + "stone_axe", + "stone_sword", + "wooden_axe", + "wooden_sword" + ], + "enchantable/sword": [ + "diamond_sword", + "golden_sword", + "iron_sword", + "netherite_sword", + "stone_sword", + "wooden_sword" + ], + "enchantable/trident": [ + "trident" + ], + "enchantable/vanishing": [ + "bow", + "brush", + "carrot_on_a_stick", + "carved_pumpkin", + "chainmail_boots", + "chainmail_chestplate", + "chainmail_helmet", + "chainmail_leggings", + "compass", + "creeper_head", + "crossbow", + "diamond_axe", + "diamond_boots", + "diamond_chestplate", + "diamond_helmet", + "diamond_hoe", + "diamond_leggings", + "diamond_pickaxe", + "diamond_shovel", + "diamond_sword", + "dragon_head", + "elytra", + "fishing_rod", + "flint_and_steel", + "golden_axe", + "golden_boots", + "golden_chestplate", + "golden_helmet", + "golden_hoe", + "golden_leggings", + "golden_pickaxe", + "golden_shovel", + "golden_sword", + "iron_axe", + "iron_boots", + "iron_chestplate", + "iron_helmet", + "iron_hoe", + "iron_leggings", + "iron_pickaxe", + "iron_shovel", + "iron_sword", + "leather_boots", + "leather_chestplate", + "leather_helmet", + "leather_leggings", + "netherite_axe", + "netherite_boots", + "netherite_chestplate", + "netherite_helmet", + "netherite_hoe", + "netherite_leggings", + "netherite_pickaxe", + "netherite_shovel", + "netherite_sword", + "piglin_head", + "player_head", + "shears", + "shield", + "skeleton_skull", + "stone_axe", + "stone_hoe", + "stone_pickaxe", + "stone_shovel", + "stone_sword", + "trident", + "turtle_helmet", + "warped_fungus_on_a_stick", + "wither_skeleton_skull", + "wooden_axe", + "wooden_hoe", + "wooden_pickaxe", + "wooden_shovel", + "wooden_sword", + "zombie_head" + ], + "enchantable/weapon": [ + "diamond_axe", + "diamond_sword", + "golden_axe", + "golden_sword", + "iron_axe", + "iron_sword", + "netherite_axe", + "netherite_sword", + "stone_axe", + "stone_sword", + "wooden_axe", + "wooden_sword" + ], + "foot_armor": [ + "chainmail_boots", + "diamond_boots", + "golden_boots", + "iron_boots", + "leather_boots", + "netherite_boots" + ], + "frog_food": [ + "slime_ball" + ], + "goat_food": [ + "wheat" + ], + "head_armor": [ + "chainmail_helmet", + "diamond_helmet", + "golden_helmet", + "iron_helmet", + "leather_helmet", + "netherite_helmet", + "turtle_helmet" + ], + "hoglin_food": [ + "crimson_fungus" + ], + "horse_food": [ + "apple", + "enchanted_golden_apple", + "golden_apple", + "golden_carrot", + "hay_block", + "sugar", + "wheat" + ], + "horse_tempt_items": [ + "enchanted_golden_apple", + "golden_apple", + "golden_carrot" + ], + "leg_armor": [ + "chainmail_leggings", + "diamond_leggings", + "golden_leggings", + "iron_leggings", + "leather_leggings", + "netherite_leggings" + ], + "llama_food": [ + "hay_block", + "wheat" + ], + "llama_tempt_items": [ + "hay_block" + ], + "meat": [ + "beef", + "chicken", + "cooked_beef", + "cooked_chicken", + "cooked_mutton", + "cooked_porkchop", + "cooked_rabbit", + "mutton", + "porkchop", + "rabbit", + "rotten_flesh" + ], + "ocelot_food": [ + "cod", + "salmon" + ], + "panda_food": [ + "bamboo" + ], + "parrot_food": [ + "beetroot_seeds", + "melon_seeds", + "pitcher_pod", + "pumpkin_seeds", + "torchflower_seeds", + "wheat_seeds" + ], + "parrot_poisonous_food": [ + "cookie" + ], + "pig_food": [ + "beetroot", + "carrot", + "potato" + ], + "rabbit_food": [ + "carrot", + "dandelion", + "golden_carrot" + ], + "sheep_food": [ + "wheat" + ], + "skulls": [ + "creeper_head", + "dragon_head", + "piglin_head", + "player_head", + "skeleton_skull", + "wither_skeleton_skull", + "zombie_head" + ], + "strider_food": [ + "warped_fungus" + ], + "strider_tempt_items": [ + "warped_fungus", + "warped_fungus_on_a_stick" + ], + "turtle_food": [ + "seagrass" + ], "wolf_food": [ "beef", "chicken", @@ -39,6 +571,308 @@ "rabbit", "rotten_flesh" ] + }, + "block": { + "armadillo_spawnable_on": [ + "brown_terracotta", + "coarse_dirt", + "grass_block", + "light_gray_terracotta", + "orange_terracotta", + "red_sand", + "red_terracotta", + "terracotta", + "white_terracotta", + "yellow_terracotta" + ], + "does_not_block_hoppers": [ + "bee_nest", + "beehive" + ], + "incorrect_for_diamond_tool": [], + "incorrect_for_gold_tool": [ + "ancient_debris", + "copper_block", + "copper_ore", + "crying_obsidian", + "cut_copper", + "cut_copper_slab", + "cut_copper_stairs", + "deepslate_copper_ore", + "deepslate_diamond_ore", + "deepslate_emerald_ore", + "deepslate_gold_ore", + "deepslate_iron_ore", + "deepslate_lapis_ore", + "deepslate_redstone_ore", + "diamond_block", + "diamond_ore", + "emerald_block", + "emerald_ore", + "exposed_copper", + "exposed_cut_copper", + "exposed_cut_copper_slab", + "exposed_cut_copper_stairs", + "gold_block", + "gold_ore", + "iron_block", + "iron_ore", + "lapis_block", + "lapis_ore", + "lightning_rod", + "netherite_block", + "obsidian", + "oxidized_copper", + "oxidized_cut_copper", + "oxidized_cut_copper_slab", + "oxidized_cut_copper_stairs", + "raw_copper_block", + "raw_gold_block", + "raw_iron_block", + "redstone_ore", + "respawn_anchor", + "waxed_copper_block", + "waxed_cut_copper", + "waxed_cut_copper_slab", + "waxed_cut_copper_stairs", + "waxed_exposed_copper", + "waxed_exposed_cut_copper", + "waxed_exposed_cut_copper_slab", + "waxed_exposed_cut_copper_stairs", + "waxed_oxidized_copper", + "waxed_oxidized_cut_copper", + "waxed_oxidized_cut_copper_slab", + "waxed_oxidized_cut_copper_stairs", + "waxed_weathered_copper", + "waxed_weathered_cut_copper", + "waxed_weathered_cut_copper_slab", + "waxed_weathered_cut_copper_stairs", + "weathered_copper", + "weathered_cut_copper", + "weathered_cut_copper_slab", + "weathered_cut_copper_stairs" + ], + "incorrect_for_iron_tool": [ + "ancient_debris", + "crying_obsidian", + "netherite_block", + "obsidian", + "respawn_anchor" + ], + "incorrect_for_netherite_tool": [], + "incorrect_for_stone_tool": [ + "ancient_debris", + "crying_obsidian", + "deepslate_diamond_ore", + "deepslate_emerald_ore", + "deepslate_gold_ore", + "deepslate_redstone_ore", + "diamond_block", + "diamond_ore", + "emerald_block", + "emerald_ore", + "gold_block", + "gold_ore", + "netherite_block", + "obsidian", + "raw_gold_block", + "redstone_ore", + "respawn_anchor" + ], + "incorrect_for_wooden_tool": [ + "ancient_debris", + "copper_block", + "copper_ore", + "crying_obsidian", + "cut_copper", + "cut_copper_slab", + "cut_copper_stairs", + "deepslate_copper_ore", + "deepslate_diamond_ore", + "deepslate_emerald_ore", + "deepslate_gold_ore", + "deepslate_iron_ore", + "deepslate_lapis_ore", + "deepslate_redstone_ore", + "diamond_block", + "diamond_ore", + "emerald_block", + "emerald_ore", + "exposed_copper", + "exposed_cut_copper", + "exposed_cut_copper_slab", + "exposed_cut_copper_stairs", + "gold_block", + "gold_ore", + "iron_block", + "iron_ore", + "lapis_block", + "lapis_ore", + "lightning_rod", + "netherite_block", + "obsidian", + "oxidized_copper", + "oxidized_cut_copper", + "oxidized_cut_copper_slab", + "oxidized_cut_copper_stairs", + "raw_copper_block", + "raw_gold_block", + "raw_iron_block", + "redstone_ore", + "respawn_anchor", + "waxed_copper_block", + "waxed_cut_copper", + "waxed_cut_copper_slab", + "waxed_cut_copper_stairs", + "waxed_exposed_copper", + "waxed_exposed_cut_copper", + "waxed_exposed_cut_copper_slab", + "waxed_exposed_cut_copper_stairs", + "waxed_oxidized_copper", + "waxed_oxidized_cut_copper", + "waxed_oxidized_cut_copper_slab", + "waxed_oxidized_cut_copper_stairs", + "waxed_weathered_copper", + "waxed_weathered_cut_copper", + "waxed_weathered_cut_copper_slab", + "waxed_weathered_cut_copper_stairs", + "weathered_copper", + "weathered_cut_copper", + "weathered_cut_copper_slab", + "weathered_cut_copper_stairs" + ] + }, + "entity_type": { + "aquatic": [ + "axolotl", + "cod", + "dolphin", + "elder_guardian", + "glow_squid", + "guardian", + "pufferfish", + "salmon", + "squid", + "tadpole", + "tropical_fish", + "turtle" + ], + "arthropod": [ + "bee", + "cave_spider", + "endermite", + "silverfish", + "spider" + ], + "ignores_poison_and_regen": [ + "drowned", + "husk", + "phantom", + "skeleton", + "skeleton_horse", + "stray", + "wither", + "wither_skeleton", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ], + "illager": [ + "evoker", + "illusioner", + "pillager", + "vindicator" + ], + "illager_friends": [ + "evoker", + "illusioner", + "pillager", + "vindicator" + ], + "inverted_healing_and_harm": [ + "drowned", + "husk", + "phantom", + "skeleton", + "skeleton_horse", + "stray", + "wither", + "wither_skeleton", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ], + "not_scary_for_pufferfish": [ + "cod", + "dolphin", + "elder_guardian", + "glow_squid", + "guardian", + "pufferfish", + "salmon", + "squid", + "tadpole", + "tropical_fish", + "turtle" + ], + "redirectable_projectile": [ + "fireball" + ], + "sensitive_to_bane_of_arthropods": [ + "bee", + "cave_spider", + "endermite", + "silverfish", + "spider" + ], + "sensitive_to_impaling": [ + "axolotl", + "cod", + "dolphin", + "elder_guardian", + "glow_squid", + "guardian", + "pufferfish", + "salmon", + "squid", + "tadpole", + "tropical_fish", + "turtle" + ], + "sensitive_to_smite": [ + "drowned", + "husk", + "phantom", + "skeleton", + "skeleton_horse", + "stray", + "wither", + "wither_skeleton", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ], + "wither_friends": [ + "drowned", + "husk", + "phantom", + "skeleton", + "skeleton_horse", + "stray", + "wither", + "wither_skeleton", + "zoglin", + "zombie", + "zombie_horse", + "zombie_villager", + "zombified_piglin" + ] } } -} \ No newline at end of file +} diff --git a/mappings/diff/mapping-1.20to1.20.2.json b/mappings/diff/mapping-1.20to1.20.2.json index c6565a0..dd879c9 100644 --- a/mappings/diff/mapping-1.20to1.20.2.json +++ b/mappings/diff/mapping-1.20to1.20.2.json @@ -141,5 +141,54 @@ "piglin_wall_head[facing=south]": "piglin_wall_head[facing=south,powered=false]", "piglin_wall_head[facing=west]": "piglin_wall_head[facing=west,powered=false]", "piglin_wall_head[facing=east]": "piglin_wall_head[facing=east,powered=false]" + }, + "tags": { + "block": { + "camel_sand_step_sound_blocks": [ + "black_concrete_powder", + "blue_concrete_powder", + "brown_concrete_powder", + "cyan_concrete_powder", + "gray_concrete_powder", + "green_concrete_powder", + "light_blue_concrete_powder", + "light_gray_concrete_powder", + "lime_concrete_powder", + "magenta_concrete_powder", + "orange_concrete_powder", + "pink_concrete_powder", + "purple_concrete_powder", + "red_concrete_powder", + "red_sand", + "sand", + "suspicious_sand", + "white_concrete_powder", + "yellow_concrete_powder" + ], + "concrete_powder": [ + "black_concrete_powder", + "blue_concrete_powder", + "brown_concrete_powder", + "cyan_concrete_powder", + "gray_concrete_powder", + "green_concrete_powder", + "light_blue_concrete_powder", + "light_gray_concrete_powder", + "lime_concrete_powder", + "magenta_concrete_powder", + "orange_concrete_powder", + "pink_concrete_powder", + "purple_concrete_powder", + "red_concrete_powder", + "white_concrete_powder", + "yellow_concrete_powder" + ] + }, + "entity_type": { + "non_controlling_rider": [ + "magma_cube", + "slime" + ] + } } -} \ No newline at end of file +} diff --git a/mappings/mapping-1.12.json b/mappings/mapping-1.12.json index e10295c..90edcb3 100644 --- a/mappings/mapping-1.12.json +++ b/mappings/mapping-1.12.json @@ -2961,84 +2961,6 @@ "weather.rain.above" ], "block_tags": { - "impermeable": [ - 66, - 186, - 187, - 188, - 189, - 190, - 191, - 192, - 193, - 194, - 195, - 196, - 197, - 198, - 199, - 200, - 201 - ], - "logs": [ - 39, - 51, - 44, - 57, - 34, - 46, - 45, - 52, - 38, - 50, - 43, - 56, - 36, - 48, - 41, - 54, - 37, - 49, - 42, - 55, - 35, - 47, - 40, - 53 - ], - "jungle_logs": [ - 37, - 49, - 42, - 55 - ], - "carpets": [ - 367, - 368, - 369, - 370, - 371, - 372, - 373, - 374, - 375, - 376, - 377, - 378, - 379, - 380, - 381, - 382 - ], - "doors": [ - 151, - 458, - 459, - 460, - 461, - 462, - 158 - ], "enderman_holdable": [ 8, 9, @@ -3063,90 +2985,10 @@ 172, 173, 177, + 178, 182, 223, - 232, - 178 - ], - "oak_logs": [ - 34, - 46, - 45, - 52 - ], - "stairs": [ - 141, - 154, - 253, - 247, - 351, - 255, - 254, - 352, - 236, - 231, - 230, - 468, - 316, - 427, - 360, - 359, - 361 - ], - "saplings": [ - 19, - 20, - 21, - 22, - 23, - 24 - ], - "planks": [ - 13, - 14, - 15, - 16, - 17, - 18 - ], - "buttons": [ - 284, - 285, - 286, - 287, - 288, - 289, - 168 - ], - "dark_oak_logs": [ - 39, - 51, - 44, - 57 - ], - "acacia_logs": [ - 38, - 50, - 43, - 56 - ], - "rails": [ - 153, - 90, - 91, - 317 - ], - "stone_bricks": [ - 214, - 215, - 216, - 217 - ], - "birch_logs": [ - 36, - 48, - 41, - 54 + 232 ], "banners": [ 392, @@ -3182,22 +3024,25 @@ 422, 423 ], - "wooden_buttons": [ - 284, - 285, - 286, - 287, - 288, - 289 - ], - "spruce_logs": [ - 35, - 47, - 40, - 53 + "trapdoors": [ + 202, + 203, + 204, + 205, + 206, + 207, + 355 ], "flower_pots": [ 260, + 261, + 262, + 263, + 264, + 265, + 266, + 267, + 268, 269, 270, 271, @@ -3207,74 +3052,149 @@ 275, 276, 277, - 268, - 261, - 262, - 263, - 264, - 265, - 266, 278, 279, 280, - 267, 281 ], - "sand": [ - 28, - 29 + "buttons": [ + 168, + 284, + 285, + 286, + 287, + 288, + 289 ], "corals": [ - 561, - 562, - 563, - 564, - 565, - 581, - 582, - 583, - 584, - 585 + 566, + 567, + 568, + 569, + 570, + 586, + 587, + 588, + 589, + 590 ], - "valid_spawn": [ - 8, - 11 - ], - "wooden_doors": [ - 151, - 458, - 459, - 460, - 461, - 462 - ], - "wall_corals": [ - 571, - 572, - 573, - 574, - 575 - ], - "slabs": [ - 434, - 439, - 435, - 432, - 430, - 433, - 431, + "wooden_slabs": [ 428, 429, - 443, - 441, - 442, - 438, - 437, - 440, - 436, - 362, - 363, - 364 + 430, + 431, + 432, + 433 + ], + "planks": [ + 13, + 14, + 15, + 16, + 17, + 18 + ], + "dark_oak_logs": [ + 39, + 44, + 51, + 57 + ], + "rails": [ + 90, + 91, + 153, + 317 + ], + "wooden_trapdoors": [ + 202, + 203, + 204, + 205, + 206, + 207 + ], + "coral_plants": [ + 566, + 567, + 568, + 569, + 570 + ], + "leaves": [ + 58, + 59, + 60, + 61, + 62, + 63 + ], + "coral_blocks": [ + 556, + 557, + 558, + 559, + 560 + ], + "jungle_logs": [ + 37, + 42, + 49, + 55 + ], + "spruce_logs": [ + 35, + 40, + 47, + 53 + ], + "wooden_stairs": [ + 141, + 253, + 254, + 255, + 351, + 352 + ], + "carpets": [ + 367, + 368, + 369, + 370, + 371, + 372, + 373, + 374, + 375, + 376, + 377, + 378, + 379, + 380, + 381, + 382 + ], + "wooden_pressure_plates": [ + 159, + 160, + 161, + 162, + 163, + 164 + ], + "acacia_logs": [ + 38, + 43, + 50, + 56 + ], + "wooden_buttons": [ + 284, + 285, + 286, + 287, + 288, + 289 ], "wool": [ 101, @@ -3294,89 +3214,287 @@ 115, 116 ], - "wooden_pressure_plates": [ - 159, - 160, - 161, - 162, - 163, - 164 - ], - "leaves": [ - 61, - 58, - 59, - 63, - 62, - 60 - ], - "ice": [ - 170, - 385, - 587, - 475 + "stairs": [ + 141, + 154, + 230, + 231, + 236, + 247, + 253, + 254, + 255, + 316, + 351, + 352, + 359, + 360, + 361, + 427, + 468 ], "anvil": [ 302, 303, 304 ], - "wooden_slabs": [ + "birch_logs": [ + 36, + 41, + 48, + 54 + ], + "logs": [ + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55, + 56, + 57 + ], + "stone_bricks": [ + 214, + 215, + 216, + 217 + ], + "wall_corals": [ + 576, + 577, + 578, + 579, + 580 + ], + "underwater_bonemeals": [ + 97, + 566, + 567, + 568, + 569, + 570, + 576, + 577, + 578, + 579, + 580, + 586, + 587, + 588, + 589, + 590 + ], + "ice": [ + 170, + 385, + 475, + 592 + ], + "impermeable": [ + 66, + 186, + 187, + 188, + 189, + 190, + 191, + 192, + 193, + 194, + 195, + 196, + 197, + 198, + 199, + 200, + 201 + ], + "sand": [ + 28, + 29 + ], + "slabs": [ + 362, + 363, + 364, 428, 429, 430, 431, 432, - 433 + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 440, + 441, + 442, + 443 ], - "wooden_stairs": [ - 141, - 253, - 254, - 255, - 351, - 352 + "valid_spawn": [ + 8, + 11 ], - "coral_blocks": [ - 556, - 557, - 558, - 559, - 560 + "saplings": [ + 19, + 20, + 21, + 22, + 23, + 24 + ], + "wooden_doors": [ + 151, + 458, + 459, + 460, + 461, + 462 + ], + "oak_logs": [ + 34, + 45, + 46, + 52 + ], + "doors": [ + 151, + 158, + 458, + 459, + 460, + 461, + 462 ] }, "item_tags": { - "logs": [ + "banners": [ + 735, + 736, + 737, + 738, + 739, + 740, + 741, + 742, + 743, + 744, + 745, + 746, + 747, + 748, + 749, + 750 + ], + "trapdoors": [ + 187, + 188, + 189, + 190, + 191, + 192, + 280 + ], + "buttons": [ + 168, + 241, + 242, + 243, + 244, + 245, + 246 + ], + "wooden_slabs": [ + 112, + 113, + 114, + 115, + 116, + 117 + ], + "planks": [ + 13, + 14, + 15, + 16, + 17, + 18 + ], + "boats": [ + 549, + 764, + 765, + 766, + 767, + 768 + ], + "dark_oak_logs": [ 37, - 55, 43, 49, - 32, - 50, - 38, - 44, - 36, - 54, - 42, - 48, - 34, - 52, - 40, - 46, - 35, - 53, - 41, - 47, - 33, - 51, - 39, - 45 + 55 + ], + "rails": [ + 72, + 73, + 156, + 261 + ], + "wooden_trapdoors": [ + 187, + 188, + 189, + 190, + 191, + 192 + ], + "leaves": [ + 56, + 57, + 58, + 59, + 60, + 61 ], "jungle_logs": [ 35, - 53, 41, - 47 + 47, + 53 + ], + "spruce_logs": [ + 33, + 39, + 45, + 51 + ], + "wooden_stairs": [ + 148, + 234, + 235, + 236, + 301, + 302 ], "carpets": [ 282, @@ -3396,120 +3514,19 @@ 296, 297 ], - "doors": [ - 456, - 457, - 458, - 459, - 460, - 461, - 455 - ], - "oak_logs": [ - 32, - 50, - 38, - 44 - ], - "stairs": [ - 148, - 157, - 234, - 229, - 301, - 236, - 235, - 302, - 222, - 217, - 216, - 146, - 260, - 353, - 347, - 346, - 348 - ], - "saplings": [ - 19, - 20, - 21, - 22, - 23, - 24 - ], - "planks": [ - 13, - 14, - 15, - 16, - 17, - 18 - ], - "buttons": [ - 241, - 242, - 243, - 244, - 245, - 246, - 168 - ], - "dark_oak_logs": [ - 37, - 55, - 43, - 49 + "wooden_pressure_plates": [ + 160, + 161, + 162, + 163, + 164, + 165 ], "acacia_logs": [ 36, - 54, 42, - 48 - ], - "rails": [ - 156, - 72, - 73, - 261 - ], - "stone_bricks": [ - 199, - 200, - 201, - 202 - ], - "birch_logs": [ - 34, - 52, - 40, - 46 - ], - "banners": [ - 730, - 731, - 732, - 733, - 734, - 735, - 736, - 737, - 738, - 739, - 740, - 741, - 742, - 743, - 744, - 745 - ], - "boats": [ - 544, - 759, - 760, - 761, - 762, - 763 + 48, + 54 ], "wooden_buttons": [ 241, @@ -3519,53 +3536,6 @@ 245, 246 ], - "spruce_logs": [ - 33, - 51, - 39, - 45 - ], - "fishes": [ - 566, - 570, - 567, - 571, - 569, - 568 - ], - "sand": [ - 26, - 27 - ], - "wooden_doors": [ - 456, - 457, - 458, - 459, - 460, - 461 - ], - "slabs": [ - 118, - 123, - 119, - 116, - 114, - 117, - 115, - 112, - 113, - 127, - 125, - 126, - 122, - 121, - 124, - 120, - 128, - 129, - 130 - ], "wool": [ 82, 83, @@ -3584,52 +3554,141 @@ 96, 97 ], - "wooden_pressure_plates": [ - 160, - 161, - 162, - 163, - 164, - 165 - ], - "leaves": [ - 59, - 56, - 57, - 61, - 60, - 58 + "stairs": [ + 146, + 148, + 157, + 216, + 217, + 222, + 229, + 234, + 235, + 236, + 260, + 301, + 302, + 346, + 347, + 348, + 353 ], "anvil": [ 247, 248, 249 ], - "wooden_slabs": [ + "fishes": [ + 571, + 572, + 573, + 574, + 575, + 576 + ], + "birch_logs": [ + 34, + 40, + 46, + 52 + ], + "logs": [ + 32, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 49, + 50, + 51, + 52, + 53, + 54, + 55 + ], + "stone_bricks": [ + 199, + 200, + 201, + 202 + ], + "sand": [ + 26, + 27 + ], + "slabs": [ 112, 113, 114, 115, 116, - 117 + 117, + 118, + 119, + 120, + 121, + 122, + 123, + 124, + 125, + 126, + 127, + 128, + 129, + 130 ], - "wooden_stairs": [ - 148, - 234, - 235, - 236, - 301, - 302 + "saplings": [ + 19, + 20, + 21, + 22, + 23, + 24 + ], + "wooden_doors": [ + 461, + 462, + 463, + 464, + 465, + 466 + ], + "oak_logs": [ + 32, + 38, + 44, + 50 + ], + "doors": [ + 460, + 461, + 462, + 463, + 464, + 465, + 466 ] }, "fluid_tags": { - "water": [ - 2, - 1 - ], "lava": [ - 4, - 3 + 3, + 4 + ], + "water": [ + 1, + 2 ] } -} \ No newline at end of file +} diff --git a/output_hashes.json b/output_hashes.json index 17558d7..9b18f43 100644 --- a/output_hashes.json +++ b/output_hashes.json @@ -88,104 +88,104 @@ "size": 814 }, "1.13.2:1.14": { - "object-hash": -1044792523, - "size": 2231 + "object-hash": -304300731, + "size": 3170 }, "1.14:1.13.2": { "object-hash": -641840917, "size": 15311 }, "1.14:1.15": { - "object-hash": 1042348425, - "size": 528 + "object-hash": 776599809, + "size": 973 }, "1.15:1.14": { "object-hash": -524596908, "size": 5373 }, "1.15:1.16": { - "object-hash": -217012630, - "size": 8833 + "object-hash": -1738533204, + "size": 10135 }, "1.16:1.15": { "object-hash": 1512123090, "size": 60099 }, "1.16:1.16.2": { - "object-hash": 837013454, - "size": 632 + "object-hash": 92578951, + "size": 817 }, "1.16.2:1.16": { "object-hash": 638667506, "size": 1159 }, "1.16.2:1.17": { - "object-hash": -1183115967, - "size": 4776 + "object-hash": -248427569, + "size": 5334 }, "1.17:1.16.2": { "object-hash": 1608600130, "size": 23104 }, "1.17:1.18": { - "object-hash": 1536701233, - "size": 351 + "object-hash": -1074228299, + "size": 1549 }, "1.18:1.17": { "object-hash": 1191025590, "size": 1086 }, "1.18:1.19": { - "object-hash": 624447254, - "size": 2519 + "object-hash": 1379985981, + "size": 3253 }, "1.19:1.18": { "object-hash": -527846779, "size": 12214 }, "1.19:1.19.3": { - "object-hash": -1757215187, - "size": 1024 + "object-hash": -703804191, + "size": 1257 }, "1.19.3:1.19": { "object-hash": -803581937, "size": 11964 }, "1.19.3:1.19.4": { - "object-hash": -1220416263, - "size": 1617 + "object-hash": -996304676, + "size": 2197 }, "1.19.4:1.19.3": { "object-hash": -1507041123, "size": 7639 }, "1.19.4:1.20": { - "object-hash": -809213450, - "size": 1136 + "object-hash": -651478431, + "size": 2962 }, "1.20:1.19.4": { "object-hash": -308457178, "size": 3726 }, "1.20:1.20.2": { - "object-hash": -707055172, - "size": 451 + "object-hash": 1400627260, + "size": 716 }, "1.20.2:1.20": { "object-hash": 446121302, "size": 819 }, "1.20.2:1.20.3": { - "object-hash": 620178790, - "size": 897 + "object-hash": 1372288871, + "size": 1161 }, "1.20.3:1.20.2": { "object-hash": 280433401, "size": 7630 }, "1.20.3:1.20.5": { - "object-hash": 1354539065, - "size": 1021 + "object-hash": -455395339, + "size": 5406 }, "1.20.5:1.20.3": { "object-hash": 1855931855, diff --git a/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java b/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java index 64222cd..56f9b2f 100644 --- a/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java +++ b/src/main/java/com/viaversion/mappingsgenerator/MappingsOptimizer.java @@ -32,6 +32,9 @@ import com.viaversion.nbt.tag.Tag; import it.unimi.dsi.fastutil.ints.Int2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -41,8 +44,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Optimizes mapping files as nbt files with only the necessary data (mostly int to int mappings in form of int arrays). @@ -467,7 +468,7 @@ public final class MappingsOptimizer { final String typeKey = switch (type) { case "block" -> "blocks"; case "item" -> "items"; - case "entity_types" -> "entities"; + case "entity_type" -> "entities"; default -> throw new IllegalArgumentException("Registry type not supported: " + type); }; final JsonArray typeElements = mappedObject.get(typeKey).getAsJsonArray();