4.6.2 Release

Fixes #3269

api/src/main/java/com/viaversion/viaversion/api/type/Type.java

@@ -237,6 +237,6 @@ public abstract class Type<T> implements ByteBufReader<T>, ByteBufWriter<T> {
 
     @Override
     public String toString() {
-        return "Type|" + typeName;
+        return typeName;
     }
 }

bukkit/src/main/java/com/viaversion/viaversion/ViaVersionPlugin.java

@@ -36,7 +36,6 @@ import com.viaversion.viaversion.bukkit.platform.BukkitViaTask;
 import com.viaversion.viaversion.bukkit.platform.BukkitViaTaskTask;
 import com.viaversion.viaversion.bukkit.platform.PaperViaInjector;
 import com.viaversion.viaversion.dump.PluginInfo;
-import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.unsupported.UnsupportedPlugin;
 import com.viaversion.viaversion.unsupported.UnsupportedServerSoftware;
 import com.viaversion.viaversion.util.GsonUtil;
@@ -83,13 +82,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaPlatform<Player>
         conf = new BukkitViaConfig();
 
         // Load a bunch of classes early with slow reflection and more classloading
-        Via.getManager().getScheduler().execute(() -> {
-            if (conf.shouldRegisterUserConnectionOnJoin()) {
-                JoinListener.init();
-            }
-
-            ChatRewriter.init();
-        });
+        if (conf.shouldRegisterUserConnectionOnJoin()) {
+            Via.getManager().getScheduler().execute(JoinListener::init);
+        }
     }
 
     @Override

bukkit/src/main/java/com/viaversion/viaversion/bukkit/listeners/protocol1_19_4To1_19_3/ArmorToggleListener.java

