From 8c68e11cee66ee9bd62624cbaf16f55731f43a38 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sun, 10 Dec 2023 12:26:52 +0100 Subject: [PATCH] Updated Via API usage --- gradle.properties | 2 +- ...ocol1_20_3To1_20_2.java => MixinComponentConverter.java} | 6 +++--- src/main/resources/viafabricplus.mixins.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/{MixinProtocol1_20_3To1_20_2.java => MixinComponentConverter.java} (94%) diff --git a/gradle.properties b/gradle.properties index eef0bdaf..4c015504 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ maven_group=de.florianmichael archives_base_name=viafabricplus # ViaVersion Libraries -viaversion_version=4.9.2 +viaversion_version=4.9.3-SNAPSHOT viabackwards_version=4.9.2-SNAPSHOT vialegacy_version=2.2.22-SNAPSHOT viaaprilfools_version=2.0.11-SNAPSHOT diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_2.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinComponentConverter.java similarity index 94% rename from src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_2.java rename to src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinComponentConverter.java index 4a401630..1af226f0 100644 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinProtocol1_20_3To1_20_2.java +++ b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/viaversion/MixinComponentConverter.java @@ -21,7 +21,7 @@ package de.florianmichael.viafabricplus.injection.mixin.fixes.viaversion; import com.viaversion.viaversion.libs.gson.JsonElement; import com.viaversion.viaversion.libs.gson.JsonNull; import com.viaversion.viaversion.libs.opennbt.tag.builtin.Tag; -import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.Protocol1_20_3To1_20_2; +import com.viaversion.viaversion.protocols.protocol1_20_3to1_20_2.util.ComponentConverter; import net.lenni0451.mcstructs.text.ATextComponent; import net.lenni0451.mcstructs.text.serializer.TextComponentCodec; import net.lenni0451.mcstructs.text.serializer.TextComponentSerializer; @@ -30,8 +30,8 @@ import net.raphimc.vialegacy.api.util.converter.NbtConverter; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -@Mixin(value = Protocol1_20_3To1_20_2.class, remap = false) -public abstract class MixinProtocol1_20_3To1_20_2 { +@Mixin(value = ComponentConverter.class, remap = false) +public abstract class MixinComponentConverter { /** * @author RK_01 diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index dd27874c..f833f1ee 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -170,6 +170,7 @@ "fixes.viaversion.MixinChatItemRewriter", "fixes.viaversion.MixinCommandBlockProvider", "fixes.viaversion.MixinCommonBoss", + "fixes.viaversion.MixinComponentConverter", "fixes.viaversion.MixinEntityIdRewriter", "fixes.viaversion.MixinEntityPackets1_17", "fixes.viaversion.MixinEntityPackets1_19_4", @@ -185,7 +186,6 @@ "fixes.viaversion.MixinProtocol1_11To1_10", "fixes.viaversion.MixinProtocol1_12To1_11_1", "fixes.viaversion.MixinProtocol1_20_2To1_20", - "fixes.viaversion.MixinProtocol1_20_3To1_20_2", "fixes.viaversion.MixinTagType", "fixes.viaversion.MixinUserConnectionImpl", "fixes.viaversion.MixinWorldPackets1_16_2",