Merge remote-tracking branch 'origin/master'

Author: Johni0702

api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java

@@ -90,7 +90,7 @@ public class ProtocolVersion implements Comparable<ProtocolVersion> {
     public static final ProtocolVersion v1_21_4 = register(769, "1.21.4");
     public static final ProtocolVersion v1_21_5 = register(770, "1.21.5");
     public static final ProtocolVersion v1_21_6 = register(771, "1.21.6");
-    public static final ProtocolVersion v1_21_7 = register(772, 258, "1.21.7");
+    public static final ProtocolVersion v1_21_7 = register(772, "1.21.7");
     public static final ProtocolVersion unknown = new ProtocolVersion(VersionType.SPECIAL, -1, -1, "UNKNOWN", null);
 
     static {

common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/data/AchievementTranslations1_12.java

@@ -177,6 +177,14 @@ public class AchievementTranslations1_12 {
         add("achievement.overkill.desc", "Deal nine hearts of damage in a single hit");
         add("achievement.bookcase", "Librarian");
         add("achievement.bookcase.desc", "Build some bookshelves to improve your enchantment table");
+        add("commands.achievement.usage", "/achievement <give|take> <name|*> [player]");
+        add("commands.achievement.give.success.all", "Successfully given all achievements to %s");
+        add("commands.achievement.take.success.all", "Successfully taken all achievements from %s");
+        add("commands.achievement.unknownAchievement", "Unknown achievement '%s'");
+        add("commands.achievement.take.success.one", "Successfully taken the achievement %s from %s");
+        add("commands.achievement.dontHave", "Player %s doesn't have achievement %s");
+        add("commands.achievement.alreadyHave", "Player %s already has achievement %s");
+        add("commands.achievement.give.success.one", "Successfully given %s the achievement %s");
     }
 
     private static void add(String key, String value) {

common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/ComponentRewriter1_16.java

@@ -65,6 +65,8 @@ public ComponentRewriter1_16(Protocol1_15_2To1_16 protocol) {
         mappings.put("advancements.husbandry.break_diamond_hoe.description", "Completely use up a diamond hoe, and then reevaluate your life choices");
         mappings.put("biome.minecraft.nether", "Nether");
         mappings.put("key.swapHands", "key.swapOffhand");
+        mappings.put("commands.datapack.enable.success", "commands.datapack.modify.enable");
+        mappings.put("commands.datapack.disable.success", "commands.datapack.modify.disable");
     }
 
     @Override

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/Protocol1_16_4To1_17.java

@@ -34,20 +34,23 @@
 import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ServerboundPackets1_16_2;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ClientboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
+import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.ComponentRewriter1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.EntityPacketRewriter1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.ItemPacketRewriter1_17;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter.WorldPacketRewriter1_17;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
+import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class Protocol1_16_4To1_17 extends AbstractProtocol<ClientboundPackets1_16_2, ClientboundPackets1_17, ServerboundPackets1_16_2, ServerboundPackets1_17> {
 
     public static final MappingData MAPPINGS = new MappingDataBase("1.16.2", "1.17");
     private final EntityPacketRewriter1_17 entityRewriter = new EntityPacketRewriter1_17(this);
     private final ItemPacketRewriter1_17 itemRewriter = new ItemPacketRewriter1_17(this);
     private final ParticleRewriter<ClientboundPackets1_16_2> particleRewriter = new ParticleRewriter<>(this);
+    private final ComponentRewriter1_17 componentRewriter = new ComponentRewriter1_17(this);
     private final TagRewriter<ClientboundPackets1_16_2> tagRewriter = new TagRewriter<>(this);
 
     public Protocol1_16_4To1_17() {
@@ -84,6 +87,13 @@ protected void registerPackets() {
 
         new StatisticsRewriter<>(this).register(ClientboundPackets1_16_2.AWARD_STATS);
 
+        componentRewriter.registerComponentPacket(ClientboundPackets1_16_2.CHAT);
+        componentRewriter.registerBossEvent(ClientboundPackets1_16_2.BOSS_EVENT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_16_2.DISCONNECT);
+        componentRewriter.registerTabList(ClientboundPackets1_16_2.TAB_LIST);
+        componentRewriter.registerOpenScreen1_14(ClientboundPackets1_16_2.OPEN_SCREEN);
+        componentRewriter.registerPing();
+
         SoundRewriter<ClientboundPackets1_16_2> soundRewriter = new SoundRewriter<>(this);
         soundRewriter.registerSound(ClientboundPackets1_16_2.SOUND);
         soundRewriter.registerSound(ClientboundPackets1_16_2.SOUND_ENTITY);
@@ -133,6 +143,9 @@ protected void registerPackets() {
                 default -> throw new IllegalArgumentException("Invalid title type received: " + type);
             }
 
+            if (type < 3) {
+                componentRewriter.processText(wrapper.user(), wrapper.passthrough(Types.COMPONENT));
+            }
             wrapper.setPacketType(packetType);
         });
 
@@ -217,6 +230,11 @@ public ParticleRewriter<ClientboundPackets1_16_2> getParticleRewriter() {
         return particleRewriter;
     }
 
+    @Override
+    public @Nullable ComponentRewriter1_17 getComponentRewriter() {
+        return componentRewriter;
+    }
+
     @Override
     public TagRewriter<ClientboundPackets1_16_2> getTagRewriter() {
         return tagRewriter;

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/ComponentRewriter1_17.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viaversion.protocols.v1_16_4to1_17.rewriter;
+
+import com.google.gson.JsonObject;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.protocols.v1_16_1to1_16_2.packet.ClientboundPackets1_16_2;
+import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class ComponentRewriter1_17 extends JsonNBTComponentRewriter<ClientboundPackets1_16_2> {
+
+    private final Map<String, String> mappings = new HashMap<>();
+
+    public ComponentRewriter1_17(final Protocol<ClientboundPackets1_16_2, ?, ?, ?> protocol) {
+        super(protocol, ReadType.JSON);
+        mappings.put("commands.worldborder.set.failed.small.", "commands.worldborder.set.failed.small");
+        mappings.put("commands.worldborder.set.failed.big.", "commands.worldborder.set.failed.big");
+        mappings.put("commands.replaceitem.slot.inapplicable", "commands.item.target.no_such_slot");
+        mappings.put("commands.replaceitem.block.failed", "The target block is not a container");
+        mappings.put("commands.replaceitem.entity.success.single", "commands.item.entity.set.success.single");
+        mappings.put("commands.replaceitem.block.success", "commands.item.block.set.success");
+        mappings.put("commands.debug.reportSaved", "Created debug report in %s");
+        mappings.put("commands.debug.reportFailed", "Failed to create debug report");
+    }
+
+    @Override
+    protected void handleTranslate(final JsonObject object, final String translate) {
+        String mappedTranslation = mappings.get(translate);
+        if (mappedTranslation != null) {
+            object.addProperty("translate", mappedTranslation);
+        }
+    }
+}

common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/EntityPacketRewriter1_17.java

@@ -157,6 +157,11 @@ public void register() {
                 default -> throw new IllegalArgumentException("Invalid combat type received: " + type);
             };
 
+            if (type == 2) {
+                wrapper.passthrough(Types.VAR_INT); // Duration/Player id
+                wrapper.passthrough(Types.INT); // Killer id
+                protocol.getComponentRewriter().processText(wrapper.user(), wrapper.passthrough(Types.COMPONENT));
+            }
             wrapper.setPacketType(packetType);
         });
 

common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/Protocol1_17_1To1_18.java

@@ -30,6 +30,7 @@
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.protocols.v1_16_4to1_17.packet.ServerboundPackets1_17;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18;
+import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.ComponentRewriter1_18;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.EntityPacketRewriter1_18;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.ItemPacketRewriter1_18;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter.WorldPacketRewriter1_18;
@@ -48,6 +49,7 @@ public final class Protocol1_17_1To1_18 extends AbstractProtocol<ClientboundPack
     private final EntityPacketRewriter1_18 entityRewriter = new EntityPacketRewriter1_18(this);
     private final ItemPacketRewriter1_18 itemRewriter = new ItemPacketRewriter1_18(this);
     private final ParticleRewriter<ClientboundPackets1_17_1> particleRewriter = new ParticleRewriter<>(this);
+    private final ComponentRewriter1_18 componentRewriter = new ComponentRewriter1_18(this);
     private final TagRewriter<ClientboundPackets1_17_1> tagRewriter = new TagRewriter<>(this);
 
     public Protocol1_17_1To1_18() {
@@ -68,6 +70,17 @@ protected void registerPackets() {
 
         new StatisticsRewriter<>(this).register(ClientboundPackets1_17_1.AWARD_STATS);
 
+        componentRewriter.registerComponentPacket(ClientboundPackets1_17_1.CHAT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_17_1.SET_ACTION_BAR_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_17_1.SET_TITLE_TEXT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_17_1.SET_SUBTITLE_TEXT);
+        componentRewriter.registerBossEvent(ClientboundPackets1_17_1.BOSS_EVENT);
+        componentRewriter.registerComponentPacket(ClientboundPackets1_17_1.DISCONNECT);
+        componentRewriter.registerTabList(ClientboundPackets1_17_1.TAB_LIST);
+        componentRewriter.registerOpenScreen1_14(ClientboundPackets1_17_1.OPEN_SCREEN);
+        componentRewriter.registerPlayerCombatKill(ClientboundPackets1_17_1.PLAYER_COMBAT_KILL);
+        componentRewriter.registerPing();
+
         registerServerbound(ServerboundPackets1_17.CLIENT_INFORMATION, new PacketHandlers() {
             @Override
             public void register() {
@@ -130,6 +143,11 @@ public ParticleRewriter<ClientboundPackets1_17_1> getParticleRewriter() {
         return particleRewriter;
     }
 
+    @Override
+    public ComponentRewriter1_18 getComponentRewriter() {
+        return componentRewriter;
+    }
+
     @Override
     public TagRewriter<ClientboundPackets1_17_1> getTagRewriter() {
         return tagRewriter;

common/src/main/java/com/viaversion/viaversion/protocols/v1_17_1to1_18/rewriter/ComponentRewriter1_18.java

@@ -0,0 +1,39 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2016-2025 ViaVersion and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.viaversion.viaversion.protocols.v1_17_1to1_18.rewriter;
+
+import com.google.gson.JsonObject;
+import com.viaversion.viaversion.api.protocol.Protocol;
+import com.viaversion.viaversion.protocols.v1_17to1_17_1.packet.ClientboundPackets1_17_1;
+import com.viaversion.viaversion.rewriter.text.JsonNBTComponentRewriter;
+
+public final class ComponentRewriter1_18 extends JsonNBTComponentRewriter<ClientboundPackets1_17_1> {
+
+    public ComponentRewriter1_18(final Protocol<ClientboundPackets1_17_1, ?, ?, ?> protocol) {
+        super(protocol, ReadType.JSON);
+    }
+
+    @Override
+    protected void handleTranslate(final JsonObject object, final String translate) {
+        if (translate.equals("commands.scoreboard.objectives.add.longName")) {
+            object.addProperty("translate", "Objective names cannot be longer than %s characters");
+        } else if (translate.equals("commands.team.add.longName")) {
+            object.addProperty("translate", "Team names cannot be longer than %s characters");
+        }
+    }
+}