Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-11-22 11:53:29 +01:00
Code Issues Projects Releases Wiki Activity

improved the storage drawer handling from 239aa499c4

Browse source
This commit is contained in:
Ell 2022-10-24 13:39:01 +02:00
parent 239aa499c4
commit 3d65dc34db
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/de/ellpeck/prettypipes/pipe/PipeBlockEntity.java
View file

@ -39,7 +39,6 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.Lazy; import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.ItemStackHandler;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
@ -198,10 +197,27 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
continue; continue;
if (!force && this.streamModules().anyMatch(m -> !m.getRight().canAcceptItem(m.getLeft(), this, stack, dir, handler))) if (!force && this.streamModules().anyMatch(m -> !m.getRight().canAcceptItem(m.getLeft(), this, stack, dir, handler)))
continue; continue;
var remain = ItemHandlerHelper.insertItem(handler, stack, true);
var startSlot = 0;
var slotAmount = handler.getSlots();
// the 0th slot of a storage drawer is a "catch-all" for any items that can be inserted into the drawer, and all
// subsequent slots are the actual slots for the items. this causes a problem because the drawer will seem to have
// space for more items that it actually does, so we restrict to only inspecting the 0th slot here.
// see https://github.com/Ellpeck/PrettyPipes/issues/131#issuecomment-1288653623 and Discord convo with Quinteger
if (handler.getClass().getName().equals("com.jaquadro.minecraft.storagedrawers.capabilities.DrawerItemHandler"))
slotAmount = 1;
// check how many items from the stack we can insert into this destination in total
var remain = stack;
for (var i = startSlot; i < slotAmount; i++) {
remain = handler.insertItem(i, remain, true);
if (remain.isEmpty())
break;
}
// did we insert anything? // did we insert anything?
if (remain.getCount() == stack.getCount()) if (remain.getCount() == stack.getCount())
continue; continue;
var toInsert = stack.copy(); var toInsert = stack.copy();
toInsert.shrink(remain.getCount()); toInsert.shrink(remain.getCount());
// limit to the max amount that modules allow us to insert // limit to the max amount that modules allow us to insert
@ -223,7 +239,7 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
} }
// totalSpace will be the amount of items that fit into the attached container // totalSpace will be the amount of items that fit into the attached container
var totalSpace = 0; var totalSpace = 0;
for (var i = 0; i < handler.getSlots(); i++) { for (var i = startSlot; i < slotAmount; i++) {
var copy = stack.copy(); var copy = stack.copy();
var maxStackSize = copy.getMaxStackSize(); var maxStackSize = copy.getMaxStackSize();
// if the container can store more than 64 items in this slot, then it's likely // if the container can store more than 64 items in this slot, then it's likely
@ -236,7 +252,6 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
// have space for items of other types, but it'll be good enough for us // have space for items of other types, but it'll be good enough for us
var left = handler.insertItem(i, copy, true); var left = handler.insertItem(i, copy, true);
totalSpace += maxStackSize - left.getCount(); totalSpace += maxStackSize - left.getCount();
} }
// if the items on the way plus the items we're trying to move are too much, reduce // if the items on the way plus the items we're trying to move are too much, reduce
if (onTheWay + toInsert.getCount() > totalSpace) if (onTheWay + toInsert.getCount() > totalSpace)
@ -244,13 +259,6 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
} }
} }
// the 0th slot of a storage drawer is a "catch-all" for any items that can be inserted into the drawer, and all
// subsequent slots are the actual slots for the items. this causes a problem because the drawer will seem to have
// space for twice the amount of items that it actually does.
// see https://github.com/Ellpeck/PrettyPipes/issues/131#issuecomment-1288653623 and Discord convo with Quinteger
if (handler.getClass().getName().equals("com.jaquadro.minecraft.storagedrawers.capabilities.DrawerItemHandler"))
toInsert.setCount(toInsert.getCount() / 2);
// we return the item that can actually be inserted, NOT the remainder! // we return the item that can actually be inserted, NOT the remainder!
if (!toInsert.isEmpty()) if (!toInsert.isEmpty())
return Pair.of(offset, toInsert); return Pair.of(offset, toInsert);