The 1.20.5 attribute fix has been mostly moved into ViaVersion

Author: RaphiMC

src/main/java/net/raphimc/viaproxy/injection/mixins/MixinEntityPacketRewriter1_20_5.java

@@ -18,68 +18,31 @@
 
 package net.raphimc.viaproxy.injection.mixins;
 
-import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
-import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.api.type.Types;
-import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ClientboundPacket1_20_3;
-import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.Protocol1_20_3To1_20_5;
-import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.packet.ClientboundPackets1_20_5;
 import com.viaversion.viaversion.protocols.v1_20_3to1_20_5.rewriter.EntityPacketRewriter1_20_5;
-import com.viaversion.viaversion.rewriter.EntityRewriter;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
 
 import java.util.UUID;
 
 @Mixin(value = EntityPacketRewriter1_20_5.class, remap = false)
-public abstract class MixinEntityPacketRewriter1_20_5 extends EntityRewriter<ClientboundPacket1_20_3, Protocol1_20_3To1_20_5> {
-
-    @Shadow
-    @Final
-    private static UUID CREATIVE_BLOCK_INTERACTION_RANGE;
-
-    @Shadow
-    @Final
-    private static UUID CREATIVE_ENTITY_INTERACTION_RANGE;
-
-    protected MixinEntityPacketRewriter1_20_5(Protocol1_20_3To1_20_5 protocol) {
-        super(protocol);
-    }
+public abstract class MixinEntityPacketRewriter1_20_5 {
 
     @Shadow
     protected abstract void writeAttribute(PacketWrapper wrapper, String attributeId, double base, UUID modifierId, double amount);
 
-    /**
-     * @author RK_01
-     * @reason Fix interaction range and step height differences
-     */
-    @Overwrite
-    private void sendRangeAttributes(final UserConnection connection, final boolean creativeMode) {
-        final PacketWrapper updateAttributes = PacketWrapper.create(ClientboundPackets1_20_5.UPDATE_ATTRIBUTES, connection);
-        updateAttributes.write(Types.VAR_INT, this.tracker(connection).clientEntityId());
-        if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(ProtocolVersion.v1_7_6)) {
-            updateAttributes.write(Types.VAR_INT, 3); // Number of attributes
-            this.writeAttribute(updateAttributes, "generic.step_height", 0.5D, null, 0D);
-        } else {
-            updateAttributes.write(Types.VAR_INT, 2); // Number of attributes
-        }
-        if (connection.getProtocolInfo().serverProtocolVersion().olderThan(LegacyProtocolVersion.r1_0_0tor1_0_1)) {
-            this.writeAttribute(updateAttributes, "player.block_interaction_range", 4D, creativeMode ? CREATIVE_BLOCK_INTERACTION_RANGE : null, 1D);
-        } else {
-            this.writeAttribute(updateAttributes, "player.block_interaction_range", 4.5D, creativeMode ? CREATIVE_BLOCK_INTERACTION_RANGE : null, 0.5D);
-        }
-        if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
-            this.writeAttribute(updateAttributes, "player.entity_interaction_range", 3D, creativeMode ? CREATIVE_ENTITY_INTERACTION_RANGE : null, 3D);
-        } else if (connection.getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(ProtocolVersion.v1_13_2)) {
-            this.writeAttribute(updateAttributes, "player.entity_interaction_range", 3D, creativeMode ? CREATIVE_ENTITY_INTERACTION_RANGE : null, 1D);
+    @Redirect(method = "sendRangeAttributes", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/EntityPacketRewriter1_20_5;writeAttribute(Lcom/viaversion/viaversion/api/protocol/packet/PacketWrapper;Ljava/lang/String;DLjava/util/UUID;D)V"))
+    private void useLegacyValues(EntityPacketRewriter1_20_5 instance, PacketWrapper wrapper, String attributeId, double base, UUID modifierId, double amount) {
+        if (attributeId.equals("player.block_interaction_range") && wrapper.user().getProtocolInfo().serverProtocolVersion().olderThan(LegacyProtocolVersion.r1_0_0tor1_0_1)) {
+            this.writeAttribute(wrapper, attributeId, 4D, modifierId, 1D);
+        } else if (attributeId.equals("player.entity_interaction_range") && wrapper.user().getProtocolInfo().serverProtocolVersion().olderThanOrEqualTo(LegacyProtocolVersion.r1_6_4)) {
+            this.writeAttribute(wrapper, attributeId, 3D, modifierId, 3D);
         } else {
-            this.writeAttribute(updateAttributes, "player.entity_interaction_range", 3D, creativeMode ? CREATIVE_ENTITY_INTERACTION_RANGE : null, 2D);
+            this.writeAttribute(wrapper, attributeId, base, modifierId, amount);
         }
-        updateAttributes.scheduleSend(Protocol1_20_3To1_20_5.class);
     }
 
 }