Merge branch 'master' into fix/backup-new-data

common/src/main/java/com/viaversion/viabackwards/ViaBackwardsConfig.java

@@ -36,6 +36,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
     private boolean handlePingsAsInvAcknowledgements;
     private boolean bedrockAtY0;
     private boolean sculkShriekersToCryingObsidian;
+    private boolean mapDarknessEffect;
     private boolean suppressEmulationWarnings;
 
     public ViaBackwardsConfig(File configFile, Logger logger) {
@@ -57,6 +58,7 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
         handlePingsAsInvAcknowledgements = getBoolean("handle-pings-as-inv-acknowledgements", false);
         bedrockAtY0 = getBoolean("bedrock-at-y-0", false);
         sculkShriekersToCryingObsidian = getBoolean("sculk-shriekers-to-crying-obsidian", false);
+        mapDarknessEffect = getBoolean("map-darkness-effect", true);
         suppressEmulationWarnings = getBoolean("suppress-emulation-warnings", false);
     }
 
@@ -100,6 +102,11 @@ public class ViaBackwardsConfig extends Config implements com.viaversion.viaback
         return sculkShriekersToCryingObsidian;
     }
 
+    @Override
+    public boolean mapDarknessEffect() {
+        return mapDarknessEffect;
+    }
+
     @Override
     public boolean suppressEmulationWarnings() {
         return suppressEmulationWarnings;

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsConfig.java

@@ -78,6 +78,13 @@ public interface ViaBackwardsConfig extends Config {
      */
     boolean sculkShriekerToCryingObsidian();
 
+    /**
+     * Maps the darkness effect to blindness for 1.18.2 clients on 1.19+ servers.
+     *
+     * @return true if enabled
+     */
+    boolean mapDarknessEffect();
+
     /**
      * Suppresses warnings of missing emulations for certain features that are not supported (e.g. world height in 1.17+).
      *

common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java

@@ -71,7 +71,7 @@ import java.util.logging.Logger;
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "5.1.1";
+    String MINIMUM_VV_VERSION = "5.1.2";
 
     /**
      * Initialize ViaBackwards.

common/src/main/java/com/viaversion/viabackwards/api/rewriters/EntityRewriterBase.java

@@ -240,7 +240,7 @@ public abstract class EntityRewriterBase<C extends ClientboundPacketType, T exte
     }
 
     protected PacketHandler getTrackerHandler(EntityType entityType) {
-        return wrapper -> tracker(wrapper.user()).addEntity((int) wrapper.get(Types.VAR_INT, 0), entityType);
+        return wrapper -> tracker(wrapper.user()).addEntity(wrapper.get(Types.VAR_INT, 0), entityType);
     }
 
     protected PacketHandler getPlayerTrackerHandler() {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/EntityPacketRewriter1_13.java

@@ -237,8 +237,10 @@ public class EntityPacketRewriter1_13 extends LegacyEntityRewriter<ClientboundPa
             positionAndLook.send(Protocol1_13To1_12_2.class);
         });
 
-        if (ViaBackwards.getConfig().isFix1_13FacePlayer()) {
         PacketHandler movementRemapper = wrapper -> {
+            if (!ViaBackwards.getConfig().isFix1_13FacePlayer()) {
+                return;
+            }
             final double x = wrapper.passthrough(Types.DOUBLE);
             final double y = wrapper.passthrough(Types.DOUBLE);
             final double z = wrapper.passthrough(Types.DOUBLE);
@@ -248,7 +250,6 @@ public class EntityPacketRewriter1_13 extends LegacyEntityRewriter<ClientboundPa
         protocol.registerServerbound(ServerboundPackets1_12_1.MOVE_PLAYER_POS_ROT, movementRemapper); // Player Position And Look (serverbound)
         protocol.registerServerbound(ServerboundPackets1_12_1.MOVE_VEHICLE, movementRemapper); // Vehicle Move (serverbound)
     }
-    }
 
     @Override
     protected void registerRewrites() {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/PlayerPacketRewriter1_13.java

@@ -469,7 +469,7 @@ public class PlayerPacketRewriter1_13 extends RewriterBase<Protocol1_13To1_12_2>
                     wrapper.write(Types.STRING, newChannel);
 
                     if (newChannel.equals("minecraft:register") || newChannel.equals("minecraft:unregister")) {
-                        String[] channels = new String(wrapper.read(Types.REMAINING_BYTES), StandardCharsets.UTF_8).split("\0");
+                        String[] channels = new String(wrapper.read(Types.SERVERBOUND_CUSTOM_PAYLOAD_DATA), StandardCharsets.UTF_8).split("\0");
                         List<String> rewrittenChannels = new ArrayList<>();
                         for (String s : channels) {
                             String rewritten = ItemPacketRewriter1_13.getNewPluginChannelId(s);
@@ -480,7 +480,7 @@ public class PlayerPacketRewriter1_13 extends RewriterBase<Protocol1_13To1_12_2>
                             }
                         }
                         if (!rewrittenChannels.isEmpty()) {
-                            wrapper.write(Types.REMAINING_BYTES, Joiner.on('\0').join(rewrittenChannels).getBytes(StandardCharsets.UTF_8));
+                            wrapper.write(Types.SERVERBOUND_CUSTOM_PAYLOAD_DATA, Joiner.on('\0').join(rewrittenChannels).getBytes(StandardCharsets.UTF_8));
                         } else {
                             wrapper.cancel();
                         }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/Protocol1_19To1_18_2.java

@@ -28,11 +28,11 @@ import com.viaversion.viabackwards.protocol.v1_19to1_18_2.rewriter.BlockItemPack
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.rewriter.CommandRewriter1_19;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.rewriter.EntityPacketRewriter1_19;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.DimensionRegistryStorage;
+import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.EntityTracker1_19;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.NonceStorage;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.RegistryType;
-import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
 import com.viaversion.viaversion.api.minecraft.signature.SignableCommandArgumentsProvider;
 import com.viaversion.viaversion.api.minecraft.signature.model.DecoratableMessage;
 import com.viaversion.viaversion.api.minecraft.signature.model.MessageMetadata;
@@ -40,7 +40,6 @@ import com.viaversion.viaversion.api.minecraft.signature.storage.ChatSession1_19
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers;
 import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.libs.gson.JsonElement;
 import com.viaversion.viaversion.protocols.base.ClientboundLoginPackets;
 import com.viaversion.viaversion.protocols.base.ServerboundLoginPackets;
@@ -364,7 +363,7 @@ public final class Protocol1_19To1_18_2 extends BackwardsProtocol<ClientboundPac
     @Override
     public void init(final UserConnection user) {
         user.put(new DimensionRegistryStorage());
-        addEntityTracker(user, new EntityTrackerBase(user, EntityTypes1_19.PLAYER));
+        addEntityTracker(user, new EntityTracker1_19(user));
     }
 
     @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java

@@ -20,9 +20,11 @@ package com.viaversion.viabackwards.protocol.v1_19to1_18_2.rewriter;
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.nbt.tag.ListTag;
 import com.viaversion.nbt.tag.NumberTag;
+import com.viaversion.viabackwards.ViaBackwards;
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.Protocol1_19To1_18_2;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.DimensionRegistryStorage;
+import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.EntityTracker1_19;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.LastDeathPosition;
 import com.viaversion.viabackwards.protocol.v1_19to1_18_2.storage.StoredPainting;
 import com.viaversion.viaversion.api.data.ParticleMappings;
@@ -111,6 +113,50 @@ public final class EntityPacketRewriter1_19 extends EntityRewriter<ClientboundPa
                 handler(wrapper -> {
                     // Remove factor data
                     wrapper.read(Types.OPTIONAL_NAMED_COMPOUND_TAG);
+
+                    if (!ViaBackwards.getConfig().mapDarknessEffect()) {
+                        return;
+                    }
+
+                    final EntityTracker1_19 tracker = tracker(wrapper.user());
+
+                    final int entityId = wrapper.get(Types.VAR_INT, 0);
+                    final int effectId = wrapper.get(Types.VAR_INT, 1);
+                    if (effectId == 33) { // Newly added darkness, rewrite to blindness
+                        tracker.getAffectedByDarkness().add(entityId);
+                        wrapper.set(Types.VAR_INT, 1, 15);
+                    } else if (effectId == 15) { // Track actual blindness effect for removal later
+                        tracker.getAffectedByBlindness().add(entityId);
+                    }
+                });
+            }
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_19.REMOVE_MOB_EFFECT, new PacketHandlers() {
+            @Override
+            protected void register() {
+                map(Types.VAR_INT); // Entity id
+                map(Types.VAR_INT); // Effect id
+                handler(wrapper -> {
+                    if (!ViaBackwards.getConfig().mapDarknessEffect()) {
+                        return;
+                    }
+
+                    final int entityId = wrapper.get(Types.VAR_INT, 0);
+                    final int effectId = wrapper.get(Types.VAR_INT, 1);
+
+                    final EntityTracker1_19 tracker = tracker(wrapper.user());
+                    if (effectId == 33) { // Remove darkness and the fake blindness effect if the client doesn't have actual blindness
+                        tracker.getAffectedByDarkness().rem(entityId);
+                        if (!tracker.getAffectedByBlindness().contains(entityId)) {
+                            wrapper.set(Types.VAR_INT, 1, 15);
+                        }
+                    } else if (effectId == 15) { // Remove blindness and cancel if the client has darkness (will be removed by darkness removal)
+                        tracker.getAffectedByBlindness().rem(entityId);
+                        if (tracker.getAffectedByDarkness().contains(entityId)) {
+                            wrapper.cancel();
+                        }
+                    }
                 });
             }
         });

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/storage/EntityTracker1_19.java

@@ -0,0 +1,49 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2024 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.v1_19to1_18_2.storage;
+
+import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_19;
+import com.viaversion.viaversion.data.entity.EntityTrackerBase;
+import com.viaversion.viaversion.libs.fastutil.ints.IntArrayList;
+import com.viaversion.viaversion.libs.fastutil.ints.IntList;
+
+public final class EntityTracker1_19 extends EntityTrackerBase {
+
+    private final IntList affectedByBlindness = new IntArrayList();
+    private final IntList affectedByDarkness = new IntArrayList();
+
+    public EntityTracker1_19(final UserConnection connection) {
+        super(connection, EntityTypes1_19.PLAYER);
+    }
+
+    @Override
+    public void removeEntity(final int id) {
+        super.removeEntity(id);
+        this.affectedByBlindness.rem(id);
+        this.affectedByDarkness.rem(id);
+    }
+
+    public IntList getAffectedByBlindness() {
+        return affectedByBlindness;
+    }
+
+    public IntList getAffectedByDarkness() {
+        return affectedByDarkness;
+    }
+}

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/Protocol1_21_2To1_21.java

@@ -86,7 +86,6 @@ public final class Protocol1_21_2To1_21 extends BackwardsProtocol<ClientboundPac
         new StatisticsRewriter<>(this).register(ClientboundPackets1_21_2.AWARD_STATS);
         new AttributeRewriter<>(this).register1_21(ClientboundPackets1_21_2.UPDATE_ATTRIBUTES);
 
-        translatableRewriter.registerOpenScreen(ClientboundPackets1_21_2.OPEN_SCREEN);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_ACTION_BAR_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_TITLE_TEXT);
         translatableRewriter.registerComponentPacket(ClientboundPackets1_21_2.SET_SUBTITLE_TEXT);

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java

@@ -56,6 +56,7 @@ import com.viaversion.viaversion.protocols.v1_21to1_21_2.packet.ClientboundPacke
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.util.Key;
+import com.viaversion.viaversion.util.Limit;
 import com.viaversion.viaversion.util.Unit;
 
 import static com.viaversion.viaversion.protocols.v1_21to1_21_2.rewriter.BlockItemPacketRewriter1_21_2.downgradeItemData;
@@ -101,8 +102,19 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             wrapper.write(Types.UNSIGNED_BYTE, (short) -1); // Player inventory
             wrapper.write(Types.VAR_INT, wrapper.user().get(InventoryStateIdStorage.class).stateId()); // State id; re-use the last known one
             wrapper.write(Types.SHORT, (short) -1); // Cursor
-            final Item item = wrapper.passthrough(Types1_21_2.ITEM);
-            handleItemToClient(wrapper.user(), item);
+            passthroughClientboundItem(wrapper);
+        });
+
+        protocol.registerClientbound(ClientboundPackets1_21_2.OPEN_SCREEN, wrapper -> {
+            wrapper.passthrough(Types.VAR_INT); // Id
+
+            final int containerType = wrapper.passthrough(Types.VAR_INT);
+            if (containerType == 21) {
+                // Track smithing table to remove new data
+                wrapper.user().get(InventoryStateIdStorage.class).setSmithingTableOpen(true);
+            }
+
+            protocol.getComponentRewriter().passthroughAndProcess(wrapper);
         });
 
         protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_SET_CONTENT, wrapper -> {
@@ -127,18 +139,31 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             wrapper.passthrough(Types.SHORT); // Slot id
             passthroughClientboundItem(wrapper);
         });
+        protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_SET_DATA, wrapper -> {
+            updateContainerId(wrapper);
+
+            if (wrapper.user().get(InventoryStateIdStorage.class).smithingTableOpen()) {
+                // Cancel new data for smithing table
+                wrapper.cancel();
+            }
+        });
+        protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_CLOSE, wrapper -> {
+            updateContainerId(wrapper);
+            wrapper.user().get(InventoryStateIdStorage.class).setSmithingTableOpen(false);
+        });
         protocol.registerClientbound(ClientboundPackets1_21_2.SET_HELD_SLOT, ClientboundPackets1_21.SET_CARRIED_ITEM);
-        protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_CLOSE, this::updateContainerId);
-        protocol.registerClientbound(ClientboundPackets1_21_2.CONTAINER_SET_DATA, this::updateContainerId);
         protocol.registerClientbound(ClientboundPackets1_21_2.HORSE_SCREEN_OPEN, this::updateContainerId);
-        protocol.registerServerbound(ServerboundPackets1_20_5.CONTAINER_CLOSE, this::updateContainerIdServerbound);
+        protocol.registerServerbound(ServerboundPackets1_20_5.CONTAINER_CLOSE, wrapper -> {
+            updateContainerIdServerbound(wrapper);
+            wrapper.user().get(InventoryStateIdStorage.class).setSmithingTableOpen(false);
+        });
         protocol.registerServerbound(ServerboundPackets1_20_5.CONTAINER_CLICK, wrapper -> {
             updateContainerIdServerbound(wrapper);
             wrapper.passthrough(Types.VAR_INT); // State id
             wrapper.passthrough(Types.SHORT); // Slot
             wrapper.passthrough(Types.BYTE); // Button
             wrapper.passthrough(Types.VAR_INT); // Mode
-            final int length = wrapper.passthrough(Types.VAR_INT);
+            final int length = Limit.max(wrapper.passthrough(Types.VAR_INT), 128);
             for (int i = 0; i < length; i++) {
                 wrapper.passthrough(Types.SHORT); // Slot
                 passthroughServerboundItem(wrapper);
@@ -162,6 +187,7 @@ public final class BlockItemPacketRewriter1_21_2 extends BackwardsStructuredItem
             wrapper.write(Types.VAR_INT, 0); // 0 state id
             final int slot = wrapper.read(Types.VAR_INT);
             wrapper.write(Types.SHORT, (short) slot);
+            passthroughClientboundItem(wrapper);
         });
 
         protocol.registerClientbound(ClientboundPackets1_21_2.EXPLODE, wrapper -> {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/EntityPacketRewriter1_21_2.java

@@ -390,7 +390,6 @@ public final class EntityPacketRewriter1_21_2 extends EntityRewriter<Clientbound
 
                 // New one
                 if (actions.get(6)) {
-                    actions.clear(6);
                     wrapper.read(Types.VAR_INT); // List order
                 }
             }

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/storage/InventoryStateIdStorage.java

@@ -21,6 +21,7 @@ import com.viaversion.viaversion.api.connection.StorableObject;
 
 public final class InventoryStateIdStorage implements StorableObject {
 
+    private boolean smithingTableOpen;
     private int stateId = -1;
 
     public int stateId() {
@@ -30,4 +31,12 @@ public final class InventoryStateIdStorage implements StorableObject {
     public void setStateId(final int stateId) {
         this.stateId = stateId;
     }
+
+    public boolean smithingTableOpen() {
+        return smithingTableOpen;
+    }
+
+    public void setSmithingTableOpen(final boolean smithingTableOpen) {
+        this.smithingTableOpen = smithingTableOpen;
+    }
 }

common/src/main/resources/assets/viabackwards/config.yml

@@ -28,5 +28,8 @@ bedrock-at-y-0: false
 # If disabled, the client will see them as end portal frames.
 sculk-shriekers-to-crying-obsidian: true
 #
+# Maps the darkness effect to blindness for 1.18.2 clients on 1.19+ servers.
+map-darkness-effect: true
+#
 # Suppresses warnings of missing emulations for certain features that are not supported (e.g. world height in 1.17+).
 suppress-emulation-warnings: false

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "5.1.1-SNAPSHOT"
+viaver = "5.1.2-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"
@@ -16,7 +16,7 @@ checkerQual = "3.39.0"
 paper = "1.16.5-R0.1-SNAPSHOT"
 velocity = "3.1.1"
 fabricLoader = "0.11.6"
-viaProxy = "3.3.5-SNAPSHOT"
+viaProxy = "3.3.5"
 
 [libraries]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=57dafb5c2622c6cc08b993c85b7c06956a2f53536432a30ead46166dbca0f1e9
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME