cha0s/FunctionalStorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support the Downgrade upgrade in the compacting drawer, closes #56

Browse Source
This commit is contained in:
Buuz135 2022-07-30 12:56:50 +02:00
parent 8a75d3ac38
commit fdd090b34b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/buuz135/functionalstorage/block/tile/CompactingDrawerTile.java
View File

@ -48,6 +48,11 @@ public class CompactingDrawerTile extends ControllableDrawerTile<CompactingDrawe
return CompactingDrawerTile.this.isVoid();
}
@Override
public boolean hasDowngrade() {
return CompactingDrawerTile.this.hasDowngrade();
}
@Override
public boolean isLocked() {
return CompactingDrawerTile.this.isLocked();

12
src/main/java/com/buuz135/functionalstorage/inventory/CompactingInventoryHandler.java
View File

@ -137,12 +137,16 @@ public abstract class CompactingInventoryHandler implements IItemHandler, INBTSe
@Override
public int getSlotLimit(int slot) {
if (slot == 3) return Integer.MAX_VALUE;
return (int) Math.min(Integer.MAX_VALUE, Math.floor((TOTAL_AMOUNT * getMultiplier()) / this.resultList.get(slot).getNeeded()));
int total = TOTAL_AMOUNT;
if (hasDowngrade()) total = 64 * 9 * 9;
return (int) Math.min(Integer.MAX_VALUE, Math.floor((total * getMultiplier()) / this.resultList.get(slot).getNeeded()));
}
public int getSlotLimitBase(int slot){
public int getSlotLimitBase(int slot) {
if (slot == 3) return Integer.MAX_VALUE;
return (int) Math.min(Integer.MAX_VALUE, Math.floor(TOTAL_AMOUNT / this.resultList.get(slot).getNeeded()));
int total = TOTAL_AMOUNT;
if (hasDowngrade()) total = 64 * 9 * 9;
return (int) Math.min(Integer.MAX_VALUE, Math.floor(total / this.resultList.get(slot).getNeeded()));
}
@Override
@ -198,4 +202,6 @@ public abstract class CompactingInventoryHandler implements IItemHandler, INBTSe
public ItemStack getParent() {
return parent;
}
public abstract boolean hasDowngrade();
}