xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integrate stack size logic directly into SlotPattern

Browse Source
This commit is contained in:
abel1502 2025-06-01 19:29:01 +03:00
parent d890443150
commit 8d7664f728
No known key found for this signature in database
GPG Key ID: 076926596A536338
11 changed files with 20 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/hbm/inventory/SlotPattern.java
View File

@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
public class SlotPattern extends Slot { public class SlotPattern extends Slot {
@ -24,6 +25,15 @@ public class SlotPattern extends Slot {
return 1; return 1;
} }
@Override
public void putStack(ItemStack stack) {
if (stack != null) {
stack = stack.copy();
stack.stackSize = 1;
}
super.putStack(stack);
}
public SlotPattern disableHover() { public SlotPattern disableHover() {
this.canHover = false; this.canHover = false;
return this; return this;

8
src/main/java/com/hbm/inventory/container/ContainerAutocrafter.java
View File

@ -74,13 +74,7 @@ public class ContainerAutocrafter extends ContainerBase {
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
autocrafter.matcher.initPatternSmart(autocrafter.getWorldObj(), slot.getStack(), index); autocrafter.matcher.initPatternSmart(autocrafter.getWorldObj(), slot.getStack(), index);
autocrafter.updateTemplateGrid(); autocrafter.updateTemplateGrid();

8
src/main/java/com/hbm/inventory/container/ContainerCartDestroyer.java
View File

@ -66,13 +66,7 @@ public class ContainerCartDestroyer extends Container {
if(slot.getHasStack()) if(slot.getHasStack())
ret = slot.getStack().copy(); ret = slot.getStack().copy();
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
return ret; return ret;
} }

8
src/main/java/com/hbm/inventory/container/ContainerCounterTorch.java
View File

@ -48,13 +48,7 @@ public class ContainerCounterTorch extends ContainerBase {
return ret; return ret;
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
radio.matcher.initPatternStandard(radio.getWorldObj(), slot.getStack(), index); radio.matcher.initPatternStandard(radio.getWorldObj(), slot.getStack(), index);
return ret; return ret;

8
src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java
View File

@ -105,13 +105,7 @@ public class ContainerCraneExtractor extends ContainerBase {
return ret; return ret;
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
extractor.matcher.initPatternStandard(extractor.getWorldObj(), slot.getStack(), index); extractor.matcher.initPatternStandard(extractor.getWorldObj(), slot.getStack(), index);
return ret; return ret;

8
src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java
View File

@ -100,13 +100,7 @@ public class ContainerCraneGrabber extends ContainerBase {
return ret; return ret;
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
grabber.matcher.initPatternStandard(grabber.getWorldObj(), slot.getStack(), index); grabber.matcher.initPatternStandard(grabber.getWorldObj(), slot.getStack(), index);
return ret; return ret;

8
src/main/java/com/hbm/inventory/container/ContainerCraneRouter.java
View File

@ -52,13 +52,7 @@ public class ContainerCraneRouter extends ContainerBase {
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
router.initPattern(slot.getStack(), index); router.initPattern(slot.getStack(), index);
return ret; return ret;

8
src/main/java/com/hbm/inventory/container/ContainerDroneRequester.java
View File

@ -85,13 +85,7 @@ public class ContainerDroneRequester extends ContainerCrateBase {
return ret; return ret;
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
requester.matcher.initPatternStandard(requester.getWorldObj(), slot.getStack(), index); requester.matcher.initPatternStandard(requester.getWorldObj(), slot.getStack(), index);
return ret; return ret;

8
src/main/java/com/hbm/inventory/container/ContainerMachineCustom.java
View File

@ -94,13 +94,7 @@ public class ContainerMachineCustom extends Container {
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
custom.matcher.initPatternSmart(player.worldObj, slot.getStack(), index - 10); custom.matcher.initPatternSmart(player.worldObj, slot.getStack(), index - 10);
return ret; return ret;

8
src/main/java/com/hbm/inventory/container/ContainerMassStorage.java
View File

@ -79,13 +79,7 @@ public class ContainerMassStorage extends ContainerBase {
if(storage.getStockpile() > 0) if(storage.getStockpile() > 0)
return ret; return ret;
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) {
slot.getStack().stackSize = 1;
}
slot.onSlotChanged();
return ret; return ret;
} }

4
src/main/java/com/hbm/inventory/container/ContainerPneumoTube.java
View File

@ -39,9 +39,7 @@ public class ContainerPneumoTube extends ContainerBase {
tube.nextMode(index); tube.nextMode(index);
return ret; return ret;
} else { } else {
slot.putStack(held != null ? held.copy() : null); slot.putStack(held);
if(slot.getHasStack()) slot.getStack().stackSize = 1;
slot.onSlotChanged();
tube.initPattern(slot.getStack(), index); tube.initPattern(slot.getStack(), index);
return ret; return ret;
} }