Fix spectator interact in 26.1->1.21.11

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/Protocol26_1To1_21_11.java

@@ -27,6 +27,7 @@
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.rewriter.ComponentRewriter26_1;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.rewriter.EntityPacketRewriter26_1;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.DayTimeStorage;
+import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.GameModeStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_11;
@@ -168,6 +169,7 @@ public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_11.PLAYER));
         addItemHasher(connection, new ItemHasherBase(this, connection));
         connection.put(new DayTimeStorage());
+        connection.put(new GameModeStorage());
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/rewriter/EntityPacketRewriter26_1.java

@@ -19,6 +19,8 @@
 
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v26_1to1_21_11.Protocol26_1To1_21_11;
+import com.viaversion.viabackwards.protocol.v26_1to1_21_11.storage.GameModeStorage;
+import com.viaversion.viaversion.api.minecraft.GameMode;
 import com.viaversion.viaversion.api.minecraft.Vector3d;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_11;
@@ -27,6 +29,7 @@
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPacket26_1;
+import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ClientboundPackets26_1;
 import com.viaversion.viaversion.protocols.v1_21_11to26_1.packet.ServerboundPackets26_1;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 
@@ -42,13 +45,23 @@ public EntityPacketRewriter26_1(final Protocol26_1To1_21_11 protocol) {
 
     @Override
     public void registerPackets() {
+        protocol.appendClientbound(ClientboundPackets26_1.RESPAWN, wrapper -> {
+            final byte gamemode = wrapper.get(Types.BYTE, 0);
+            wrapper.user().get(GameModeStorage.class).setGameMode(gamemode);
+        });
+        protocol.appendClientbound(ClientboundPackets26_1.LOGIN, wrapper -> {
+            final byte gamemode = wrapper.get(Types.BYTE, 0);
+            wrapper.user().get(GameModeStorage.class).setGameMode(gamemode);
+        });
+
         protocol.registerServerbound(ServerboundPackets1_21_6.INTERACT, wrapper -> {
             wrapper.passthrough(Types.VAR_INT); // Entity ID
             final int action = wrapper.read(Types.VAR_INT);
             switch (action) {
                 case INTERACT_ACTION -> wrapper.cancel(); // Drop "normal" interacts, as interact_at is always sent by Vanilla clients, and always sent first, with this following after
                 case ATTACK_ACTION -> {
-                    wrapper.setPacketType(ServerboundPackets26_1.ATTACK);
+                    final boolean spectator = wrapper.user().get(GameModeStorage.class).gameMode() == GameMode.SPECTATOR.id();
+                    wrapper.setPacketType(spectator ? ServerboundPackets26_1.SPECTATE_ENTITY : ServerboundPackets26_1.ATTACK);
                     wrapper.read(Types.BOOLEAN); // Using secondary action
                 }
                 case INTERACT_AT_ACTION -> {

common/src/main/java/com/viaversion/viabackwards/protocol/v26_1to1_21_11/storage/GameModeStorage.java

@@ -0,0 +1,33 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2026 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.viabackwards.protocol.v26_1to1_21_11.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+
+public final class GameModeStorage implements StorableObject {
+
+    private int gameMode = -1;
+
+    public int gameMode() {
+        return gameMode;
+    }
+
+    public void setGameMode(final int gameMode) {
+        this.gameMode = gameMode;
+    }
+}

gradle.properties

@@ -1,8 +1,8 @@
 projectVersion=5.9.0-SNAPSHOT
 
 # Smile emoji (note that modrinth may not have added the version on release yet)
-mcVersions=26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
-mcVersionRange=1.10-26.1
+mcVersions=26.1.1, 26.1, 1.21.11, 1.21.10, 1.21.9, 1.21.8, 1.21.7, 1.21.6, 1.21.5, 1.21.4, 1.21.3, 1.21.2, 1.21.1, 1.21, 1.20.6, 1.20.5, 1.20.4, 1.20.3, 1.20.2, 1.20.1, 1.20, 1.19.4, 1.19.3, 1.19.2, 1.19.1, 1.19, 1.18.2, 1.18.1, 1.18, 1.17.1, 1.17, 1.16.5, 1.16.4, 1.16.3, 1.16.2, 1.16.1, 1.16, 1.15.2, 1.15.1, 1.15, 1.14.4, 1.14.3, 1.14.2, 1.14.1, 1.14, 1.13.2, 1.13.1, 1.13, 1.12.2, 1.12.1, 1.12, 1.11.2, 1.11.1, 1.11, 1.10.2, 1.10.1, 1.10
+mcVersionRange=1.10-26.1.1
 velocityVersion=3.4-3.5
 
 org.gradle.configureondemand=true