fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip interfaces stacksizes

Browse Source
This commit is contained in:
PrototypeTrousers
2022-10-12 04:48:02 -03:00
parent 9ac4ea4e6e
commit 2e9a5dc8ea
5 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+4 -10
View File
@@ -545,23 +545,20 @@ public abstract class AEBaseContainer extends Container {
switch (action) {
case PICKUP_OR_SET_DOWN:
if (hand.isEmpty()) {
s.putStack(ItemStack.EMPTY);
} else {
s.putStack(hand.copy());
}
break;
case PLACE_SINGLE:
if (!hand.isEmpty()) {
final ItemStack is = hand.copy();
is.setCount(1);
s.putStack(is);
} else {
final ItemStack is = s.getStack().copy();
if (is.getCount() < is.getMaxStackSize())
if (is.getCount() < is.getMaxStackSize() * 8)
is.grow(1);
s.putStack(is);
}
@@ -575,7 +572,6 @@ public abstract class AEBaseContainer extends Container {
}
break;
case SPLIT_OR_PLACE_SINGLE:
ItemStack is = s.getStack();
if (!is.isEmpty()) {
if (hand.isEmpty()) {
@@ -586,14 +582,12 @@ public abstract class AEBaseContainer extends Container {
is = hand.copy();
is.setCount(1);
}
s.putStack(is);
} else if (!hand.isEmpty()) {
is = hand.copy();
is.setCount(1);
s.putStack(is);
}
break;
case CREATIVE_DUPLICATE:
case MOVE_REGION:
@@ -606,9 +600,9 @@ public abstract class AEBaseContainer extends Container {
if (action == InventoryAction.MOVE_REGION) {
final List<Slot> from = new ArrayList<>();
for (final Object j : this.inventorySlots) {
if (j instanceof Slot && j.getClass() == s.getClass() && !(j instanceof SlotCraftingTerm)) {
from.add((Slot) j);
for (final Slot j : this.inventorySlots) {
if (j != null && j.getClass() == s.getClass() && !(j instanceof SlotCraftingTerm)) {
from.add(j);
}
}
src/main/java/appeng/container/implementations/ContainerInterfaceConfigurationTerminal.java
+4 -1
View File
@@ -184,7 +184,7 @@ public final class ContainerInterfaceConfigurationTerminal extends AEBaseContain
}
break;
case PLACE_SINGLE:
if (inSlot.getMaxStackSize() > inSlot.getCount()) {
if (inSlot.getCount() < inSlot.getMaxStackSize() * 8) {
inSlot.grow(1);
ItemHandlerUtil.setStackInSlot(theSlot, 0, inSlot);
}
@@ -299,6 +299,9 @@ public final class ContainerInterfaceConfigurationTerminal extends AEBaseContain
if (!is.isEmpty()) {
is.writeToNBT(itemNBT);
if (is.getCount() > is.getMaxStackSize()) {
itemNBT.setInteger("stackSize", is.getCount());
}
}
tag.setTag(Integer.toString(x + offset), itemNBT);