NanaChiyo0721/Shiroha
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix compile err
Shiroha CI / build (push) Canceled after 0s
Details
Shiroha CI / Event File (push) Canceled after 0s
Details

Browse Source
This commit is contained in:
NanaChiyo0721
2026-08-17 23:55:29 +08:00
parent 2edb70257d
commit 0cc941be27
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shiroha-server/minecraft-patches/features/0056-Leaves-Vanilla-hopper.patch
+4 -4
View File
@@ -1,7 +1,7 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: NanaChiyo0721 <nanachiyo0721@163.com> From: NanaChiyo0721 <nanachiyo0721@163.com>
Date: Mon, 17 Aug 2026 23:38:00 +0800 Date: Mon, 17 Aug 2026 23:38:00 +0800
Subject: [PATCH] Leaves: Vanilla hopper Subject: [PATCH] Leaves Vanilla hopper
Co-Authored-By: Creeam <102713261+HaHaWTH@users.noreply.github.com> Co-Authored-By: Creeam <102713261+HaHaWTH@users.noreply.github.com>
@@ -11,7 +11,7 @@ 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. 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 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index a858cb658af70f07614fa1f4d9e8a3435d5c161f..9f7f8edaf3261cc0377dab33404ca1d30c548ff9 100644 index a858cb658af70f07614fa1f4d9e8a3435d5c161f..b418d11d5bff749c3eaf1b34c5727bfa8c295dbd 100644
--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/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 @@ -281,36 +281,67 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -21,10 +21,10 @@ index a858cb658af70f07614fa1f4d9e8a3435d5c161f..9f7f8edaf3261cc0377dab33404ca1d3
- container.setChanged(); // original logic always marks source inv as changed even if no move happens. - container.setChanged(); // original logic always marks source inv as changed even if no move happens.
- movedItem.setCount(movedItemCount); - movedItem.setCount(movedItemCount);
+ // Leaves start - Vanilla hopper + // Leaves start - Vanilla hopper
+ if (org.dreeam.leaf.config.modules.gameplay.VanillaHopper.enabled && movedItemCount == 1) { + if (movedItemCount == 1) {
+ movedItem.setCount(movedItemCount); + movedItem.setCount(movedItemCount);
+ container.setChanged(); + container.setChanged();
+ if (!skipPullModeEventFire) { + if (!worldData.skipPullModeEventFire) {
+ movedItem = callPullMoveEvent(hopper, container, movedItem); + movedItem = callPullMoveEvent(hopper, container, movedItem);
+ if (movedItem == null) { // cancelled + if (movedItem == null) { // cancelled
+ origItemStack.setCount(originalItemCount); + origItemStack.setCount(originalItemCount);
shiroha-server/minecraft-patches/features/0057-Leaves-Lithium-Sleeping-Block-Entity.patch
+1 -1
View File
@@ -1573,7 +1573,7 @@ index 6109d8da984b398bb1eb6cd6ab9a55f0511a615c..d3d6b3aeb24da7f3bf92c327095a9dc9
+ // Leaves end - Lithium Sleeping Block Entity + // Leaves end - Lithium Sleeping Block Entity
} }
diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index 9f7f8edaf3261cc0377dab33404ca1d30c548ff9..6dea8c7354708db69406575a03bf847e3e0b1194 100644 index b418d11d5bff749c3eaf1b34c5727bfa8c295dbd..5772a2d86343f3a82f0f3fd6ad01ecc823560377 100644
--- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -27,8 +27,29 @@ import net.minecraft.world.level.storage.ValueInput; @@ -27,8 +27,29 @@ import net.minecraft.world.level.storage.ValueInput;