From 62b70303c4f7a7c0d1ddc7ac8c6a08f58acfa065 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Sat, 15 Jun 2024 20:59:08 +0200 Subject: [PATCH] Fixed ClassTransform issues --- .../injection/mixins/MixinItemPacketRewriter1_9.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java index 12ca9b8..945496e 100644 --- a/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java +++ b/src/main/java/net/raphimc/viaproxy/injection/mixins/MixinItemPacketRewriter1_9.java @@ -22,7 +22,6 @@ import com.viaversion.nbt.tag.CompoundTag; import com.viaversion.nbt.tag.ListTag; import com.viaversion.viaversion.api.minecraft.item.Item; import com.viaversion.viaversion.api.minecraft.item.data.ModifierData; -import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectMap; import com.viaversion.viaversion.libs.fastutil.ints.Int2ObjectOpenHashMap; import com.viaversion.viaversion.libs.gson.JsonElement; @@ -54,8 +53,13 @@ public abstract class MixinItemPacketRewriter1_9 extends ItemRewriter>> itemAttributes = new HashMap<>(); - public MixinItemPacketRewriter1_9(Protocol1_8To1_9 protocol, Type itemType, Type itemArrayType, Type mappedItemType, Type mappedItemArrayType) { + // TODO: ClassTransform bug: Constructor merging is broken + /*public MixinItemPacketRewriter1_9(Protocol1_8To1_9 protocol, Type itemType, Type itemArrayType, Type mappedItemType, Type mappedItemArrayType) { super(protocol, itemType, itemArrayType, mappedItemType, mappedItemArrayType); + }*/ + + public MixinItemPacketRewriter1_9(Protocol1_8To1_9 protocol) { + super(null, null, null, null, null); } @Inject(method = "", at = @At("RETURN"))