Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-12-25 16:29:23 +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 1e3ec07167
commit 7c14c7f175
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.gradle
View file

@ -111,6 +111,9 @@ dependencies {
compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.5.174:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.5.174")
// test storage drawers
runtimeOnly fg.deobf("curse.maven:storage-drawers-223852:3807626")
// to test the rf requiring and crafting stuff
/* runtimeOnly fg.deobf("curse.maven:powah-352656:3057732")
runtimeOnly fg.deobf("curse.maven:lollipop-347954:3057731")

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

@ -40,7 +40,6 @@ import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.ItemStackHandler;
import org.apache.commons.lang3.tuple.Pair;
@ -199,10 +198,27 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
continue;
if (!force && this.streamModules().anyMatch(m -> !m.getRight().canAcceptItem(m.getLeft(), this, stack, dir, handler)))
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?
if (remain.getCount() == stack.getCount())
continue;
var toInsert = stack.copy();
toInsert.shrink(remain.getCount());
// limit to the max amount that modules allow us to insert
@ -224,7 +240,7 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
}
// totalSpace will be the amount of items that fit into the attached container
var totalSpace = 0;
for (var i = 0; i < handler.getSlots(); i++) {
for (var i = startSlot; i < slotAmount; i++) {
var copy = stack.copy();
var maxStackSize = copy.getMaxStackSize();
// if the container can store more than 64 items in this slot, then it's likely
@ -243,6 +259,7 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
toInsert.setCount(totalSpace - onTheWay);
}
}
// we return the item that can actually be inserted, NOT the remainder!
if (!toInsert.isEmpty())
return Pair.of(offset, toInsert);