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

Fix items being lost when trying to stack items in the player inventory.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-08-03 22:29:03 +02:00
parent 6f4722b393
commit 184fe8c1fc
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+20 -8
View File
@@ -95,8 +95,6 @@ public abstract class AEBaseContainer extends ScreenHandler {
private boolean sentCustomName; private boolean sentCustomName;
private int ticksSinceCheck = 900; private int ticksSinceCheck = 900;
private IAEItemStack clientRequestedTargetItem = null; private IAEItemStack clientRequestedTargetItem = null;
// Slots that were created to represent the player inventory
private List<Slot> playerInventorySlots = null;
public AEBaseContainer(ScreenHandlerType<?> containerType, int id, final PlayerInventory ip, public AEBaseContainer(ScreenHandlerType<?> containerType, int id, final PlayerInventory ip,
final BlockEntity myTile, final IPart myPart) { final BlockEntity myTile, final IPart myPart) {
@@ -264,25 +262,39 @@ public abstract class AEBaseContainer extends ScreenHandler {
} }
protected void bindPlayerInventory(final PlayerInventory playerInventory, final int offsetX, final int offsetY) { protected void bindPlayerInventory(final PlayerInventory playerInventory, final int offsetX, final int offsetY) {
FixedItemInv ih = new FixedInventoryVanillaWrapper(playerInventory); FixedItemInv ih = new FixedInventoryVanillaWrapper(playerInventory) {
// Vanilla needs this to be modifiable otherwise stacking will eat items.
// FIXME FABRIC: Remove when LBA makes these mutable as per
// ModifiableFixedItemInv
@Override
public ItemStack getInvStack(int slot) {
return playerInventory.getStack(slot);
}
};
// bind player inventory // bind player inventory
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
for (int j = 0; j < 9; j++) { for (int j = 0; j < 9; j++) {
if (this.locked.contains(j + i * 9 + 9)) { int invSlot = j + i * 9 + 9;
this.addSlot(new DisabledSlot(ih, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18)); int x = 8 + j * 18 + offsetX;
int y = offsetY + i * 18;
if (this.locked.contains(invSlot)) {
this.addSlot(new DisabledSlot(ih, invSlot, x, y));
} else { } else {
this.addSlot(new PlayerInvSlot(ih, j + i * 9 + 9, 8 + j * 18 + offsetX, offsetY + i * 18)); this.addSlot(new PlayerInvSlot(ih, invSlot, x, y));
} }
} }
} }
// bind player hotbar // bind player hotbar
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
int x = 8 + i * 18 + offsetX;
int y = 58 + offsetY;
if (this.locked.contains(i)) { if (this.locked.contains(i)) {
this.addSlot(new DisabledSlot(ih, i, 8 + i * 18 + offsetX, 58 + offsetY)); this.addSlot(new DisabledSlot(ih, i, x, y));
} else { } else {
this.addSlot(new PlayerHotBarSlot(ih, i, 8 + i * 18 + offsetX, 58 + offsetY)); this.addSlot(new PlayerHotBarSlot(ih, i, x, y));
} }
} }
} }
src/main/java/appeng/container/slot/PlayerInvSlot.java
+2 -3
View File
@@ -21,11 +21,10 @@ package appeng.container.slot;
import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.FixedItemInv;
// there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot. // there is nothing special about this slot, its simply used to represent the players inventory, vs a container slot.
public class PlayerInvSlot extends AppEngSlot { public class PlayerInvSlot extends AppEngSlot {
public PlayerInvSlot(final FixedItemInv par1iInventory, final int invSlot, final int x, final int y) { public PlayerInvSlot(final FixedItemInv inv, final int invSlot, final int x, final int y) {
super(par1iInventory, invSlot, x, y); super(inv, invSlot, x, y);
this.setPlayerSide(true); this.setPlayerSide(true);
} }