108 lines
5.7 KiB
Diff
108 lines
5.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: NanaChiyo0721 <nanachiyo0721@163.com>
|
|
Date: Mon, 17 Aug 2026 23:38:00 +0800
|
|
Subject: [PATCH] Leaves Vanilla hopper
|
|
|
|
Co-Authored-By: Creeam <102713261+HaHaWTH@users.noreply.github.com>
|
|
|
|
Original license: GPL-3.0-only
|
|
Original project: https://github.com/LeavesMC/Leaves
|
|
|
|
This is a temporary solution designed to attempt to restore the vanilla behavior of the funnel while preserving optimizations as much as possible. It should ultimately be replaced by the optimization solution provided by lithium.
|
|
|
|
diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
|
|
index a858cb658af70f07614fa1f4d9e8a3435d5c161f..5ab92e215c41f02c2a8260071f64dddae35dd15f 100644
|
|
--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
|
|
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
|
|
@@ -281,36 +281,67 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
|
|
ItemStack movedItem = origItemStack;
|
|
final int originalItemCount = origItemStack.getCount();
|
|
final int movedItemCount = Math.min(level.spigotConfig.hopperAmount, originalItemCount);
|
|
- container.setChanged(); // original logic always marks source inv as changed even if no move happens.
|
|
- movedItem.setCount(movedItemCount);
|
|
+ // Leaves start - Vanilla hopper
|
|
+ if (movedItemCount == 1) {
|
|
+ movedItem.setCount(movedItemCount);
|
|
+ if (!worldData.skipPullModeEventFire) {
|
|
+ movedItem = callPullMoveEvent(hopper, container, movedItem);
|
|
+ if (movedItem == null) { // cancelled
|
|
+ origItemStack.setCount(originalItemCount);
|
|
+ // Drastically improve performance by returning true.
|
|
+ // No plugin could have relied on the behavior of false as the other call
|
|
+ // site for IMIE did not exhibit the same behavior
|
|
+ return true;
|
|
+ }
|
|
+ }
|
|
+ final boolean removeOriginalItem = movedItem == origItemStack;
|
|
+ if (removeOriginalItem) {
|
|
+ movedItem = container.removeItem(i, movedItemCount);
|
|
+ }
|
|
|
|
- if (!worldData.skipPullModeEventFire) { // Folia - region threading
|
|
- movedItem = callPullMoveEvent(hopper, container, movedItem);
|
|
- if (movedItem == null) { // cancelled
|
|
- origItemStack.setCount(originalItemCount);
|
|
- // Drastically improve performance by returning true.
|
|
- // No plugin could have relied on the behavior of false as the other call
|
|
- // site for IMIE did not exhibit the same behavior
|
|
+ final int itemCountToMove = movedItem.getCount();
|
|
+ final ItemStack remainingItem = addItem(container, hopper, movedItem, null);
|
|
+ if (remainingItem.getCount() != itemCountToMove) {
|
|
+ origItemStack.setCount(removeOriginalItem ? originalItemCount - movedItemCount : originalItemCount);
|
|
+ container.setItem(i, origItemStack);
|
|
+ container.setChanged();
|
|
return true;
|
|
}
|
|
- }
|
|
-
|
|
- final ItemStack remainingItem = addItem(container, hopper, movedItem, null);
|
|
- final int remainingItemCount = remainingItem.getCount();
|
|
- if (remainingItemCount != movedItemCount) {
|
|
- origItemStack = origItemStack.copy(true);
|
|
origItemStack.setCount(originalItemCount);
|
|
- if (!origItemStack.isEmpty()) {
|
|
- origItemStack.setCount(originalItemCount - movedItemCount + remainingItemCount);
|
|
+ container.setItem(i, origItemStack);
|
|
+ } else {
|
|
+ container.setChanged(); // original logic always marks source inv as changed even if no move happens.
|
|
+ movedItem.setCount(movedItemCount);
|
|
+
|
|
+ if (!worldData.skipPullModeEventFire) {
|
|
+ movedItem = callPullMoveEvent(hopper, container, movedItem);
|
|
+ if (movedItem == null) { // cancelled
|
|
+ origItemStack.setCount(originalItemCount);
|
|
+ // Drastically improve performance by returning true.
|
|
+ // No plugin could have relied on the behavior of false as the other call
|
|
+ // site for IMIE did not exhibit the same behavior
|
|
+ return true;
|
|
+ }
|
|
}
|
|
|
|
- IGNORE_TILE_UPDATES.set(true); // Folia - region threading
|
|
- container.setItem(i, origItemStack);
|
|
- IGNORE_TILE_UPDATES.set(false); // Folia - region threading
|
|
- container.setChanged();
|
|
- return true;
|
|
+ final ItemStack remainingItem = addItem(container, hopper, movedItem, null);
|
|
+ final int remainingItemCount = remainingItem.getCount();
|
|
+ if (remainingItemCount != movedItemCount) {
|
|
+ origItemStack = origItemStack.copy(true);
|
|
+ origItemStack.setCount(originalItemCount);
|
|
+ if (!origItemStack.isEmpty()) {
|
|
+ origItemStack.setCount(originalItemCount - movedItemCount + remainingItemCount);
|
|
+ }
|
|
+
|
|
+ IGNORE_TILE_UPDATES.set(true); // Folia - region threading
|
|
+ container.setItem(i, origItemStack);
|
|
+ IGNORE_TILE_UPDATES.set(false); // Folia - region threading
|
|
+ container.setChanged();
|
|
+ return true;
|
|
+ }
|
|
+ origItemStack.setCount(originalItemCount);
|
|
}
|
|
- origItemStack.setCount(originalItemCount);
|
|
+ // Leaves end - Vanilla hopper
|
|
|
|
if (level.paperConfig().hopper.cooldownWhenFull) {
|
|
applyCooldown(hopper);
|