From cf404d6d854aa5c22339b686638ad0d5159a884d Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Wed, 12 Aug 2020 16:18:48 +0800 Subject: [PATCH] Fix not opening trader menu. (#32) --- .../common/mixin/core/inventory/container/ContainerMixin.java | 4 ++-- .../inventory/container/HorseInventoryContainerMixin.java | 3 +-- .../mixin/core/inventory/container/LoomContainerMixin.java | 3 +-- .../core/inventory/container/MerchantContainerMixin.java | 3 +-- .../mixin/core/inventory/container/PlayerContainerMixin.java | 3 +-- .../core/inventory/container/ShulkerBoxContainerMixin.java | 3 +-- .../core/inventory/container/StonecutterContainerMixin.java | 3 +-- 7 files changed, 8 insertions(+), 14 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java index 3a843f91..f1d24658 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ContainerMixin.java @@ -131,8 +131,8 @@ public abstract class ContainerMixin implements ContainerBridge { InventoryView destination = ((ContainerBridge) other).bridge$getBukkitView(); ((IInventoryBridge) ((CraftInventory) source.getTopInventory()).getInventory()).onClose(player); ((IInventoryBridge) ((CraftInventory) source.getBottomInventory()).getInventory()).onClose(player); - ((IInventoryBridge) ((CraftInventory) destination.getTopInventory()).getInventory()).onClose(player); - ((IInventoryBridge) ((CraftInventory) destination.getBottomInventory()).getInventory()).onClose(player); + ((IInventoryBridge) ((CraftInventory) destination.getTopInventory()).getInventory()).onOpen(player); + ((IInventoryBridge) ((CraftInventory) destination.getBottomInventory()).getInventory()).onOpen(player); } private ITextComponent title; diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java index b076eefb..84a9e50f 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/HorseInventoryContainerMixin.java @@ -8,7 +8,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.HorseInventoryContainer; import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; -import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -32,7 +31,7 @@ public abstract class HorseInventoryContainerMixin extends ContainerMixin { } @Override - public InventoryView getBukkitView() { + public CraftInventoryView getBukkitView() { if (bukkitEntity != null) { return bukkitEntity; } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java index ad0f9371..dd89309b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java @@ -10,7 +10,6 @@ import net.minecraft.inventory.container.LoomContainer; import net.minecraft.util.IWorldPosCallable; import org.bukkit.craftbukkit.v.inventory.CraftInventoryLoom; import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; -import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -44,7 +43,7 @@ public abstract class LoomContainerMixin extends ContainerMixin implements LoomC } @Override - public InventoryView getBukkitView() { + public CraftInventoryView getBukkitView() { if (bukkitEntity != null) { return bukkitEntity; } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java index b5b2b10e..b4f0453b 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/MerchantContainerMixin.java @@ -9,7 +9,6 @@ import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.MerchantContainer; import org.bukkit.craftbukkit.v.inventory.CraftInventoryMerchant; import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; -import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -41,7 +40,7 @@ public abstract class MerchantContainerMixin extends ContainerMixin { } @Override - public InventoryView getBukkitView() { + public CraftInventoryView getBukkitView() { if (bukkitEntity == null) { bukkitEntity = new CraftInventoryView(((PlayerEntityBridge) this.playerInventory.player).bridge$getBukkitEntity(), new CraftInventoryMerchant(this.merchant, this.merchantInventory), (Container) (Object) this); } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java index 8aeabda0..69a7e3b2 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/PlayerContainerMixin.java @@ -13,7 +13,6 @@ import net.minecraft.inventory.container.PlayerContainer; import net.minecraft.util.text.TranslationTextComponent; import org.bukkit.craftbukkit.v.inventory.CraftInventoryCrafting; import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; -import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -46,7 +45,7 @@ public abstract class PlayerContainerMixin extends ContainerMixin { } @Override - public InventoryView getBukkitView() { + public CraftInventoryView getBukkitView() { if (bukkitEntity != null) { return bukkitEntity; } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java index 4fae46f1..5c5cf46c 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/ShulkerBoxContainerMixin.java @@ -7,7 +7,6 @@ import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ShulkerBoxContainer; import org.bukkit.craftbukkit.v.inventory.CraftInventory; import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; -import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -31,7 +30,7 @@ public abstract class ShulkerBoxContainerMixin extends ContainerMixin { } @Override - public InventoryView getBukkitView() { + public CraftInventoryView getBukkitView() { if (bukkitEntity != null) { return bukkitEntity; } diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java index 3d9cfb2b..fadd8fa4 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/StonecutterContainerMixin.java @@ -9,7 +9,6 @@ import net.minecraft.inventory.container.StonecutterContainer; import net.minecraft.util.IWorldPosCallable; import org.bukkit.craftbukkit.v.inventory.CraftInventoryStonecutter; import org.bukkit.craftbukkit.v.inventory.CraftInventoryView; -import org.bukkit.inventory.InventoryView; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -34,7 +33,7 @@ public abstract class StonecutterContainerMixin extends ContainerMixin { } @Override - public InventoryView getBukkitView() { + public CraftInventoryView getBukkitView() { if (bukkitEntity != null) { return bukkitEntity; }