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

Fix ME Portable Cell voiding/dupes & disabled slot idiocy

Browse Source 
Fixes #383, fixes #299
This commit is contained in:
NotMyWing
2025-03-18 18:22:03 +11:00
parent f42a5778d2
commit f1e5a33a6e
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java
+2 -1
View File
@@ -20,13 +20,14 @@ package appeng.client.gui.implementations;
import appeng.api.implementations.guiobjects.IPortableCell; import appeng.api.implementations.guiobjects.IPortableCell;
import appeng.container.implementations.ContainerMEPortableCell;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
public class GuiMEPortableCell extends GuiMEMonitorable { public class GuiMEPortableCell extends GuiMEMonitorable {
public GuiMEPortableCell(final InventoryPlayer inventoryPlayer, final IPortableCell te) { public GuiMEPortableCell(final InventoryPlayer inventoryPlayer, final IPortableCell te) {
super(inventoryPlayer, te); super(inventoryPlayer, te, new ContainerMEPortableCell(inventoryPlayer, te));
} }
@Override @Override
src/main/java/appeng/container/AEBaseContainer.java
+5 -1
View File
@@ -961,8 +961,12 @@ public abstract class AEBaseContainer extends Container {
@Override @Override
public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, @NotNull EntityPlayer player) { public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, @NotNull EntityPlayer player) {
final var slot = this.getSlot(slotId);
if (slot instanceof SlotDisabled) {
return ItemStack.EMPTY;
}
if (slotId >= 0 && clickTypeIn == ClickType.PICKUP) { if (slotId >= 0 && clickTypeIn == ClickType.PICKUP) {
final var slot = this.getSlot(slotId);
if (slot instanceof AppEngSlot appEngSlot) { if (slot instanceof AppEngSlot appEngSlot) {
var slotStack = slot.getStack(); var slotStack = slot.getStack();
var draggedStack = this.invPlayer.getItemStack(); var draggedStack = this.invPlayer.getItemStack();