From 6622b7dcffea76ca57901d4112e32407b4b0eb5c Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 16 Dec 2020 18:48:17 +0100 Subject: [PATCH] 20w51a --- bukkit-legacy/pom.xml | 2 +- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- common/pom.xml | 2 +- .../api/entities/Entity1_17Types.java | 244 ++++++ .../api/protocol/ProtocolVersion.java | 2 +- .../api/rewriters/RegistryType.java | 24 +- .../ViaVersion/api/rewriters/TagRewriter.java | 8 +- .../Protocol1_17To1_16_4.java | 22 +- .../MetadataRewriter1_17To1_16_4.java | 6 +- .../assets/viaversion/data/mapping-1.17.json | 733 +++++++++--------- fabric/pom.xml | 2 +- jar/pom.xml | 2 +- pom.xml | 2 +- sponge-legacy/pom.xml | 2 +- sponge/pom.xml | 2 +- velocity/pom.xml | 2 +- 17 files changed, 671 insertions(+), 388 deletions(-) create mode 100644 common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java diff --git a/bukkit-legacy/pom.xml b/bukkit-legacy/pom.xml index 9cf256097..ef0f8c950 100644 --- a/bukkit-legacy/pom.xml +++ b/bukkit-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 6d35ea969..b2e1bcb07 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index b7502cec7..7c624e4bc 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 24cd842a8..b31a7b889 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java b/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java new file mode 100644 index 000000000..4ff5266fb --- /dev/null +++ b/common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_17Types.java @@ -0,0 +1,244 @@ +package us.myles.ViaVersion.api.entities; + +import us.myles.ViaVersion.api.Via; + +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + +public class Entity1_17Types { + + public static EntityType getTypeFromId(int typeID) { + Optional type = EntityType.findById(typeID); + if (!type.isPresent()) { + Via.getPlatform().getLogger().severe("Could not find 1.17 type id " + typeID); + return EntityType.ENTITY; // Fall back to the basic ENTITY + } + return type.get(); + } + + public enum EntityType implements us.myles.ViaVersion.api.entities.EntityType { + ENTITY(-1), + + AREA_EFFECT_CLOUD(0, ENTITY), + END_CRYSTAL(19, ENTITY), + EVOKER_FANGS(24, ENTITY), + EXPERIENCE_ORB(25, ENTITY), + EYE_OF_ENDER(26, ENTITY), + FALLING_BLOCK(27, ENTITY), + FIREWORK_ROCKET(28, ENTITY), + ITEM(38, ENTITY), + LLAMA_SPIT(44, ENTITY), + TNT(65, ENTITY), + SHULKER_BULLET(72, ENTITY), + FISHING_BOBBER(108, ENTITY), + + LIVINGENTITY(-1, ENTITY), + ARMOR_STAND(1, LIVINGENTITY), + PLAYER(107, LIVINGENTITY), + + ABSTRACT_INSENTIENT(-1, LIVINGENTITY), + ENDER_DRAGON(20, ABSTRACT_INSENTIENT), + + BEE(5, ABSTRACT_INSENTIENT), + + ABSTRACT_CREATURE(-1, ABSTRACT_INSENTIENT), + + ABSTRACT_AGEABLE(-1, ABSTRACT_CREATURE), + VILLAGER(94, ABSTRACT_AGEABLE), + WANDERING_TRADER(96, ABSTRACT_AGEABLE), + + // Animals + ABSTRACT_ANIMAL(-1, ABSTRACT_AGEABLE), + AXOLOTL(3, ABSTRACT_ANIMAL), + DOLPHIN(14, ABSTRACT_INSENTIENT), + CHICKEN(10, ABSTRACT_ANIMAL), + COW(12, ABSTRACT_ANIMAL), + MOOSHROOM(54, COW), + PANDA(57, ABSTRACT_INSENTIENT), + PIG(60, ABSTRACT_ANIMAL), + POLAR_BEAR(64, ABSTRACT_ANIMAL), + RABBIT(67, ABSTRACT_ANIMAL), + SHEEP(70, ABSTRACT_ANIMAL), + TURTLE(92, ABSTRACT_ANIMAL), + FOX(29, ABSTRACT_ANIMAL), + + ABSTRACT_TAMEABLE_ANIMAL(-1, ABSTRACT_ANIMAL), + CAT(8, ABSTRACT_TAMEABLE_ANIMAL), + OCELOT(55, ABSTRACT_TAMEABLE_ANIMAL), + WOLF(101, ABSTRACT_TAMEABLE_ANIMAL), + + ABSTRACT_PARROT(-1, ABSTRACT_TAMEABLE_ANIMAL), + PARROT(58, ABSTRACT_PARROT), + + // Horses + ABSTRACT_HORSE(-1, ABSTRACT_ANIMAL), + CHESTED_HORSE(-1, ABSTRACT_HORSE), + DONKEY(15, CHESTED_HORSE), + MULE(53, CHESTED_HORSE), + LLAMA(43, CHESTED_HORSE), + TRADER_LLAMA(90, CHESTED_HORSE), + HORSE(34, ABSTRACT_HORSE), + SKELETON_HORSE(75, ABSTRACT_HORSE), + ZOMBIE_HORSE(104, ABSTRACT_HORSE), + + // Golem + ABSTRACT_GOLEM(-1, ABSTRACT_CREATURE), + SNOW_GOLEM(78, ABSTRACT_GOLEM), + IRON_GOLEM(37, ABSTRACT_GOLEM), + SHULKER(71, ABSTRACT_GOLEM), + + // Fish + ABSTRACT_FISHES(-1, ABSTRACT_CREATURE), + COD(11, ABSTRACT_FISHES), + PUFFERFISH(66, ABSTRACT_FISHES), + SALMON(69, ABSTRACT_FISHES), + TROPICAL_FISH(91, ABSTRACT_FISHES), + + // Monsters + ABSTRACT_MONSTER(-1, ABSTRACT_CREATURE), + BLAZE(6, ABSTRACT_MONSTER), + CREEPER(13, ABSTRACT_MONSTER), + ENDERMITE(22, ABSTRACT_MONSTER), + ENDERMAN(21, ABSTRACT_MONSTER), + GIANT(31, ABSTRACT_MONSTER), + SILVERFISH(73, ABSTRACT_MONSTER), + VEX(93, ABSTRACT_MONSTER), + WITCH(97, ABSTRACT_MONSTER), + WITHER(98, ABSTRACT_MONSTER), + RAVAGER(68, ABSTRACT_MONSTER), + + ABSTRACT_PIGLIN(-1, ABSTRACT_MONSTER), + + PIGLIN(61, ABSTRACT_PIGLIN), + PIGLIN_BRUTE(62, ABSTRACT_PIGLIN), + + HOGLIN(33, ABSTRACT_ANIMAL), + STRIDER(84, ABSTRACT_ANIMAL), + ZOGLIN(102, ABSTRACT_MONSTER), + + // Illagers + ABSTRACT_ILLAGER_BASE(-1, ABSTRACT_MONSTER), + ABSTRACT_EVO_ILLU_ILLAGER(-1, ABSTRACT_ILLAGER_BASE), + EVOKER(23, ABSTRACT_EVO_ILLU_ILLAGER), + ILLUSIONER(36, ABSTRACT_EVO_ILLU_ILLAGER), + VINDICATOR(95, ABSTRACT_ILLAGER_BASE), + PILLAGER(63, ABSTRACT_ILLAGER_BASE), + + // Skeletons + ABSTRACT_SKELETON(-1, ABSTRACT_MONSTER), + SKELETON(74, ABSTRACT_SKELETON), + STRAY(83, ABSTRACT_SKELETON), + WITHER_SKELETON(99, ABSTRACT_SKELETON), + + // Guardians + GUARDIAN(32, ABSTRACT_MONSTER), + ELDER_GUARDIAN(18, GUARDIAN), + + // Spiders + SPIDER(81, ABSTRACT_MONSTER), + CAVE_SPIDER(9, SPIDER), + + // Zombies + ZOMBIE(103, ABSTRACT_MONSTER), + DROWNED(17, ZOMBIE), + HUSK(35, ZOMBIE), + ZOMBIFIED_PIGLIN(106, ZOMBIE), + ZOMBIE_VILLAGER(105, ZOMBIE), + + // Flying entities + ABSTRACT_FLYING(-1, ABSTRACT_INSENTIENT), + GHAST(30, ABSTRACT_FLYING), + PHANTOM(59, ABSTRACT_FLYING), + + ABSTRACT_AMBIENT(-1, ABSTRACT_INSENTIENT), + BAT(4, ABSTRACT_AMBIENT), + + ABSTRACT_WATERMOB(-1, ABSTRACT_INSENTIENT), + SQUID(82, ABSTRACT_WATERMOB), + + // Slimes + SLIME(76, ABSTRACT_INSENTIENT), + MAGMA_CUBE(45, SLIME), + + // Hangable objects + ABSTRACT_HANGING(-1, ENTITY), + LEASH_KNOT(41, ABSTRACT_HANGING), + ITEM_FRAME(39, ABSTRACT_HANGING), + PAINTING(56, ABSTRACT_HANGING), + + ABSTRACT_LIGHTNING(-1, ENTITY), + LIGHTNING_BOLT(42, ABSTRACT_LIGHTNING), + + // Arrows + ABSTRACT_ARROW(-1, ENTITY), + ARROW(2, ABSTRACT_ARROW), + SPECTRAL_ARROW(80, ABSTRACT_ARROW), + TRIDENT(89, ABSTRACT_ARROW), + + // Fireballs + ABSTRACT_FIREBALL(-1, ENTITY), + DRAGON_FIREBALL(16, ABSTRACT_FIREBALL), + FIREBALL(40, ABSTRACT_FIREBALL), + SMALL_FIREBALL(77, ABSTRACT_FIREBALL), + WITHER_SKULL(100, ABSTRACT_FIREBALL), + + // Projectiles + PROJECTILE_ABSTRACT(-1, ENTITY), + SNOWBALL(79, PROJECTILE_ABSTRACT), + ENDER_PEARL(86, PROJECTILE_ABSTRACT), + EGG(85, PROJECTILE_ABSTRACT), + POTION(88, PROJECTILE_ABSTRACT), + EXPERIENCE_BOTTLE(87, PROJECTILE_ABSTRACT), + + // Vehicles + MINECART_ABSTRACT(-1, ENTITY), + CHESTED_MINECART_ABSTRACT(-1, MINECART_ABSTRACT), + CHEST_MINECART(47, CHESTED_MINECART_ABSTRACT), + HOPPER_MINECART(50, CHESTED_MINECART_ABSTRACT), + MINECART(46, MINECART_ABSTRACT), + FURNACE_MINECART(49, MINECART_ABSTRACT), + COMMAND_BLOCK_MINECART(48, MINECART_ABSTRACT), + TNT_MINECART(52, MINECART_ABSTRACT), + SPAWNER_MINECART(51, MINECART_ABSTRACT), + BOAT(7, ENTITY); + + + private static final Map TYPES = new HashMap<>(); + + private final int id; + private final EntityType parent; + + EntityType(int id) { + this.id = id; + this.parent = null; + } + + EntityType(int id, EntityType parent) { + this.id = id; + this.parent = parent; + } + + @Override + public int getId() { + return id; + } + + @Override + public EntityType getParent() { + return parent; + } + + static { + for (EntityType type : EntityType.values()) { + TYPES.put(type.id, type); + } + } + + public static Optional findById(int id) { + if (id == -1) + return Optional.empty(); + return Optional.ofNullable(TYPES.get(id)); + } + } +} diff --git a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java index 3512fab98..7bf1874b2 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java +++ b/common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java @@ -54,7 +54,7 @@ public class ProtocolVersion { public static final ProtocolVersion v1_16_2 = register(751, "1.16.2"); public static final ProtocolVersion v1_16_3 = register(753, "1.16.3"); public static final ProtocolVersion v1_16_4 = register(754, "1.16.4"); - public static final ProtocolVersion v1_17 = register(755, 8, "1.17"); + public static final ProtocolVersion v1_17 = register(755, 9, "1.17"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/common/src/main/java/us/myles/ViaVersion/api/rewriters/RegistryType.java b/common/src/main/java/us/myles/ViaVersion/api/rewriters/RegistryType.java index 973063bac..4dff28697 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/rewriters/RegistryType.java +++ b/common/src/main/java/us/myles/ViaVersion/api/rewriters/RegistryType.java @@ -2,15 +2,25 @@ package us.myles.ViaVersion.api.rewriters; public enum RegistryType { - BLOCK, - ITEM, - FLUID, - ENTITY, - GAME_EVENT; - - private static final RegistryType[] VALUES = values(); + BLOCK("block"), + ITEM("item"), + FLUID("fluid"), + ENTITY("entity_type"), + GAME_EVENT("game_event"); public static RegistryType[] getValues() { return VALUES; } + + private static final RegistryType[] VALUES = values(); + + private final String resourceLocation; + + RegistryType(final String resourceLocation) { + this.resourceLocation = resourceLocation; + } + + public String getResourceLocation() { + return resourceLocation; + } } diff --git a/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java b/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java index 9cd37de51..03173d3cd 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/api/rewriters/TagRewriter.java @@ -77,7 +77,7 @@ public class TagRewriter { }; } - private void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, List newTags) throws Exception { + public void handle(PacketWrapper wrapper, @Nullable IdRewriteFunction rewriteFunction, List newTags) throws Exception { int tagsSize = wrapper.read(Type.VAR_INT); wrapper.write(Type.VAR_INT, newTags != null ? tagsSize + newTags.size() : tagsSize); // add new tags count @@ -111,16 +111,16 @@ public class TagRewriter { } @Nullable - private List getNewTags(RegistryType tagType) { + public List getNewTags(RegistryType tagType) { return newTags.get(tagType); } - private List getOrComputeNewTags(RegistryType tagType) { + public List getOrComputeNewTags(RegistryType tagType) { return newTags.computeIfAbsent(tagType, type -> new ArrayList<>()); } @Nullable - private IdRewriteFunction getRewriter(RegistryType tagType) { + public IdRewriteFunction getRewriter(RegistryType tagType) { MappingData mappingData = protocol.getMappingData(); switch (tagType) { case BLOCK: diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java index f1a755a2c..b8cb1bf8b 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java @@ -41,9 +41,24 @@ public class Protocol1_17To1_16_4 extends Protocol { + // Tags are now generically written with resource location - 5 different Vanilla types + wrapper.write(Type.VAR_INT, 5); + for (RegistryType type : RegistryType.getValues()) { + // Prefix with resource location + wrapper.write(Type.STRING, type.getResourceLocation()); + + // Id conversion + tagRewriter.handle(wrapper, tagRewriter.getRewriter(type), tagRewriter.getNewTags(type)); + + // Stop iterating after entity types + if (type == RegistryType.ENTITY) { + break; + } + } + // New Game Event tags type + wrapper.write(Type.STRING, RegistryType.GAME_EVENT.getResourceLocation()); wrapper.write(Type.VAR_INT, NEW_GAME_EVENT_TAGS.length); for (String tag : NEW_GAME_EVENT_TAGS) { wrapper.write(Type.STRING, tag); @@ -94,10 +109,11 @@ public class Protocol1_17To1_16_4 extends Protocol= 7) { metadata.setId(metadata.getId() + 1); // Ticks frozen added with id 7 } @@ -53,6 +55,6 @@ public class MetadataRewriter1_17To1_16_4 extends MetadataRewriter { @Override protected EntityType getTypeFromId(int type) { - return Entity1_16_2Types.getTypeFromId(type); + return Entity1_17Types.getTypeFromId(type); } } diff --git a/common/src/main/resources/assets/viaversion/data/mapping-1.17.json b/common/src/main/resources/assets/viaversion/data/mapping-1.17.json index cb2845df9..e68bd6f7f 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-1.17.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-1.17.json @@ -19842,367 +19842,369 @@ "676": "minecraft:salmon_bucket", "677": "minecraft:cod_bucket", "678": "minecraft:tropical_fish_bucket", - "679": "minecraft:brick", - "680": "minecraft:clay_ball", - "681": "minecraft:dried_kelp_block", - "682": "minecraft:paper", - "683": "minecraft:book", - "684": "minecraft:slime_ball", - "685": "minecraft:chest_minecart", - "686": "minecraft:furnace_minecart", - "687": "minecraft:egg", - "688": "minecraft:compass", - "689": "minecraft:bundle", - "690": "minecraft:fishing_rod", - "691": "minecraft:clock", - "692": "minecraft:glowstone_dust", - "693": "minecraft:cod", - "694": "minecraft:salmon", - "695": "minecraft:tropical_fish", - "696": "minecraft:pufferfish", - "697": "minecraft:cooked_cod", - "698": "minecraft:cooked_salmon", - "699": "minecraft:ink_sac", - "700": "minecraft:cocoa_beans", - "701": "minecraft:lapis_lazuli", - "702": "minecraft:white_dye", - "703": "minecraft:orange_dye", - "704": "minecraft:magenta_dye", - "705": "minecraft:light_blue_dye", - "706": "minecraft:yellow_dye", - "707": "minecraft:lime_dye", - "708": "minecraft:pink_dye", - "709": "minecraft:gray_dye", - "710": "minecraft:light_gray_dye", - "711": "minecraft:cyan_dye", - "712": "minecraft:purple_dye", - "713": "minecraft:blue_dye", - "714": "minecraft:brown_dye", - "715": "minecraft:green_dye", - "716": "minecraft:red_dye", - "717": "minecraft:black_dye", - "718": "minecraft:bone_meal", - "719": "minecraft:bone", - "720": "minecraft:sugar", - "721": "minecraft:cake", - "722": "minecraft:white_bed", - "723": "minecraft:orange_bed", - "724": "minecraft:magenta_bed", - "725": "minecraft:light_blue_bed", - "726": "minecraft:yellow_bed", - "727": "minecraft:lime_bed", - "728": "minecraft:pink_bed", - "729": "minecraft:gray_bed", - "730": "minecraft:light_gray_bed", - "731": "minecraft:cyan_bed", - "732": "minecraft:purple_bed", - "733": "minecraft:blue_bed", - "734": "minecraft:brown_bed", - "735": "minecraft:green_bed", - "736": "minecraft:red_bed", - "737": "minecraft:black_bed", - "738": "minecraft:cookie", - "739": "minecraft:filled_map", - "740": "minecraft:shears", - "741": "minecraft:melon_slice", - "742": "minecraft:dried_kelp", - "743": "minecraft:pumpkin_seeds", - "744": "minecraft:melon_seeds", - "745": "minecraft:beef", - "746": "minecraft:cooked_beef", - "747": "minecraft:chicken", - "748": "minecraft:cooked_chicken", - "749": "minecraft:rotten_flesh", - "750": "minecraft:ender_pearl", - "751": "minecraft:blaze_rod", - "752": "minecraft:ghast_tear", - "753": "minecraft:gold_nugget", - "754": "minecraft:nether_wart", - "755": "minecraft:potion", - "756": "minecraft:glass_bottle", - "757": "minecraft:spider_eye", - "758": "minecraft:fermented_spider_eye", - "759": "minecraft:blaze_powder", - "760": "minecraft:magma_cream", - "761": "minecraft:brewing_stand", - "762": "minecraft:cauldron", - "763": "minecraft:ender_eye", - "764": "minecraft:glistering_melon_slice", - "765": "minecraft:bat_spawn_egg", - "766": "minecraft:bee_spawn_egg", - "767": "minecraft:blaze_spawn_egg", - "768": "minecraft:cat_spawn_egg", - "769": "minecraft:cave_spider_spawn_egg", - "770": "minecraft:chicken_spawn_egg", - "771": "minecraft:cod_spawn_egg", - "772": "minecraft:cow_spawn_egg", - "773": "minecraft:creeper_spawn_egg", - "774": "minecraft:dolphin_spawn_egg", - "775": "minecraft:donkey_spawn_egg", - "776": "minecraft:drowned_spawn_egg", - "777": "minecraft:elder_guardian_spawn_egg", - "778": "minecraft:enderman_spawn_egg", - "779": "minecraft:endermite_spawn_egg", - "780": "minecraft:evoker_spawn_egg", - "781": "minecraft:fox_spawn_egg", - "782": "minecraft:ghast_spawn_egg", - "783": "minecraft:guardian_spawn_egg", - "784": "minecraft:hoglin_spawn_egg", - "785": "minecraft:horse_spawn_egg", - "786": "minecraft:husk_spawn_egg", - "787": "minecraft:llama_spawn_egg", - "788": "minecraft:magma_cube_spawn_egg", - "789": "minecraft:mooshroom_spawn_egg", - "790": "minecraft:mule_spawn_egg", - "791": "minecraft:ocelot_spawn_egg", - "792": "minecraft:panda_spawn_egg", - "793": "minecraft:parrot_spawn_egg", - "794": "minecraft:phantom_spawn_egg", - "795": "minecraft:pig_spawn_egg", - "796": "minecraft:piglin_spawn_egg", - "797": "minecraft:piglin_brute_spawn_egg", - "798": "minecraft:pillager_spawn_egg", - "799": "minecraft:polar_bear_spawn_egg", - "800": "minecraft:pufferfish_spawn_egg", - "801": "minecraft:rabbit_spawn_egg", - "802": "minecraft:ravager_spawn_egg", - "803": "minecraft:salmon_spawn_egg", - "804": "minecraft:sheep_spawn_egg", - "805": "minecraft:shulker_spawn_egg", - "806": "minecraft:silverfish_spawn_egg", - "807": "minecraft:skeleton_spawn_egg", - "808": "minecraft:skeleton_horse_spawn_egg", - "809": "minecraft:slime_spawn_egg", - "810": "minecraft:spider_spawn_egg", - "811": "minecraft:squid_spawn_egg", - "812": "minecraft:stray_spawn_egg", - "813": "minecraft:strider_spawn_egg", - "814": "minecraft:trader_llama_spawn_egg", - "815": "minecraft:tropical_fish_spawn_egg", - "816": "minecraft:turtle_spawn_egg", - "817": "minecraft:vex_spawn_egg", - "818": "minecraft:villager_spawn_egg", - "819": "minecraft:vindicator_spawn_egg", - "820": "minecraft:wandering_trader_spawn_egg", - "821": "minecraft:witch_spawn_egg", - "822": "minecraft:wither_skeleton_spawn_egg", - "823": "minecraft:wolf_spawn_egg", - "824": "minecraft:zoglin_spawn_egg", - "825": "minecraft:zombie_spawn_egg", - "826": "minecraft:zombie_horse_spawn_egg", - "827": "minecraft:zombie_villager_spawn_egg", - "828": "minecraft:zombified_piglin_spawn_egg", - "829": "minecraft:experience_bottle", - "830": "minecraft:fire_charge", - "831": "minecraft:writable_book", - "832": "minecraft:written_book", - "833": "minecraft:emerald", - "834": "minecraft:item_frame", - "835": "minecraft:flower_pot", - "836": "minecraft:carrot", - "837": "minecraft:potato", - "838": "minecraft:baked_potato", - "839": "minecraft:poisonous_potato", - "840": "minecraft:map", - "841": "minecraft:golden_carrot", - "842": "minecraft:skeleton_skull", - "843": "minecraft:wither_skeleton_skull", - "844": "minecraft:player_head", - "845": "minecraft:zombie_head", - "846": "minecraft:creeper_head", - "847": "minecraft:dragon_head", - "848": "minecraft:carrot_on_a_stick", - "849": "minecraft:warped_fungus_on_a_stick", - "850": "minecraft:nether_star", - "851": "minecraft:pumpkin_pie", - "852": "minecraft:firework_rocket", - "853": "minecraft:firework_star", - "854": "minecraft:enchanted_book", - "855": "minecraft:nether_brick", - "856": "minecraft:quartz", - "857": "minecraft:tnt_minecart", - "858": "minecraft:hopper_minecart", - "859": "minecraft:prismarine_shard", - "860": "minecraft:prismarine_crystals", - "861": "minecraft:rabbit", - "862": "minecraft:cooked_rabbit", - "863": "minecraft:rabbit_stew", - "864": "minecraft:rabbit_foot", - "865": "minecraft:rabbit_hide", - "866": "minecraft:armor_stand", - "867": "minecraft:iron_horse_armor", - "868": "minecraft:golden_horse_armor", - "869": "minecraft:diamond_horse_armor", - "870": "minecraft:leather_horse_armor", - "871": "minecraft:lead", - "872": "minecraft:name_tag", - "873": "minecraft:command_block_minecart", - "874": "minecraft:mutton", - "875": "minecraft:cooked_mutton", - "876": "minecraft:white_banner", - "877": "minecraft:orange_banner", - "878": "minecraft:magenta_banner", - "879": "minecraft:light_blue_banner", - "880": "minecraft:yellow_banner", - "881": "minecraft:lime_banner", - "882": "minecraft:pink_banner", - "883": "minecraft:gray_banner", - "884": "minecraft:light_gray_banner", - "885": "minecraft:cyan_banner", - "886": "minecraft:purple_banner", - "887": "minecraft:blue_banner", - "888": "minecraft:brown_banner", - "889": "minecraft:green_banner", - "890": "minecraft:red_banner", - "891": "minecraft:black_banner", - "892": "minecraft:end_crystal", - "893": "minecraft:chorus_fruit", - "894": "minecraft:popped_chorus_fruit", - "895": "minecraft:beetroot", - "896": "minecraft:beetroot_seeds", - "897": "minecraft:beetroot_soup", - "898": "minecraft:dragon_breath", - "899": "minecraft:splash_potion", - "900": "minecraft:spectral_arrow", - "901": "minecraft:tipped_arrow", - "902": "minecraft:lingering_potion", - "903": "minecraft:shield", - "904": "minecraft:elytra", - "905": "minecraft:spruce_boat", - "906": "minecraft:birch_boat", - "907": "minecraft:jungle_boat", - "908": "minecraft:acacia_boat", - "909": "minecraft:dark_oak_boat", - "910": "minecraft:totem_of_undying", - "911": "minecraft:shulker_shell", - "912": "minecraft:iron_nugget", - "913": "minecraft:knowledge_book", - "914": "minecraft:debug_stick", - "915": "minecraft:music_disc_13", - "916": "minecraft:music_disc_cat", - "917": "minecraft:music_disc_blocks", - "918": "minecraft:music_disc_chirp", - "919": "minecraft:music_disc_far", - "920": "minecraft:music_disc_mall", - "921": "minecraft:music_disc_mellohi", - "922": "minecraft:music_disc_stal", - "923": "minecraft:music_disc_strad", - "924": "minecraft:music_disc_ward", - "925": "minecraft:music_disc_11", - "926": "minecraft:music_disc_wait", - "927": "minecraft:music_disc_pigstep", - "928": "minecraft:trident", - "929": "minecraft:phantom_membrane", - "930": "minecraft:nautilus_shell", - "931": "minecraft:heart_of_the_sea", - "932": "minecraft:crossbow", - "933": "minecraft:suspicious_stew", - "934": "minecraft:loom", - "935": "minecraft:flower_banner_pattern", - "936": "minecraft:creeper_banner_pattern", - "937": "minecraft:skull_banner_pattern", - "938": "minecraft:mojang_banner_pattern", - "939": "minecraft:globe_banner_pattern", - "940": "minecraft:piglin_banner_pattern", - "941": "minecraft:composter", - "942": "minecraft:barrel", - "943": "minecraft:smoker", - "944": "minecraft:blast_furnace", - "945": "minecraft:cartography_table", - "946": "minecraft:fletching_table", - "947": "minecraft:grindstone", - "948": "minecraft:lectern", - "949": "minecraft:smithing_table", - "950": "minecraft:stonecutter", - "951": "minecraft:bell", - "952": "minecraft:lantern", - "953": "minecraft:soul_lantern", - "954": "minecraft:sweet_berries", - "955": "minecraft:campfire", - "956": "minecraft:soul_campfire", - "957": "minecraft:shroomlight", - "958": "minecraft:honeycomb", - "959": "minecraft:bee_nest", - "960": "minecraft:beehive", - "961": "minecraft:honey_bottle", - "962": "minecraft:honey_block", - "963": "minecraft:honeycomb_block", - "964": "minecraft:lodestone", - "965": "minecraft:netherite_block", - "966": "minecraft:ancient_debris", - "967": "minecraft:target", - "968": "minecraft:crying_obsidian", - "969": "minecraft:blackstone", - "970": "minecraft:blackstone_slab", - "971": "minecraft:blackstone_stairs", - "972": "minecraft:gilded_blackstone", - "973": "minecraft:polished_blackstone", - "974": "minecraft:polished_blackstone_slab", - "975": "minecraft:polished_blackstone_stairs", - "976": "minecraft:chiseled_polished_blackstone", - "977": "minecraft:polished_blackstone_bricks", - "978": "minecraft:polished_blackstone_brick_slab", - "979": "minecraft:polished_blackstone_brick_stairs", - "980": "minecraft:cracked_polished_blackstone_bricks", - "981": "minecraft:respawn_anchor", - "982": "minecraft:candle", - "983": "minecraft:white_candle", - "984": "minecraft:orange_candle", - "985": "minecraft:magenta_candle", - "986": "minecraft:light_blue_candle", - "987": "minecraft:yellow_candle", - "988": "minecraft:lime_candle", - "989": "minecraft:pink_candle", - "990": "minecraft:gray_candle", - "991": "minecraft:light_gray_candle", - "992": "minecraft:cyan_candle", - "993": "minecraft:purple_candle", - "994": "minecraft:blue_candle", - "995": "minecraft:brown_candle", - "996": "minecraft:green_candle", - "997": "minecraft:red_candle", - "998": "minecraft:black_candle", - "999": "minecraft:amethyst_shard", - "1000": "minecraft:amethyst_block", - "1001": "minecraft:budding_amethyst", - "1002": "minecraft:small_amethyst_bud", - "1003": "minecraft:medium_amethyst_bud", - "1004": "minecraft:large_amethyst_bud", - "1005": "minecraft:amethyst_cluster", - "1006": "minecraft:spyglass", - "1007": "minecraft:copper_block", - "1008": "minecraft:lightly_weathered_copper_block", - "1009": "minecraft:semi_weathered_copper_block", - "1010": "minecraft:weathered_copper_block", - "1011": "minecraft:cut_copper", - "1012": "minecraft:lightly_weathered_cut_copper", - "1013": "minecraft:semi_weathered_cut_copper", - "1014": "minecraft:weathered_cut_copper", - "1015": "minecraft:cut_copper_stairs", - "1016": "minecraft:lightly_weathered_cut_copper_stairs", - "1017": "minecraft:semi_weathered_cut_copper_stairs", - "1018": "minecraft:weathered_cut_copper_stairs", - "1019": "minecraft:cut_copper_slab", - "1020": "minecraft:lightly_weathered_cut_copper_slab", - "1021": "minecraft:semi_weathered_cut_copper_slab", - "1022": "minecraft:weathered_cut_copper_slab", - "1023": "minecraft:waxed_copper", - "1024": "minecraft:waxed_lightly_weathered_copper", - "1025": "minecraft:waxed_semi_weathered_copper", - "1026": "minecraft:waxed_cut_copper", - "1027": "minecraft:waxed_lightly_weathered_cut_copper", - "1028": "minecraft:waxed_semi_weathered_cut_copper", - "1029": "minecraft:waxed_cut_copper_stairs", - "1030": "minecraft:waxed_lightly_weathered_cut_copper_stairs", - "1031": "minecraft:waxed_semi_weathered_cut_copper_stairs", - "1032": "minecraft:waxed_cut_copper_slab", - "1033": "minecraft:waxed_lightly_weathered_cut_copper_slab", - "1034": "minecraft:waxed_semi_weathered_cut_copper_slab", - "1035": "minecraft:lightning_rod", - "1036": "minecraft:powder_snow_bucket", - "1037": "minecraft:pointed_dripstone", - "1038": "minecraft:dripstone_block", - "1039": "minecraft:sculk_sensor" + "679": "minecraft:axolotl_bucket", + "680": "minecraft:brick", + "681": "minecraft:clay_ball", + "682": "minecraft:dried_kelp_block", + "683": "minecraft:paper", + "684": "minecraft:book", + "685": "minecraft:slime_ball", + "686": "minecraft:chest_minecart", + "687": "minecraft:furnace_minecart", + "688": "minecraft:egg", + "689": "minecraft:compass", + "690": "minecraft:bundle", + "691": "minecraft:fishing_rod", + "692": "minecraft:clock", + "693": "minecraft:glowstone_dust", + "694": "minecraft:cod", + "695": "minecraft:salmon", + "696": "minecraft:tropical_fish", + "697": "minecraft:pufferfish", + "698": "minecraft:cooked_cod", + "699": "minecraft:cooked_salmon", + "700": "minecraft:ink_sac", + "701": "minecraft:cocoa_beans", + "702": "minecraft:lapis_lazuli", + "703": "minecraft:white_dye", + "704": "minecraft:orange_dye", + "705": "minecraft:magenta_dye", + "706": "minecraft:light_blue_dye", + "707": "minecraft:yellow_dye", + "708": "minecraft:lime_dye", + "709": "minecraft:pink_dye", + "710": "minecraft:gray_dye", + "711": "minecraft:light_gray_dye", + "712": "minecraft:cyan_dye", + "713": "minecraft:purple_dye", + "714": "minecraft:blue_dye", + "715": "minecraft:brown_dye", + "716": "minecraft:green_dye", + "717": "minecraft:red_dye", + "718": "minecraft:black_dye", + "719": "minecraft:bone_meal", + "720": "minecraft:bone", + "721": "minecraft:sugar", + "722": "minecraft:cake", + "723": "minecraft:white_bed", + "724": "minecraft:orange_bed", + "725": "minecraft:magenta_bed", + "726": "minecraft:light_blue_bed", + "727": "minecraft:yellow_bed", + "728": "minecraft:lime_bed", + "729": "minecraft:pink_bed", + "730": "minecraft:gray_bed", + "731": "minecraft:light_gray_bed", + "732": "minecraft:cyan_bed", + "733": "minecraft:purple_bed", + "734": "minecraft:blue_bed", + "735": "minecraft:brown_bed", + "736": "minecraft:green_bed", + "737": "minecraft:red_bed", + "738": "minecraft:black_bed", + "739": "minecraft:cookie", + "740": "minecraft:filled_map", + "741": "minecraft:shears", + "742": "minecraft:melon_slice", + "743": "minecraft:dried_kelp", + "744": "minecraft:pumpkin_seeds", + "745": "minecraft:melon_seeds", + "746": "minecraft:beef", + "747": "minecraft:cooked_beef", + "748": "minecraft:chicken", + "749": "minecraft:cooked_chicken", + "750": "minecraft:rotten_flesh", + "751": "minecraft:ender_pearl", + "752": "minecraft:blaze_rod", + "753": "minecraft:ghast_tear", + "754": "minecraft:gold_nugget", + "755": "minecraft:nether_wart", + "756": "minecraft:potion", + "757": "minecraft:glass_bottle", + "758": "minecraft:spider_eye", + "759": "minecraft:fermented_spider_eye", + "760": "minecraft:blaze_powder", + "761": "minecraft:magma_cream", + "762": "minecraft:brewing_stand", + "763": "minecraft:cauldron", + "764": "minecraft:ender_eye", + "765": "minecraft:glistering_melon_slice", + "766": "minecraft:axolotl_spawn_egg", + "767": "minecraft:bat_spawn_egg", + "768": "minecraft:bee_spawn_egg", + "769": "minecraft:blaze_spawn_egg", + "770": "minecraft:cat_spawn_egg", + "771": "minecraft:cave_spider_spawn_egg", + "772": "minecraft:chicken_spawn_egg", + "773": "minecraft:cod_spawn_egg", + "774": "minecraft:cow_spawn_egg", + "775": "minecraft:creeper_spawn_egg", + "776": "minecraft:dolphin_spawn_egg", + "777": "minecraft:donkey_spawn_egg", + "778": "minecraft:drowned_spawn_egg", + "779": "minecraft:elder_guardian_spawn_egg", + "780": "minecraft:enderman_spawn_egg", + "781": "minecraft:endermite_spawn_egg", + "782": "minecraft:evoker_spawn_egg", + "783": "minecraft:fox_spawn_egg", + "784": "minecraft:ghast_spawn_egg", + "785": "minecraft:guardian_spawn_egg", + "786": "minecraft:hoglin_spawn_egg", + "787": "minecraft:horse_spawn_egg", + "788": "minecraft:husk_spawn_egg", + "789": "minecraft:llama_spawn_egg", + "790": "minecraft:magma_cube_spawn_egg", + "791": "minecraft:mooshroom_spawn_egg", + "792": "minecraft:mule_spawn_egg", + "793": "minecraft:ocelot_spawn_egg", + "794": "minecraft:panda_spawn_egg", + "795": "minecraft:parrot_spawn_egg", + "796": "minecraft:phantom_spawn_egg", + "797": "minecraft:pig_spawn_egg", + "798": "minecraft:piglin_spawn_egg", + "799": "minecraft:piglin_brute_spawn_egg", + "800": "minecraft:pillager_spawn_egg", + "801": "minecraft:polar_bear_spawn_egg", + "802": "minecraft:pufferfish_spawn_egg", + "803": "minecraft:rabbit_spawn_egg", + "804": "minecraft:ravager_spawn_egg", + "805": "minecraft:salmon_spawn_egg", + "806": "minecraft:sheep_spawn_egg", + "807": "minecraft:shulker_spawn_egg", + "808": "minecraft:silverfish_spawn_egg", + "809": "minecraft:skeleton_spawn_egg", + "810": "minecraft:skeleton_horse_spawn_egg", + "811": "minecraft:slime_spawn_egg", + "812": "minecraft:spider_spawn_egg", + "813": "minecraft:squid_spawn_egg", + "814": "minecraft:stray_spawn_egg", + "815": "minecraft:strider_spawn_egg", + "816": "minecraft:trader_llama_spawn_egg", + "817": "minecraft:tropical_fish_spawn_egg", + "818": "minecraft:turtle_spawn_egg", + "819": "minecraft:vex_spawn_egg", + "820": "minecraft:villager_spawn_egg", + "821": "minecraft:vindicator_spawn_egg", + "822": "minecraft:wandering_trader_spawn_egg", + "823": "minecraft:witch_spawn_egg", + "824": "minecraft:wither_skeleton_spawn_egg", + "825": "minecraft:wolf_spawn_egg", + "826": "minecraft:zoglin_spawn_egg", + "827": "minecraft:zombie_spawn_egg", + "828": "minecraft:zombie_horse_spawn_egg", + "829": "minecraft:zombie_villager_spawn_egg", + "830": "minecraft:zombified_piglin_spawn_egg", + "831": "minecraft:experience_bottle", + "832": "minecraft:fire_charge", + "833": "minecraft:writable_book", + "834": "minecraft:written_book", + "835": "minecraft:emerald", + "836": "minecraft:item_frame", + "837": "minecraft:flower_pot", + "838": "minecraft:carrot", + "839": "minecraft:potato", + "840": "minecraft:baked_potato", + "841": "minecraft:poisonous_potato", + "842": "minecraft:map", + "843": "minecraft:golden_carrot", + "844": "minecraft:skeleton_skull", + "845": "minecraft:wither_skeleton_skull", + "846": "minecraft:player_head", + "847": "minecraft:zombie_head", + "848": "minecraft:creeper_head", + "849": "minecraft:dragon_head", + "850": "minecraft:carrot_on_a_stick", + "851": "minecraft:warped_fungus_on_a_stick", + "852": "minecraft:nether_star", + "853": "minecraft:pumpkin_pie", + "854": "minecraft:firework_rocket", + "855": "minecraft:firework_star", + "856": "minecraft:enchanted_book", + "857": "minecraft:nether_brick", + "858": "minecraft:quartz", + "859": "minecraft:tnt_minecart", + "860": "minecraft:hopper_minecart", + "861": "minecraft:prismarine_shard", + "862": "minecraft:prismarine_crystals", + "863": "minecraft:rabbit", + "864": "minecraft:cooked_rabbit", + "865": "minecraft:rabbit_stew", + "866": "minecraft:rabbit_foot", + "867": "minecraft:rabbit_hide", + "868": "minecraft:armor_stand", + "869": "minecraft:iron_horse_armor", + "870": "minecraft:golden_horse_armor", + "871": "minecraft:diamond_horse_armor", + "872": "minecraft:leather_horse_armor", + "873": "minecraft:lead", + "874": "minecraft:name_tag", + "875": "minecraft:command_block_minecart", + "876": "minecraft:mutton", + "877": "minecraft:cooked_mutton", + "878": "minecraft:white_banner", + "879": "minecraft:orange_banner", + "880": "minecraft:magenta_banner", + "881": "minecraft:light_blue_banner", + "882": "minecraft:yellow_banner", + "883": "minecraft:lime_banner", + "884": "minecraft:pink_banner", + "885": "minecraft:gray_banner", + "886": "minecraft:light_gray_banner", + "887": "minecraft:cyan_banner", + "888": "minecraft:purple_banner", + "889": "minecraft:blue_banner", + "890": "minecraft:brown_banner", + "891": "minecraft:green_banner", + "892": "minecraft:red_banner", + "893": "minecraft:black_banner", + "894": "minecraft:end_crystal", + "895": "minecraft:chorus_fruit", + "896": "minecraft:popped_chorus_fruit", + "897": "minecraft:beetroot", + "898": "minecraft:beetroot_seeds", + "899": "minecraft:beetroot_soup", + "900": "minecraft:dragon_breath", + "901": "minecraft:splash_potion", + "902": "minecraft:spectral_arrow", + "903": "minecraft:tipped_arrow", + "904": "minecraft:lingering_potion", + "905": "minecraft:shield", + "906": "minecraft:elytra", + "907": "minecraft:spruce_boat", + "908": "minecraft:birch_boat", + "909": "minecraft:jungle_boat", + "910": "minecraft:acacia_boat", + "911": "minecraft:dark_oak_boat", + "912": "minecraft:totem_of_undying", + "913": "minecraft:shulker_shell", + "914": "minecraft:iron_nugget", + "915": "minecraft:knowledge_book", + "916": "minecraft:debug_stick", + "917": "minecraft:music_disc_13", + "918": "minecraft:music_disc_cat", + "919": "minecraft:music_disc_blocks", + "920": "minecraft:music_disc_chirp", + "921": "minecraft:music_disc_far", + "922": "minecraft:music_disc_mall", + "923": "minecraft:music_disc_mellohi", + "924": "minecraft:music_disc_stal", + "925": "minecraft:music_disc_strad", + "926": "minecraft:music_disc_ward", + "927": "minecraft:music_disc_11", + "928": "minecraft:music_disc_wait", + "929": "minecraft:music_disc_pigstep", + "930": "minecraft:trident", + "931": "minecraft:phantom_membrane", + "932": "minecraft:nautilus_shell", + "933": "minecraft:heart_of_the_sea", + "934": "minecraft:crossbow", + "935": "minecraft:suspicious_stew", + "936": "minecraft:loom", + "937": "minecraft:flower_banner_pattern", + "938": "minecraft:creeper_banner_pattern", + "939": "minecraft:skull_banner_pattern", + "940": "minecraft:mojang_banner_pattern", + "941": "minecraft:globe_banner_pattern", + "942": "minecraft:piglin_banner_pattern", + "943": "minecraft:composter", + "944": "minecraft:barrel", + "945": "minecraft:smoker", + "946": "minecraft:blast_furnace", + "947": "minecraft:cartography_table", + "948": "minecraft:fletching_table", + "949": "minecraft:grindstone", + "950": "minecraft:lectern", + "951": "minecraft:smithing_table", + "952": "minecraft:stonecutter", + "953": "minecraft:bell", + "954": "minecraft:lantern", + "955": "minecraft:soul_lantern", + "956": "minecraft:sweet_berries", + "957": "minecraft:campfire", + "958": "minecraft:soul_campfire", + "959": "minecraft:shroomlight", + "960": "minecraft:honeycomb", + "961": "minecraft:bee_nest", + "962": "minecraft:beehive", + "963": "minecraft:honey_bottle", + "964": "minecraft:honey_block", + "965": "minecraft:honeycomb_block", + "966": "minecraft:lodestone", + "967": "minecraft:netherite_block", + "968": "minecraft:ancient_debris", + "969": "minecraft:target", + "970": "minecraft:crying_obsidian", + "971": "minecraft:blackstone", + "972": "minecraft:blackstone_slab", + "973": "minecraft:blackstone_stairs", + "974": "minecraft:gilded_blackstone", + "975": "minecraft:polished_blackstone", + "976": "minecraft:polished_blackstone_slab", + "977": "minecraft:polished_blackstone_stairs", + "978": "minecraft:chiseled_polished_blackstone", + "979": "minecraft:polished_blackstone_bricks", + "980": "minecraft:polished_blackstone_brick_slab", + "981": "minecraft:polished_blackstone_brick_stairs", + "982": "minecraft:cracked_polished_blackstone_bricks", + "983": "minecraft:respawn_anchor", + "984": "minecraft:candle", + "985": "minecraft:white_candle", + "986": "minecraft:orange_candle", + "987": "minecraft:magenta_candle", + "988": "minecraft:light_blue_candle", + "989": "minecraft:yellow_candle", + "990": "minecraft:lime_candle", + "991": "minecraft:pink_candle", + "992": "minecraft:gray_candle", + "993": "minecraft:light_gray_candle", + "994": "minecraft:cyan_candle", + "995": "minecraft:purple_candle", + "996": "minecraft:blue_candle", + "997": "minecraft:brown_candle", + "998": "minecraft:green_candle", + "999": "minecraft:red_candle", + "1000": "minecraft:black_candle", + "1001": "minecraft:amethyst_shard", + "1002": "minecraft:amethyst_block", + "1003": "minecraft:budding_amethyst", + "1004": "minecraft:small_amethyst_bud", + "1005": "minecraft:medium_amethyst_bud", + "1006": "minecraft:large_amethyst_bud", + "1007": "minecraft:amethyst_cluster", + "1008": "minecraft:spyglass", + "1009": "minecraft:copper_block", + "1010": "minecraft:lightly_weathered_copper_block", + "1011": "minecraft:semi_weathered_copper_block", + "1012": "minecraft:weathered_copper_block", + "1013": "minecraft:cut_copper", + "1014": "minecraft:lightly_weathered_cut_copper", + "1015": "minecraft:semi_weathered_cut_copper", + "1016": "minecraft:weathered_cut_copper", + "1017": "minecraft:cut_copper_stairs", + "1018": "minecraft:lightly_weathered_cut_copper_stairs", + "1019": "minecraft:semi_weathered_cut_copper_stairs", + "1020": "minecraft:weathered_cut_copper_stairs", + "1021": "minecraft:cut_copper_slab", + "1022": "minecraft:lightly_weathered_cut_copper_slab", + "1023": "minecraft:semi_weathered_cut_copper_slab", + "1024": "minecraft:weathered_cut_copper_slab", + "1025": "minecraft:waxed_copper", + "1026": "minecraft:waxed_lightly_weathered_copper", + "1027": "minecraft:waxed_semi_weathered_copper", + "1028": "minecraft:waxed_cut_copper", + "1029": "minecraft:waxed_lightly_weathered_cut_copper", + "1030": "minecraft:waxed_semi_weathered_cut_copper", + "1031": "minecraft:waxed_cut_copper_stairs", + "1032": "minecraft:waxed_lightly_weathered_cut_copper_stairs", + "1033": "minecraft:waxed_semi_weathered_cut_copper_stairs", + "1034": "minecraft:waxed_cut_copper_slab", + "1035": "minecraft:waxed_lightly_weathered_cut_copper_slab", + "1036": "minecraft:waxed_semi_weathered_cut_copper_slab", + "1037": "minecraft:lightning_rod", + "1038": "minecraft:powder_snow_bucket", + "1039": "minecraft:pointed_dripstone", + "1040": "minecraft:dripstone_block", + "1041": "minecraft:sculk_sensor" }, "sounds": [ "ambient.cave", @@ -20268,6 +20270,13 @@ "entity.arrow.hit_player", "entity.arrow.shoot", "item.axe.strip", + "entity.axolotl.attack", + "entity.axolotl.death", + "entity.axolotl.hurt", + "entity.axolotl.idle_air", + "entity.axolotl.idle_water", + "entity.axolotl.splash", + "entity.axolotl.swim", "block.bamboo.break", "block.bamboo.fall", "block.bamboo.hit", @@ -20330,10 +20339,12 @@ "block.bubble_column.whirlpool_ambient", "block.bubble_column.whirlpool_inside", "item.bucket.empty", + "item.bucket.empty_axolotl", "item.bucket.empty_fish", "item.bucket.empty_lava", "item.bucket.empty_powder_snow", "item.bucket.fill", + "item.bucket.fill_axolotl", "item.bucket.fill_fish", "item.bucket.fill_lava", "item.bucket.fill_powder_snow", diff --git a/fabric/pom.xml b/fabric/pom.xml index 7e05f04fc..7bbbb6257 100644 --- a/fabric/pom.xml +++ b/fabric/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/jar/pom.xml b/jar/pom.xml index 3e029c071..c607c8e5e 100644 --- a/jar/pom.xml +++ b/jar/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 viaversion-jar diff --git a/pom.xml b/pom.xml index 50406c9dd..c935f5e20 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ us.myles viaversion-parent - 3.3.0-20w49a + 3.3.0-20w51a pom viaversion-parent diff --git a/sponge-legacy/pom.xml b/sponge-legacy/pom.xml index e4e7bea59..d0655afcf 100644 --- a/sponge-legacy/pom.xml +++ b/sponge-legacy/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/sponge/pom.xml b/sponge/pom.xml index da8973c1f..795edf347 100644 --- a/sponge/pom.xml +++ b/sponge/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0 diff --git a/velocity/pom.xml b/velocity/pom.xml index fd0851a52..ced1d1343 100644 --- a/velocity/pom.xml +++ b/velocity/pom.xml @@ -5,7 +5,7 @@ viaversion-parent us.myles - 3.3.0-20w49a + 3.3.0-20w51a 4.0.0