@@ -31,28 +31,12 @@ import org.bukkit.inventory.PlayerInventory;
 
 public final class ArmorToggleListener extends ViaBukkitListener {
 
-    private static final boolean ENABLED = hasEquipmentSlot();
-
     public ArmorToggleListener(final ViaVersionPlugin plugin) {
         super(plugin, Protocol1_19_4To1_19_3.class);
     }
 
-    private static boolean hasEquipmentSlot() {
-        // Doesn't exist on 1.8
-        try {
-            Material.class.getMethod("getEquipmentSlot");
-            return true;
-        } catch (final NoSuchMethodException e) {
-            return false;
-        }
-    }
-
     @EventHandler(priority = EventPriority.MONITOR)
     public void itemUse(final PlayerInteractEvent event) {
-        if (!ENABLED) {
-            return;
-        }
-
         final Player player = event.getPlayer();
         final ItemStack item = event.getItem();
         if (item == null || event.getHand() == null || !isOnPipe(player)) {

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaInjector.java

@@ -36,7 +36,9 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class BukkitViaInjector extends LegacyViaInjector {
 
-    private static final boolean HAS_SHARED_CONSTANTS = PaperViaInjector.hasClass("net.minecraft.SharedConstants") && PaperViaInjector.hasClass("net.minecraft.WorldVersion");
+    private static final boolean HAS_WORLD_VERSION_PROTOCOL_VERSION = PaperViaInjector.hasClass("net.minecraft.SharedConstants")
+            && PaperViaInjector.hasClass("net.minecraft.WorldVersion")
+            && !PaperViaInjector.hasClass("com.mojang.bridge.game.GameVersion");
 
     @Override
     public void inject() throws ReflectiveOperationException {
@@ -65,7 +67,7 @@ public class BukkitViaInjector extends LegacyViaInjector {
             return Bukkit.getUnsafe().getProtocolVersion();
         }
 
-        return HAS_SHARED_CONSTANTS ? cursedProtocolDetection() : veryCursedProtocolDetection();
+        return HAS_WORLD_VERSION_PROTOCOL_VERSION ? cursedProtocolDetection() : veryCursedProtocolDetection();
     }
 
     private int cursedProtocolDetection() throws ReflectiveOperationException {
@@ -187,7 +189,7 @@ public class BukkitViaInjector extends LegacyViaInjector {
 
     @Override
     public boolean lateProtocolVersionSetting() {
-        return !(PaperViaInjector.PAPER_PROTOCOL_METHOD || HAS_SHARED_CONSTANTS);
+        return !(PaperViaInjector.PAPER_PROTOCOL_METHOD || HAS_WORLD_VERSION_PROTOCOL_VERSION);
     }
 
     public boolean isBinded() {

bukkit/src/main/java/com/viaversion/viaversion/bukkit/platform/BukkitViaLoader.java

@@ -50,8 +50,10 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import org.bukkit.Bukkit;
+import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.scheduler.BukkitTask;
 
 public class BukkitViaLoader implements ViaPlatformLoader {
@@ -144,7 +146,7 @@ public class BukkitViaLoader implements ViaPlatformLoader {
             }
         }
 
-        if (serverProtocolVersion < ProtocolVersion.v1_19_4.getVersion() && plugin.getConf().isArmorToggleFix()) {
+        if (serverProtocolVersion < ProtocolVersion.v1_19_4.getVersion() && plugin.getConf().isArmorToggleFix() && hasGetHandMethod()) {
             new ArmorToggleListener(plugin).register();
         }
 
@@ -195,6 +197,16 @@ public class BukkitViaLoader implements ViaPlatformLoader {
         }
     }
 
+    private boolean hasGetHandMethod() {
+        try {
+            PlayerInteractEvent.class.getDeclaredMethod("getHand");
+            Material.class.getMethod("getEquipmentSlot");
+            return true;
+        } catch (NoSuchMethodException e) {
+            return false;
+        }
+    }
+
     @Override
     public void unload() {
         for (BukkitTask task : tasks) {

common/src/main/java/com/viaversion/viaversion/protocol/packet/PacketWrapperImpl.java

@@ -39,6 +39,7 @@ import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public class PacketWrapperImpl implements PacketWrapper {
@@ -508,10 +509,10 @@ public class PacketWrapperImpl implements PacketWrapper {
     @Override
     public String toString() {
         return "PacketWrapper{" +
-                "packetType=" + packetType +
+                "type=" + packetType +
                 ", id=" + id +
-                ", packetValues=" + packetValues +
-                ", readableObjects=" + readableObjects +
+                ", values=" + packetValues +
+                ", readable=" + readableObjects +
                 '}';
     }
 
@@ -535,5 +536,26 @@ public class PacketWrapperImpl implements PacketWrapper {
         public void setValue(@Nullable Object value) {
             this.value = value;
         }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            final PacketValue that = (PacketValue) o;
+            if (!type.equals(that.type)) return false;
+            return Objects.equals(value, that.value);
+        }
+
+        @Override
+        public int hashCode() {
+            int result = type.hashCode();
+            result = 31 * result + (value != null ? value.hashCode() : 0);
+            return result;
+        }
+
+        @Override
+        public String toString() {
+            return "{" + type + ": " + value + "}";
+        }
     }
 }

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/ChatRewriter.java

@@ -18,6 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_13to1_12_2;
 
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
@@ -28,9 +29,15 @@ import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.legacy.Leg
 
 public final class ChatRewriter {
     public static final GsonComponentSerializer HOVER_GSON_SERIALIZER = GsonComponentSerializer.builder().emitLegacyHoverEvent().legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get()).build();
-    public static final JsonElement EMPTY_COMPONENT = GsonComponentSerializer.gson().serializeToTree(Component.empty());
 
-    public static void init() {
+    public static JsonObject emptyComponent() {
+        final JsonObject object = new JsonObject();
+        object.addProperty("text", "");
+        return object;
+    }
+
+    public static String emptyComponentString() {
+        return "{\"text\":\"\"}";
     }
 
     public static String legacyTextToJsonString(String message, boolean itemData) {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/data/MappingData.java

@@ -115,14 +115,12 @@ public class MappingData extends MappingDataBase {
                 }
 
                 String key = keyAndTranslation[0];
-                if (!translateData.containsKey(key)) {
-                    String translation = keyAndTranslation[1].replaceAll("%(\\d\\$)?d", "%$1s");
-                    mojangTranslation.put(key, translation);
-                } else {
-                    String dataValue = translateData.get(key);
-                    if (dataValue != null) {
-                        translateMapping.put(key, dataValue);
-                    }
+                String translation = keyAndTranslation[1].replaceAll("%(\\d\\$)?d", "%$1s").trim();
+                mojangTranslation.put(key, translation);
+
+                String dataValue = translateData.get(key);
+                if (dataValue != null) {
+                    translateMapping.put(key, dataValue);
                 }
             }
         } catch (IOException e) {

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java

@@ -106,7 +106,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_12_1, Ser
 
                         // Reset the packet
                         wrapper.clearPacket();
-                        wrapper.setPacketType(ClientboundPackets1_13.SOUND);
+                        wrapper.setPacketType(ClientboundPackets1_13.STOP_SOUND);
 
                         byte flags = 0;
                         wrapper.write(Type.BYTE, flags); // Placeholder

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/Protocol1_19_4To1_19_3.java

@@ -26,14 +26,13 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_4;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
-import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
-import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ServerboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.data.MappingData;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.packets.EntityPackets;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.packets.InventoryPackets;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.storage.PlayerVehicleTracker;
 import com.viaversion.viaversion.rewriter.CommandRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
@@ -77,11 +76,14 @@ public final class Protocol1_19_4To1_19_3 extends AbstractProtocol<ClientboundPa
             if (element != null) {
                 wrapper.write(Type.COMPONENT, element);
             } else {
-                wrapper.write(Type.COMPONENT, ChatRewriter.EMPTY_COMPONENT);
+                wrapper.write(Type.COMPONENT, ChatRewriter.emptyComponent());
             }
 
             final String iconBase64 = wrapper.read(Type.OPTIONAL_STRING);
-            final byte[] iconBytes = iconBase64 != null ? Base64.getDecoder().decode(iconBase64.substring("data:image/png;base64,".length()).getBytes(StandardCharsets.UTF_8)) : null;
+            byte[] iconBytes = null;
+            if (iconBase64 != null && iconBase64.startsWith("data:image/png;base64,")) {
+                iconBytes = Base64.getDecoder().decode(iconBase64.substring("data:image/png;base64,".length()).getBytes(StandardCharsets.UTF_8));
+            }
             wrapper.write(Type.OPTIONAL_BYTE_ARRAY_PRIMITIVE, iconBytes);
         });
     }
@@ -105,6 +107,8 @@ public final class Protocol1_19_4To1_19_3 extends AbstractProtocol<ClientboundPa
     @Override
     public void init(final UserConnection user) {
         addEntityTracker(user, new EntityTrackerBase(user, Entity1_19_4Types.PLAYER));
+
+        user.put(new PlayerVehicleTracker(user));
     }
 
     @Override
@@ -121,4 +125,4 @@ public final class Protocol1_19_4To1_19_3 extends AbstractProtocol<ClientboundPa
     public InventoryPackets getItemRewriter() {
         return itemRewriter;
     }
-}
+}

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/packets/EntityPackets.java

@@ -24,6 +24,7 @@ import com.github.steveice10.opennbt.tag.builtin.StringTag;
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_19_4Types;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.version.Types1_19_3;
@@ -31,6 +32,7 @@ import com.viaversion.viaversion.api.type.types.version.Types1_19_4;
 import com.viaversion.viaversion.protocols.protocol1_19_3to1_19_1.ClientboundPackets1_19_3;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.ClientboundPackets1_19_4;
 import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.Protocol1_19_4To1_19_3;
+import com.viaversion.viaversion.protocols.protocol1_19_4to1_19_3.storage.PlayerVehicleTracker;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 
 public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3, Protocol1_19_4To1_19_3> {
@@ -55,6 +57,7 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
                 handler(dimensionDataHandler());
                 handler(biomeSizeTracker());
                 handler(worldDataTrackerHandlerByKey());
+                handler(playerTrackerHandler());
                 handler(wrapper -> {
                     final CompoundTag registry = wrapper.get(Type.NBT, 0);
                     final CompoundTag damageTypeRegistry = protocol.getMappingData().damageTypesRegistry();
@@ -82,7 +85,49 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
                 map(Type.FLOAT); // Pitch
                 map(Type.BYTE); // Relative arguments
                 map(Type.VAR_INT); // Id
-                read(Type.BOOLEAN); // Dismount vehicle
+                handler(wrapper -> {
+                    if (wrapper.read(Type.BOOLEAN)) { // Dismount vehicle
+                        final PlayerVehicleTracker playerVehicleTracker = wrapper.user().get(PlayerVehicleTracker.class);
+                        if (playerVehicleTracker.getVehicleId() != -1) {
+                            final PacketWrapper bundleStart = wrapper.create(ClientboundPackets1_19_4.BUNDLE);
+                            bundleStart.send(Protocol1_19_4To1_19_3.class);
+                            final PacketWrapper setPassengers = wrapper.create(ClientboundPackets1_19_4.SET_PASSENGERS);
+                            setPassengers.write(Type.VAR_INT, playerVehicleTracker.getVehicleId()); // vehicle id
+                            setPassengers.write(Type.VAR_INT_ARRAY_PRIMITIVE, new int[0]); // passenger ids
+                            setPassengers.send(Protocol1_19_4To1_19_3.class);
+                            wrapper.send(Protocol1_19_4To1_19_3.class);
+                            wrapper.cancel();
+                            final PacketWrapper bundleEnd = wrapper.create(ClientboundPackets1_19_4.BUNDLE);
+                            bundleEnd.send(Protocol1_19_4To1_19_3.class);
+
+                            playerVehicleTracker.setVehicleId(-1);
+                        }
+                    }
+                });
+            }
+        });
+        protocol.registerClientbound(ClientboundPackets1_19_3.SET_PASSENGERS, new PacketHandlers() {
+            @Override
+            protected void register() {
+                map(Type.VAR_INT); // vehicle id
+                map(Type.VAR_INT_ARRAY_PRIMITIVE); // passenger ids
+                handler(wrapper -> {
+                    final PlayerVehicleTracker playerVehicleTracker = wrapper.user().get(PlayerVehicleTracker.class);
+                    final int clientEntityId = wrapper.user().getEntityTracker(Protocol1_19_4To1_19_3.class).clientEntityId();
+                    final int vehicleId = wrapper.get(Type.VAR_INT, 0);
+
+                    if (playerVehicleTracker.getVehicleId() == vehicleId) {
+                        playerVehicleTracker.setVehicleId(-1);
+                    }
+
+                    final int[] passengerIds = wrapper.get(Type.VAR_INT_ARRAY_PRIMITIVE, 0);
+                    for (int passengerId : passengerIds) {
+                        if (passengerId == clientEntityId) {
+                            playerVehicleTracker.setVehicleId(vehicleId);
+                            break;
+                        }
+                    }
+                });
             }
         });
 
@@ -109,6 +154,7 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
                 map(Type.STRING); // Dimension
                 map(Type.STRING); // World
                 handler(worldDataTrackerHandlerByKey());
+                handler(wrapper -> wrapper.user().put(new PlayerVehicleTracker(wrapper.user())));
             }
         });
 
@@ -169,6 +215,13 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
             meta.setValue(protocol.getMappingData().getNewBlockStateId(blockState));
         });
 
+        filter().filterFamily(Entity1_19_4Types.BOAT).index(11).handler((event, meta) -> {
+            final int boatType = meta.value();
+            if (boatType > 4) { // Cherry added
+                meta.setValue(boatType + 1);
+            }
+        });
+
         filter().filterFamily(Entity1_19_4Types.ABSTRACT_HORSE).removeIndex(18); // Owner UUID
     }
 
