From 27e66a41636ae8f51d3545eb433cb5ae8626e884 Mon Sep 17 00:00:00 2001
From: RaphiMC <50594595+RaphiMC@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:23:25 +0100
Subject: [PATCH] Updated VV API usage

---
 .../mixins/MixinBlockItemPacketRewriter1_20_5.java     | 10 ----------
 ..._2.java => MixinBlockItemPacketRewriter1_21_4.java} |  6 +++---
 2 files changed, 3 insertions(+), 13 deletions(-)
 rename src/main/java/net/raphimc/viaproxy/injection/mixins/{MixinBlockItemPacketRewriter1_21_2.java => MixinBlockItemPacketRewriter1_21_4.java} (88%)

diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
index 01864d3..66ff5f9 100644
--- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
+++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_20_5.java
@@ -44,7 +44,6 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.*;
@@ -115,15 +114,6 @@ public abstract class MixinBlockItemPacketRewriter1_20_5 extends ItemRewriter<Cl
         }, ViaLoadingEvent.class);
     }
 
-    @Redirect(method = "appendItemDataFixComponents", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;olderThanOrEqualTo(Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;)Z"))
-    private boolean changeSwordFixVersionRange(ProtocolVersion instance, ProtocolVersion other) {
-        if (other == ProtocolVersion.v1_8) {
-            return instance.betweenInclusive(LegacyProtocolVersion.b1_8tob1_8_1, ProtocolVersion.v1_8);
-        } else {
-            return instance.olderThanOrEqualTo(other);
-        }
-    }
-
     @Inject(method = "appendItemDataFixComponents", at = @At("RETURN"))
     private void appendItemDataFixComponents(UserConnection user, Item item, CallbackInfo ci) {
         final StructuredDataContainer data = item.dataContainer();
diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_21_2.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_21_4.java
similarity index 88%
rename from src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_21_2.java
rename to src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_21_4.java
index f4e988b..48938de 100644
--- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_21_2.java
+++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinBlockItemPacketRewriter1_21_4.java
@@ -18,14 +18,14 @@
 package net.raphimc.viaproxy.injection.mixins;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
-import com.viaversion.viaversion.protocols.v1_21to1_21_2.rewriter.BlockItemPacketRewriter1_21_2;
+import com.viaversion.viaversion.protocols.v1_21_2to1_21_4.rewriter.BlockItemPacketRewriter1_21_4;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(value = BlockItemPacketRewriter1_21_2.class, remap = false)
-public abstract class MixinBlockItemPacketRewriter1_21_2 {
+@Mixin(value = BlockItemPacketRewriter1_21_4.class, remap = false)
+public abstract class MixinBlockItemPacketRewriter1_21_4 {
 
     @Redirect(method = "appendItemDataFixComponents", at = @At(value = "INVOKE", target = "Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;olderThanOrEqualTo(Lcom/viaversion/viaversion/api/protocol/version/ProtocolVersion;)Z"))
     private boolean changeSwordFixVersionRange(ProtocolVersion instance, ProtocolVersion other) {