Skip to content

Make Stocking Inputs auto-pull largest first #2921

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
NepJr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make Stocking Inputs auto-pull largest first #2921

Show file tree
Hide file tree
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
16 changes: 15 additions & 1 deletion ...tech/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEStockingBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.util.ItemSorters;
import codechicken.lib.raytracer.CuboidRayTraceResult;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.function.Predicate;

Expand Down Expand Up @@ -216,9 +219,20 @@ private void refreshList() {
clearInventory(0);
return;
}

Comparator<IAEItemStack> c = ItemSorters.CONFIG_BASED_SORT_BY_SIZE;

List<IAEItemStack> items = new ArrayList<>();

for(IAEItemStack stack : storageList)
{
items.add(stack);
}

items.sort(c);

int index = 0;
for (IAEItemStack stack : storageList) {
for (IAEItemStack stack : items) {
if (index >= CONFIG_SIZE) break;
if (stack.getStackSize() == 0) continue;
stack = monitor.extractItems(stack, Actionable.SIMULATE, getActionSource());
Expand Down
16 changes: 15 additions & 1 deletion ...ch/common/metatileentities/multi/multiblockpart/appeng/MetaTileEntityMEStockingHatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,13 @@
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEFluidStack;
import appeng.api.storage.data.IItemList;
import appeng.fluids.util.FluidSorters;
import codechicken.lib.raytracer.CuboidRayTraceResult;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.function.Predicate;

Expand Down Expand Up @@ -183,9 +186,20 @@ private void refreshList() {
clearInventory(0);
return;
}

Comparator<IAEFluidStack> c = FluidSorters.CONFIG_BASED_SORT_BY_SIZE;

List<IAEFluidStack> fluids = new ArrayList<>();

for(IAEFluidStack stack : storageList)
{
fluids.add(stack);
}

fluids.sort(c);

int index = 0;
for (IAEFluidStack stack : storageList) {
for (IAEFluidStack stack : fluids) {
if (index >= CONFIG_SIZE) break;
if (stack.getStackSize() == 0) continue;
stack = monitor.extractItems(stack, Actionable.SIMULATE, getActionSource());
Expand Down