From 354a5f1b75dc793d9496e1f2ac527cf94264df0e Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 2 Oct 2024 21:27:45 +0200 Subject: [PATCH] Update packet id comments --- .../packet/ClientboundPackets1_21_2.java | 198 +++++++++--------- .../viaversion/rewriter/RecipeRewriter.java | 6 - 2 files changed, 99 insertions(+), 105 deletions(-) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/packet/ClientboundPackets1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/packet/ClientboundPackets1_21_2.java index 146a6fbd9..132ab5770 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/packet/ClientboundPackets1_21_2.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/packet/ClientboundPackets1_21_2.java @@ -51,105 +51,105 @@ public enum ClientboundPackets1_21_2 implements ClientboundPacket1_21_2 { DISCONNECT, // 0x1D DISGUISED_CHAT, // 0x1E ENTITY_EVENT, // 0x1F - ENTITY_POSITION_SYNC, // 0x73 - EXPLODE, // 0x20 - FORGET_LEVEL_CHUNK, // 0x21 - GAME_EVENT, // 0x22 - HORSE_SCREEN_OPEN, // 0x23 - HURT_ANIMATION, // 0x24 - INITIALIZE_BORDER, // 0x25 - KEEP_ALIVE, // 0x26 - LEVEL_CHUNK_WITH_LIGHT, // 0x27 - LEVEL_EVENT, // 0x28 - LEVEL_PARTICLES, // 0x29 - LIGHT_UPDATE, // 0x2A - LOGIN, // 0x2B - MAP_ITEM_DATA, // 0x2C - MERCHANT_OFFERS, // 0x2D - MOVE_ENTITY_POS, // 0x2E - MOVE_ENTITY_POS_ROT, // 0x2F - MOVE_MINECART_ALONG_TRACK, // 0x30 - MOVE_ENTITY_ROT, // 0x31 - MOVE_VEHICLE, // 0x32 - OPEN_BOOK, // 0x33 - OPEN_SCREEN, // 0x34 - OPEN_SIGN_EDITOR, // 0x35 - PING, // 0x36 - PONG_RESPONSE, // 0x37 - PLACE_GHOST_RECIPE, // 0x38 - PLAYER_ABILITIES, // 0x39 - PLAYER_CHAT, // 0x3A - PLAYER_COMBAT_END, // 0x3B - PLAYER_COMBAT_ENTER, // 0x3C - PLAYER_COMBAT_KILL, // 0x3D - PLAYER_INFO_REMOVE, // 0x3E - PLAYER_INFO_UPDATE, // 0x3F - PLAYER_LOOK_AT, // 0x40 - PLAYER_POSITION, // 0x41 - PLAYER_ROTATION, // 0x41 - RECIPE_BOOK_ADD, // 0x42 - RECIPE_BOOK_REMOVE, // 0x42 - RECIPE_BOOK_SETTINGS, // 0x42 - REMOVE_ENTITIES, // 0x43 - REMOVE_MOB_EFFECT, // 0x44 - RESET_SCORE, // 0x45 - RESOURCE_PACK_POP, // 0x46 - RESOURCE_PACK_PUSH, // 0x47 - RESPAWN, // 0x48 - ROTATE_HEAD, // 0x49 - SECTION_BLOCKS_UPDATE, // 0x4A - SELECT_ADVANCEMENTS_TAB, // 0x4B - SERVER_DATA, // 0x4C - SET_ACTION_BAR_TEXT, // 0x4D - SET_BORDER_CENTER, // 0x4E - SET_BORDER_LERP_SIZE, // 0x4F - SET_BORDER_SIZE, // 0x50 - SET_BORDER_WARNING_DELAY, // 0x51 - SET_BORDER_WARNING_DISTANCE, // 0x52 - SET_CAMERA, // 0x53 - SET_CHUNK_CACHE_CENTER, // 0x54 - SET_CHUNK_CACHE_RADIUS, // 0x55 - SET_CURSOR_ITEM, // 0x56 - SET_DEFAULT_SPAWN_POSITION, // 0x57 - SET_DISPLAY_OBJECTIVE, // 0x58 - SET_ENTITY_DATA, // 0x59 - SET_ENTITY_LINK, // 0x5A - SET_ENTITY_MOTION, // 0x5B - SET_EQUIPMENT, // 0x5C - SET_EXPERIENCE, // 0x5D - SET_HEALTH, // 0x5E - SET_HELD_SLOT, // 0x5F - SET_OBJECTIVE, // 0x60 - SET_PASSENGERS, // 0x61 - SET_PLAYER_INVENTORY, // 0x62 - SET_PLAYER_TEAM, // 0x63 - SET_SCORE, // 0x64 - SET_SIMULATION_DISTANCE, // 0x65 - SET_SUBTITLE_TEXT, // 0x66 - SET_TIME, // 0x67 - SET_TITLE_TEXT, // 0x68 - SET_TITLES_ANIMATION, // 0x69 - SOUND_ENTITY, // 0x6A - SOUND, // 0x6B - START_CONFIGURATION, // 0x6C - STOP_SOUND, // 0x6D - STORE_COOKIE, // 0x6E - SYSTEM_CHAT, // 0x6F - TAB_LIST, // 0x70 - TAG_QUERY, // 0x71 - TAKE_ITEM_ENTITY, // 0x72 - TELEPORT_ENTITY, // 0x73 - TICKING_STATE, // 0x74 - TICKING_STEP, // 0x75 - TRANSFER, // 0x76 - UPDATE_ADVANCEMENTS, // 0x77 - UPDATE_ATTRIBUTES, // 0x78 - UPDATE_MOB_EFFECT, // 0x79 - UPDATE_RECIPES, // 0x7A - UPDATE_TAGS, // 0x7B - PROJECTILE_POWER, // 0x7C - CUSTOM_REPORT_DETAILS, // 0x7D - SERVER_LINKS; // 0x7E + ENTITY_POSITION_SYNC, // 0x20 + EXPLODE, // 0x21 + FORGET_LEVEL_CHUNK, // 0x22 + GAME_EVENT, // 0x23 + HORSE_SCREEN_OPEN, // 0x24 + HURT_ANIMATION, // 0x25 + INITIALIZE_BORDER, // 0x26 + KEEP_ALIVE, // 0x27 + LEVEL_CHUNK_WITH_LIGHT, // 0x28 + LEVEL_EVENT, // 0x29 + LEVEL_PARTICLES, // 0x2A + LIGHT_UPDATE, // 0x2B + LOGIN, // 0x2C + MAP_ITEM_DATA, // 0x2D + MERCHANT_OFFERS, // 0x2E + MOVE_ENTITY_POS, // 0x2F + MOVE_ENTITY_POS_ROT, // 0x30 + MOVE_MINECART_ALONG_TRACK, // 0x31 + MOVE_ENTITY_ROT, // 0x32 + MOVE_VEHICLE, // 0x33 + OPEN_BOOK, // 0x34 + OPEN_SCREEN, // 0x35 + OPEN_SIGN_EDITOR, // 0x36 + PING, // 0x37 + PONG_RESPONSE, // 0x38 + PLACE_GHOST_RECIPE, // 0x39 + PLAYER_ABILITIES, // 0x3A + PLAYER_CHAT, // 0x3B + PLAYER_COMBAT_END, // 0x3C + PLAYER_COMBAT_ENTER, // 0x3D + PLAYER_COMBAT_KILL, // 0x3E + PLAYER_INFO_REMOVE, // 0x3F + PLAYER_INFO_UPDATE, // 0x40 + PLAYER_LOOK_AT, // 0x41 + PLAYER_POSITION, // 0x42 + PLAYER_ROTATION, // 0x43 + RECIPE_BOOK_ADD, // 0x44 + RECIPE_BOOK_REMOVE, // 0x45 + RECIPE_BOOK_SETTINGS, // 0x46 + REMOVE_ENTITIES, // 0x47 + REMOVE_MOB_EFFECT, // 0x48 + RESET_SCORE, // 0x49 + RESOURCE_PACK_POP, // 0x4A + RESOURCE_PACK_PUSH, // 0x4B + RESPAWN, // 0x4C + ROTATE_HEAD, // 0x4D + SECTION_BLOCKS_UPDATE, // 0x4E + SELECT_ADVANCEMENTS_TAB, // 0x4F + SERVER_DATA, // 0x50 + SET_ACTION_BAR_TEXT, // 0x51 + SET_BORDER_CENTER, // 0x52 + SET_BORDER_LERP_SIZE, // 0x53 + SET_BORDER_SIZE, // 0x54 + SET_BORDER_WARNING_DELAY, // 0x55 + SET_BORDER_WARNING_DISTANCE, // 0x56 + SET_CAMERA, // 0x57 + SET_CHUNK_CACHE_CENTER, // 0x58 + SET_CHUNK_CACHE_RADIUS, // 0x59 + SET_CURSOR_ITEM, // 0x5A + SET_DEFAULT_SPAWN_POSITION, // 0x5B + SET_DISPLAY_OBJECTIVE, // 0x5C + SET_ENTITY_DATA, // 0x5D + SET_ENTITY_LINK, // 0x5E + SET_ENTITY_MOTION, // 0x5F + SET_EQUIPMENT, // 0x60 + SET_EXPERIENCE, // 0x61 + SET_HEALTH, // 0x62 + SET_HELD_SLOT, // 0x63 + SET_OBJECTIVE, // 0x64 + SET_PASSENGERS, // 0x65 + SET_PLAYER_INVENTORY, // 0x66 + SET_PLAYER_TEAM, // 0x67 + SET_SCORE, // 0x68 + SET_SIMULATION_DISTANCE, // 0x69 + SET_SUBTITLE_TEXT, // 0x6A + SET_TIME, // 0x6B + SET_TITLE_TEXT, // 0x6C + SET_TITLES_ANIMATION, // 0x6D + SOUND_ENTITY, // 0x6E + SOUND, // 0x6F + START_CONFIGURATION, // 0x70 + STOP_SOUND, // 0x71 + STORE_COOKIE, // 0x72 + SYSTEM_CHAT, // 0x73 + TAB_LIST, // 0x74 + TAG_QUERY, // 0x75 + TAKE_ITEM_ENTITY, // 0x76 + TELEPORT_ENTITY, // 0x77 + TICKING_STATE, // 0x78 + TICKING_STEP, // 0x79 + TRANSFER, // 0x7A + UPDATE_ADVANCEMENTS, // 0x7B + UPDATE_ATTRIBUTES, // 0x7C + UPDATE_MOB_EFFECT, // 0x7D + UPDATE_RECIPES, // 0x7E + UPDATE_TAGS, // 0x7F + PROJECTILE_POWER, // 0x80 + CUSTOM_REPORT_DETAILS, // 0x81 + SERVER_LINKS; // 0x82 @Override public int getId() { diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java index 0e0c7bc9a..8704036fe 100644 --- a/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java +++ b/common/src/main/java/com/viaversion/viaversion/rewriter/RecipeRewriter.java @@ -88,7 +88,6 @@ public class RecipeRewriter { int newSize = size; for (int i = 0; i < size; i++) { final String recipeIdentifier = wrapper.read(Types.STRING); - // TODO Recipe identifier, then int array item ids and that's it final FullMappings recipeSerializerMappings = protocol.getMappingData().getRecipeSerializerMappings(); final int typeId = wrapper.read(Types.VAR_INT); @@ -102,11 +101,6 @@ public class RecipeRewriter { handleRecipeType(wrapper, Key.stripMinecraftNamespace(recipeSerializerMappings.identifier(typeId))); // Use the original } - - // Stonecutter recipes on their own - // List of: - // Ingredient (item holder set) - // Slot display id }); }