Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix onItemStackedOn not fired (#1211)

Browse Source
This commit is contained in:
IzzelAliz 2024-02-02 19:36:09 +08:00
parent 7a40f10737
commit 2d5fde2862
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/inventory/AbstractContainerMenuMixin.java
View File

@ -18,6 +18,7 @@ import net.minecraft.world.inventory.ContainerSynchronizer;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.common.ForgeHooks;
import net.minecraftforge.registries.ForgeRegistries;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v.entity.CraftHumanEntity;
@ -68,6 +69,7 @@ public abstract class AbstractContainerMenuMixin implements ContainerBridge {
@Shadow protected abstract SlotAccess createCarriedSlotAccess();
@Shadow public abstract void sendAllDataToRemote();
@Shadow public abstract int incrementStateId();
@Shadow protected abstract boolean tryItemClickBehaviourOverride(Player p_249615_, ClickAction p_250300_, Slot p_249384_, ItemStack p_251073_, ItemStack p_252026_);
// @formatter:on
public boolean checkReachable = true;
@ -245,7 +247,7 @@ public abstract class AbstractContainerMenuMixin implements ContainerBridge {
ItemStack itemstack10 = slot7.getItem();
ItemStack itemstack11 = this.getCarried();
player.updateTutorialInventoryAction(itemstack11, slot7.getItem(), clickaction);
if (!itemstack11.overrideStackedOnOther(slot7, clickaction, player) && !itemstack10.overrideOtherStackedOnMe(itemstack11, slot7, clickaction, player, this.createCarriedSlotAccess())) {
if (!this.tryItemClickBehaviourOverride(player, clickaction, slot7, itemstack10, itemstack11) && !ForgeHooks.onItemStackedOn(itemstack10, itemstack11, slot7, clickaction, player, this.createCarriedSlotAccess())) {
if (itemstack10.isEmpty()) {
if (!itemstack11.isEmpty()) {
int l2 = clickaction == ClickAction.PRIMARY ? itemstack11.getCount() : 1;