diff --git a/build.gradle.kts b/build.gradle.kts index 4eb1054a..7a813cc0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { allprojects { group = "com.viaversion" - version = "4.1.0-1.18-pre2-SNAPSHOT" + version = "4.1.0-1.18-pre5-SNAPSHOT" description = "Allow older clients to join newer server versions." } diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java index e7da6e67..a6829723 100644 --- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java +++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/TranslatableRewriter.java @@ -123,6 +123,17 @@ public class TranslatableRewriter extends ComponentRewriter { }); } + public void registerCombatKill(ClientboundPacketType packetType) { + protocol.registerClientbound(packetType, new PacketRemapper() { + @Override + public void registerMap() { + map(Type.VAR_INT); + map(Type.INT); + handler(wrapper -> processText(wrapper.passthrough(Type.COMPONENT))); + } + }); + } + @Override protected void handleTranslate(JsonObject root, String translate) { String newTranslate = newTranslatables.get(translate); diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java index e1450820..d8696b20 100644 --- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java +++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_4to1_17/Protocol1_16_4To1_17.java @@ -225,6 +225,7 @@ public final class Protocol1_16_4To1_17 extends BackwardsProtocol