add ignore crafting mode button for wireless terminal (#226)

This commit is contained in:
MCTBL authored and GitHub committed 2024-08-27 07:48:32 +02:00
1 parent 1546f5f505
commit 9ca192722b
2 files changed
+57 -8

No files matched your search

@@ -14,6 +14,7 @@ import com.glodblock.github.inventory.gui.GuiType;
import com.glodblock.github.inventory.item.IWirelessTerminal;
import com.glodblock.github.util.BlockPos;
import appeng.api.config.CraftingMode;
import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
@@ -23,6 +24,7 @@ import appeng.container.ContainerOpenContext;
import appeng.container.implementations.ContainerCraftAmount;
import appeng.container.implementations.ContainerCraftConfirm;
import appeng.core.AELog;
import appeng.me.cache.CraftingGridCache;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
@@ -33,23 +35,32 @@ public class CPacketCraftRequest implements IMessage {
private long amount;
private boolean heldShift;
private CraftingMode craftingMode;
public CPacketCraftRequest() {}
public CPacketCraftRequest(final int craftAmt, final boolean shift) {
this(craftAmt, shift, CraftingMode.STANDARD);
}
public CPacketCraftRequest(final int craftAmt, final boolean shift, final CraftingMode craftingMode) {
amount = craftAmt;
heldShift = shift;
this.craftingMode = craftingMode;
}
@Override
public void toBytes(ByteBuf buf) {
buf.writeLong(amount);
buf.writeBoolean(heldShift);
buf.writeBoolean(this.craftingMode == CraftingMode.STANDARD);
}
@Override
public void fromBytes(ByteBuf buf) {
amount = buf.readLong();
heldShift = buf.readBoolean();
craftingMode = buf.readBoolean() ? CraftingMode.STANDARD : CraftingMode.IGNORE_MISSING;
}
public static class Handler implements IMessageHandler<CPacketCraftRequest, IMessage> {
@@ -77,12 +88,22 @@ public class CPacketCraftRequest implements IMessage {
Future<ICraftingJob> futureJob = null;
try {
final ICraftingGrid cg = g.getCache(ICraftingGrid.class);
futureJob = cg.beginCraftingJob(
cca.getWorld(),
cca.getGrid(),
cca.getActionSrc(),
cca.getItemToCraft(),
null);
if(cg instanceof CraftingGridCache cgc) {
futureJob = cgc.beginCraftingJob(
cca.getWorld(),
cca.getGrid(),
cca.getActionSrc(),
cca.getItemToCraft(),
message.craftingMode,
null);
}else {
futureJob = cg.beginCraftingJob(
cca.getWorld(),
cca.getGrid(),
cca.getActionSrc(),
cca.getItemToCraft(),
null);
}
final ContainerOpenContext context = cca.getOpenContext();
if (context != null) {