From 2588c6ecc85542cb1de4e2691934993257b7066d Mon Sep 17 00:00:00 2001 From: KennyTV Date: Wed, 12 May 2021 14:27:56 +0200 Subject: [PATCH] 21w19a (probably) --- .../api/protocol/remapper/PacketRemapper.java | 2 +- .../api/protocol/version/ProtocolVersion.java | 2 +- build.gradle.kts | 2 +- .../ClientboundPackets1_17.java | 109 +- .../Protocol1_17To1_16_4.java | 12 +- .../ServerboundPackets1_17.java | 37 +- .../assets/viaversion/data/mapping-1.17.json | 2068 ++++++++--------- 7 files changed, 1122 insertions(+), 1110 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java index a073d2f9e..d23bd32e1 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/remapper/PacketRemapper.java @@ -35,7 +35,7 @@ import java.util.function.Function; public abstract class PacketRemapper { private final List> valueRemappers = new ArrayList<>(); - public PacketRemapper() { + protected PacketRemapper() { registerMap(); } diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java index da3b6f14e..525ca1972 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java +++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java @@ -76,7 +76,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/5", new VersionRange("1.16", 4, 5)); - public static final ProtocolVersion v1_17 = register(755, 26, "1.17"); + public static final ProtocolVersion v1_17 = register(755, 27, "1.17"); public static final ProtocolVersion unknown = register(-1, "UNKNOWN"); public static ProtocolVersion register(int version, String name) { diff --git a/build.gradle.kts b/build.gradle.kts index f0c9c1786..39d8b9711 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { group = "com.viaversion" - version = "4.0.0-21w18a" + version = "4.0.0-21w19a" description = "Allow newer clients to join older server versions." } diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java index 8ee52b02b..f088be12f 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/ClientboundPackets1_17.java @@ -69,60 +69,61 @@ public enum ClientboundPackets1_17 implements ClientboundPacketType { OPEN_BOOK, // 0x2D OPEN_WINDOW, // 0x2E OPEN_SIGN_EDITOR, // 0x2F - CRAFT_RECIPE_RESPONSE, // 0x30 - PLAYER_ABILITIES, // 0x31 - COMBAT_END, // 0x32 - COMBAT_ENTER, // 0x33 - COMBAT_KILL, // 0x34 - PLAYER_INFO, // 0x35 - FACE_PLAYER, // 0x36 - PLAYER_POSITION, // 0x37 - UNLOCK_RECIPES, // 0x38 - REMOVE_ENTITY, // 0x39 - REMOVE_ENTITY_EFFECT, // 0x3A - RESOURCE_PACK, // 0x3B - RESPAWN, // 0x3C - ENTITY_HEAD_LOOK, // 0x3D - MULTI_BLOCK_CHANGE, // 0x3E - SELECT_ADVANCEMENTS_TAB, // 0x3F - ACTIONBAR, // 0x40 - WORLD_BORDER_CENTER, // 0x41 - WORLD_BORDER_LERP_SIZE, // 0x42 - WORLD_BORDER_SIZE, // 0x43 - WORLD_BORDER_WARNING_DELAY, // 0x44 - WORLD_BORDER_WARNING_DISTANCE, // 0x45 - CAMERA, // 0x46 - HELD_ITEM_CHANGE, // 0x47 - UPDATE_VIEW_POSITION, // 0x48 - UPDATE_VIEW_DISTANCE, // 0x49 - SPAWN_POSITION, // 0x4A - DISPLAY_SCOREBOARD, // 0x4B - ENTITY_METADATA, // 0x4C - ATTACH_ENTITY, // 0x4D - ENTITY_VELOCITY, // 0x4E - ENTITY_EQUIPMENT, // 0x4F - SET_EXPERIENCE, // 0x50 - UPDATE_HEALTH, // 0x51 - SCOREBOARD_OBJECTIVE, // 0x52 - SET_PASSENGERS, // 0x53 - TEAMS, // 0x54 - UPDATE_SCORE, // 0x55 - TITLE_SUBTITLE, // 0x56 - TIME_UPDATE, // 0x57 - TITLE_TEXT, // 0x58 - TITLE_TIMES, // 0x59 - ENTITY_SOUND, // 0x5A - SOUND, // 0x5B - STOP_SOUND, // 0x5C - TAB_LIST, // 0x5D - NBT_QUERY, // 0x5E - COLLECT_ITEM, // 0x5F - ENTITY_TELEPORT, // 0x60 - ADVANCEMENTS, // 0x61 - ENTITY_PROPERTIES, // 0x62 - ENTITY_EFFECT, // 0x63 - DECLARE_RECIPES, // 0x64 - TAGS; // 0x65 + PING, // 0x30 + CRAFT_RECIPE_RESPONSE, // 0x31 + PLAYER_ABILITIES, // 0x32 + COMBAT_END, // 0x33 + COMBAT_ENTER, // 0x34 + COMBAT_KILL, // 0x35 + PLAYER_INFO, // 0x36 + FACE_PLAYER, // 0x37 + PLAYER_POSITION, // 0x38 + UNLOCK_RECIPES, // 0x39 + REMOVE_ENTITY, // 0x3A + REMOVE_ENTITY_EFFECT, // 0x3B + RESOURCE_PACK, // 0x3C + RESPAWN, // 0x3D + ENTITY_HEAD_LOOK, // 0x3E + MULTI_BLOCK_CHANGE, // 0x3F + SELECT_ADVANCEMENTS_TAB, // 0x40 + ACTIONBAR, // 0x41 + WORLD_BORDER_CENTER, // 0x42 + WORLD_BORDER_LERP_SIZE, // 0x43 + WORLD_BORDER_SIZE, // 0x44 + WORLD_BORDER_WARNING_DELAY, // 0x45 + WORLD_BORDER_WARNING_DISTANCE, // 0x46 + CAMERA, // 0x47 + HELD_ITEM_CHANGE, // 0x48 + UPDATE_VIEW_POSITION, // 0x49 + UPDATE_VIEW_DISTANCE, // 0x4A + SPAWN_POSITION, // 0x4B + DISPLAY_SCOREBOARD, // 0x4C + ENTITY_METADATA, // 0x4D + ATTACH_ENTITY, // 0x4E + ENTITY_VELOCITY, // 0x4F + ENTITY_EQUIPMENT, // 0x50 + SET_EXPERIENCE, // 0x51 + UPDATE_HEALTH, // 0x52 + SCOREBOARD_OBJECTIVE, // 0x53 + SET_PASSENGERS, // 0x54 + TEAMS, // 0x55 + UPDATE_SCORE, // 0x56 + TITLE_SUBTITLE, // 0x57 + TIME_UPDATE, // 0x58 + TITLE_TEXT, // 0x59 + TITLE_TIMES, // 0x5A + ENTITY_SOUND, // 0x5B + SOUND, // 0x5C + STOP_SOUND, // 0x5D + TAB_LIST, // 0x5E + NBT_QUERY, // 0x5F + COLLECT_ITEM, // 0x60 + ENTITY_TELEPORT, // 0x61 + ADVANCEMENTS, // 0x62 + ENTITY_PROPERTIES, // 0x63 + ENTITY_EFFECT, // 0x64 + DECLARE_RECIPES, // 0x65 + TAGS; // 0x66 @Override public int getId() { diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java index b0e2b8b08..e81837a93 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_17to1_16_4/Protocol1_17To1_16_4.java @@ -203,6 +203,9 @@ public class Protocol1_17To1_16_4 extends AbstractProtocol