Skip to content

Fix incorrect max stack size of depot #10584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Apertyotis wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
+5 −3
Open

Fix incorrect max stack size of depot #10584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/com/simibubi/create/content/logistics/depot/DepotBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.component.DataComponents;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.Tag;
Expand Down Expand Up @@ -59,7 +60,8 @@ public class DepotBehaviour extends BlockEntityBehaviour implements Clearable {

public DepotBehaviour(SmartBlockEntity be) {
super(be);
maxStackSize = () -> heldItem != null ? heldItem.stack.getMaxStackSize() : 64;
maxStackSize = () -> heldItem != null ?
heldItem.stack.getOrDefault(DataComponents.MAX_STACK_SIZE, 64) : 64;
canAcceptItems = () -> true;
canFunnelsPullFrom = $ -> true;
acceptedItems = $ -> true;
Expand Down Expand Up @@ -273,8 +275,8 @@ public int getRemainingSpace() {
int cumulativeStackSize = getPresentStackSize();
for (TransportedItemStack transportedItemStack : incoming)
cumulativeStackSize += transportedItemStack.stack.getCount();
int fromGetter =
Math.min(maxStackSize.get() == 0 ? 64 : maxStackSize.get(), getHeldItemStack().getMaxStackSize());
int fromGetter = Math.min(maxStackSize.get() == 0 ? 64 : maxStackSize.get(),
getHeldItemStack().getOrDefault(DataComponents.MAX_STACK_SIZE, 64));
return (fromGetter) - cumulativeStackSize;
}

Expand Down
Loading