@@ -181,4 +234,4 @@ public final class EntityPackets extends EntityRewriter<ClientboundPackets1_19_3
     public EntityType typeFromId(final int type) {
         return Entity1_19_4Types.getTypeFromId(type);
     }
-}
+}

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/rewriter/RecipeRewriter1_19_4.java

@@ -30,11 +30,8 @@ public class RecipeRewriter1_19_4<C extends ClientboundPacketType> extends Recip
     }
 
     @Override
-    public void handleCraftingShapeless(final PacketWrapper wrapper) throws Exception {
-        wrapper.passthrough(Type.STRING); // Group
-        wrapper.passthrough(Type.VAR_INT); // Crafting book category
-        handleIngredients(wrapper);
-        rewrite(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); // Result
+    public void handleCraftingShaped(final PacketWrapper wrapper) throws Exception {
+        super.handleCraftingShaped(wrapper);
         wrapper.passthrough(Type.BOOLEAN); // Show notification
     }
 }

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_4to1_19_3/storage/PlayerVehicleTracker.java

@@ -0,0 +1,39 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * Copyright (C) 2023 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.protocol1_19_4to1_19_3.storage;
+
+import com.viaversion.viaversion.api.connection.StoredObject;
+import com.viaversion.viaversion.api.connection.UserConnection;
+
+public class PlayerVehicleTracker extends StoredObject {
+
+    private int vehicleId = -1;
+
+    public PlayerVehicleTracker(final UserConnection user) {
+        super(user);
+    }
+
+    public int getVehicleId() {
+        return this.vehicleId;
+    }
+
+    public void setVehicleId(final int vehicleId) {
+        this.vehicleId = vehicleId;
+    }
+
+}

