Skip to content

Make machine capacity settable independently of the current inventory #891

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

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Make machine capacity settable independently of the current inventory #891

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
13 changes: 5 additions & 8 deletions src/main/java/aztech/modern_industrialization/inventory/ConfigurableItemStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
Expand Down Expand Up @@ -145,15 +146,10 @@ public long getCapacity() {

@Override
public long getRemainingCapacityFor(ItemVariant key) {
return Math.min(key.getMaxStackSize(), adjustedCapacity) - amount;
}

@Override
public void setAmount(long amount) {
super.setAmount(amount);
if (adjustedCapacity < amount) {
adjustedCapacity = (int) amount;
return 0; // Make sure we don't get negative counts if this happens!
}
return Math.min(key.getMaxStackSize(), adjustedCapacity) - amount;
}

/**
Expand All @@ -176,7 +172,8 @@ public void adjustCapacity(boolean isIncrease, boolean isShiftDown) {
if (!isIncrease) {
delta = -delta;
}
adjustedCapacity = Math.min(64, Math.max((int) amount, adjustedCapacity + delta));
adjustedCapacity = Mth.clamp(adjustedCapacity + delta, 0, 64);
notifyListeners();
}

public int getAdjustedCapacity() {
Expand Down
Loading