diff --git a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerInventory.java b/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerInventory.java deleted file mode 100644 index 5e34f69a..00000000 --- a/src/main/java/de/florianmichael/viafabricplus/injection/mixin/fixes/minecraft/MixinPlayerInventory.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus - * Copyright (C) 2021-2024 FlorianMichael/EnZaXD and RK_01/RaphiMC - * Copyright (C) 2023-2024 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 . - */ - -package de.florianmichael.viafabricplus.injection.mixin.fixes.minecraft; - -import com.viaversion.viaversion.api.protocol.version.ProtocolVersion; -import de.florianmichael.viafabricplus.protocoltranslator.ProtocolTranslator; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.collection.DefaultedList; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.Slice; - -import java.util.AbstractList; - -@Mixin(PlayerInventory.class) -public abstract class MixinPlayerInventory { - - @Redirect(method = "", slice = @Slice(from = @At(value = "CONSTANT", args = "intValue=1")), at = @At(value = "INVOKE", target = "Lnet/minecraft/util/collection/DefaultedList;ofSize(ILjava/lang/Object;)Lnet/minecraft/util/collection/DefaultedList;", ordinal = 0)) - private DefaultedList redirectOffhandInventory(int size, T def) { - if (ProtocolTranslator.getTargetVersion().olderThanOrEqualTo(ProtocolVersion.v1_8)) { - //noinspection MixinInnerClass - return new DefaultedList<>(new AbstractList() { - @Override - public T get(int index) { - return def; - } - - @Override - public T set(int index, T element) { - return def; - } - - @Override - public int size() { - return 0; - } - }, def) { - }; - } else { - return DefaultedList.ofSize(size, def); - } - } - -} diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json index e111d1b7..c777d158 100644 --- a/src/main/resources/viafabricplus.mixins.json +++ b/src/main/resources/viafabricplus.mixins.json @@ -52,7 +52,6 @@ "fixes.minecraft.MixinLanguageManager", "fixes.minecraft.MixinMinecraftClient", "fixes.minecraft.MixinMouse", - "fixes.minecraft.MixinPlayerInventory", "fixes.minecraft.MixinPlayerListEntry", "fixes.minecraft.MixinPlayerPublicKey_PublicKeyData", "fixes.minecraft.MixinProfileKeysImpl",