common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/Protocol1_19To1_18_2.java

@@ -30,10 +30,9 @@ import com.viaversion.viaversion.api.type.Type;
 import com.viaversion.viaversion.api.type.types.minecraft.ParticleType;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
-import com.viaversion.viaversion.libs.kyori.adventure.text.Component;
-import com.viaversion.viaversion.libs.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
+import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.ChatRewriter;
 import com.viaversion.viaversion.protocols.protocol1_17to1_16_4.ServerboundPackets1_17;
 import com.viaversion.viaversion.protocols.protocol1_18to1_17_1.ClientboundPackets1_18;
 import com.viaversion.viaversion.protocols.protocol1_19to1_18_2.data.MappingData;
@@ -124,7 +123,7 @@ public final class Protocol1_19To1_18_2 extends AbstractProtocol<ClientboundPack
             if (!isTextComponentNull(component)) {
                 wrapper.write(Type.COMPONENT, component);
             } else {
-                wrapper.write(Type.COMPONENT, GsonComponentSerializer.gson().serializeToTree(Component.empty()));
+                wrapper.write(Type.COMPONENT, ChatRewriter.emptyComponent());
             }
         };
         registerClientbound(ClientboundPackets1_18.TITLE_TEXT, titleHandler);

gradle.properties

@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=4.6.1
+projectVersion=4.6.2
 
 # Gradle properties
 org.gradle.daemon=true