Skip to content

Commit 62cd54a

Browse files
Fix issues with multiblock inventory stacks going up to 99 (#6162)
This fixes all of the multiblock issues caused by the limit in NF classes being 99 items rather than 64.
1 parent 77c0f67 commit 62cd54a

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

src/main/java/blusunrize/immersiveengineering/common/blocks/multiblocks/logic/FermenterLogic.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public IFluidTank[] getInternalTanks()
327327
@Override
328328
public IItemHandlerModifiable getInventory()
329329
{
330-
return inventory.getRawHandler();
330+
return inventory;
331331
}
332332

333333
public FluidTank getTank()

src/main/java/blusunrize/immersiveengineering/common/blocks/multiblocks/logic/SqueezerLogic.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ public AveragingEnergyStorage getEnergy()
291291
@Override
292292
public IItemHandlerModifiable getInventory()
293293
{
294-
return inventory.getRawHandler();
294+
return inventory;
295295
}
296296

297297
@Override

src/main/java/blusunrize/immersiveengineering/common/blocks/multiblocks/logic/arcfurnace/ArcFurnaceInputHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public int getSlots()
9191
@Override
9292
public int getSlotLimit(int slot)
9393
{
94-
return wrapped.getSlotLimit(slot);
94+
return Math.min(64, wrapped.getSlotLimit(slot));
9595
}
9696

9797
@Override

src/main/java/blusunrize/immersiveengineering/common/blocks/multiblocks/logic/arcfurnace/ArcFurnaceLogic.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,13 @@ public static ComparatorManager<State> makeElectrodeComparator()
347347
public static class State implements IMultiblockState, ProcessContextInMachine<ArcFurnaceRecipe>
348348
{
349349
private final AveragingEnergyStorage energy = new AveragingEnergyStorage(ENERGY_CAPACITY);
350-
public ItemStackHandler inventory = new ItemStackHandler(NUM_SLOTS);
350+
public ItemStackHandler inventory = new ItemStackHandler(NUM_SLOTS){
351+
@Override
352+
public int getSlotLimit(int slot)
353+
{
354+
return 64;
355+
}
356+
};
351357
private final InMachineProcessor<ArcFurnaceRecipe> processor;
352358

353359
// Utilities

src/main/java/blusunrize/immersiveengineering/common/util/inventory/SlotwiseItemHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public ItemStack extractItem(int slot, int amount, boolean simulate)
9999
@Override
100100
public int getSlotLimit(int slot)
101101
{
102-
return rawHandler.getSlotLimit(slot);
102+
return Math.min(64, rawHandler.getSlotLimit(slot));
103103
}
104104

105105
@Override

src/main/java/blusunrize/immersiveengineering/common/util/inventory/WrappingItemHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public int getSlots()
6363
@Override
6464
public int getSlotLimit(int slot)
6565
{
66-
return wrapped.getSlotLimit(slot);
66+
return Math.min(64, wrapped.getSlotLimit(slot));
6767
}
6868

6969
@Override

0 commit comments

Comments
 (0)