fix order missing ingredients & adapt to native essentia / stack type api (#60)

This commit is contained in:
lc-1337 authored and GitHub committed 2026-02-10 16:06:10 +01:00
1 parent 24954aebd4
commit 7bec51ad57
5 files changed
+27 -104

No files matched your search

@@ -149,9 +149,7 @@ public class NEECraftingPreviewHandler {
private void openCraftAmount(GuiContainer firstGui, ItemStack itemstack) {
final IAEItemStack aeItemStack = AEItemStack.create(itemstack);
if (this.modID.equals(ModIDs.ThE)) {
sendToArcaneCraftingerver(aeItemStack);
} else if (this.modID.equals(ModIDs.WCT)) {
if (this.modID.equals(ModIDs.WCT)) {
((AEBaseContainer) firstGui.inventorySlots).setTargetStack(aeItemStack);
sendToWirelessCraftingServer();
} else if (this.modID.equals("AE")) {
@@ -161,12 +159,6 @@ public class NEECraftingPreviewHandler {
}
@Optional.Method(modid = ModIDs.ThE)
protected void sendToArcaneCraftingerver(IAEItemStack aeItemStack) {
thaumicenergistics.common.network.packet.server.Packet_S_ArcaneCraftingTerminal
.sendAutoCraft(Minecraft.getMinecraft().thePlayer, aeItemStack);
}
@Optional.Method(modid = ModIDs.WCT)
protected void sendToWirelessCraftingServer() {
net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction packet = new net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction(
@@ -11,7 +11,6 @@ import net.minecraft.nbt.NBTTagCompound;
import com.github.vfyjxf.nee.block.tile.TilePatternInterface;
import com.github.vfyjxf.nee.utils.GuiUtils;
import com.github.vfyjxf.nee.utils.ModIDs;
import appeng.api.AEApi;
import appeng.api.config.CraftingMode;
@@ -21,29 +20,25 @@ import appeng.api.networking.IGridNode;
import appeng.api.networking.crafting.ICraftingGrid;
import appeng.api.networking.crafting.ICraftingJob;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.ISecurityGrid;
import appeng.api.networking.security.PlayerSource;
import appeng.api.networking.storage.IStorageGrid;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerOpenContext;
import appeng.container.ContainerSubGui;
import appeng.container.PrimaryGui;
import appeng.container.implementations.ContainerCraftConfirm;
import appeng.core.AELog;
import appeng.core.sync.GuiBridge;
import appeng.me.cache.CraftingGridCache;
import appeng.tile.inventory.AppEngInternalInventory;
import appeng.util.Platform;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import io.netty.buffer.ByteBuf;
import thaumicenergistics.common.ThEGuiHandler;
import thaumicenergistics.common.container.ContainerPartArcaneCraftingTerminal;
public class PacketCraftingRequest implements IMessage {
@@ -233,18 +228,9 @@ public class PacketCraftingRequest implements IMessage {
public void openCraftConfirm(Container container, IGrid grid, IAEItemStack requireToCraftStack,
EntityPlayerMP player) {
if (Loader.isModLoaded(ModIDs.ThE) && this.modID.equals(ModIDs.ThE)
&& container instanceof ContainerPartArcaneCraftingTerminal cpact) {
openTHContainerCraftConfirm(grid, requireToCraftStack, (IActionHost) cpact.terminal, player);
} else if (container instanceof AEBaseContainer baseContainer) {
if (Loader.isModLoaded(ModIDs.ThE) && this.modID.equals(ModIDs.ThE)) {
openTHContainerCraftConfirm(grid, requireToCraftStack, (IActionHost) baseContainer.getTarget(), player);
} else {
openAEContainerCraftConfirm(baseContainer, grid, requireToCraftStack, player);
}
if (container instanceof AEBaseContainer baseContainer) {
openAEContainerCraftConfirm(baseContainer, grid, requireToCraftStack, player);
}
}
private void openContainerCraftConfirm(IGrid grid, IAEItemStack requireToCraftStack, EntityPlayerMP player,
@@ -289,6 +275,8 @@ public class PacketCraftingRequest implements IMessage {
openContainerCraftConfirm(grid, requireToCraftStack, player, baseContainer.getActionSource(), job -> {
final ContainerOpenContext openContext = baseContainer.getOpenContext();
final PrimaryGui pGui = baseContainer instanceof ContainerSubGui ? baseContainer.getPrimaryGui()
: baseContainer.createPrimaryGui();
Platform.openGUI(
player,
openContext.getTile(),
@@ -297,23 +285,8 @@ public class PacketCraftingRequest implements IMessage {
baseContainer.getTargetSlotIndex());
if (player.openContainer instanceof ContainerCraftConfirm ccc) {
ccc.setPrimaryGui(baseContainer.createPrimaryGui());
ccc.setPrimaryGui(pGui);
}
});
}
@Optional.Method(modid = ModIDs.ThE)
private void openTHContainerCraftConfirm(IGrid grid, IAEItemStack requireToCraftStack, IActionHost host,
EntityPlayerMP player) {
openContainerCraftConfirm(
grid,
requireToCraftStack,
player,
new PlayerSource(player, host),
job -> {
ThEGuiHandler.launchGui(ThEGuiHandler.AUTO_CRAFTING_CONFIRM, player, player.worldObj, 0, 0, 0);
});
}
}
@@ -8,20 +8,15 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import com.github.vfyjxf.nee.utils.ItemUtils;
import com.github.vfyjxf.nee.utils.ModIDs;
import appeng.api.networking.IGrid;
import appeng.api.networking.energy.IEnergyGrid;
import appeng.api.networking.energy.IEnergySource;
import appeng.api.networking.security.BaseActionSource;
import appeng.api.networking.security.PlayerSource;
import appeng.api.storage.IMEMonitor;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.implementations.ContainerMEMonitorable;
import appeng.util.InventoryAdaptor;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.network.ByteBufUtils;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
@@ -29,7 +24,6 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException;
import io.netty.buffer.ByteBuf;
import thaumicenergistics.common.container.ContainerPartArcaneCraftingTerminal;
public class PacketNEIBookmark implements IMessage {
@@ -63,7 +57,7 @@ public class PacketNEIBookmark implements IMessage {
}
if (container instanceof ContainerMEMonitorable monitorable) {
final IMEMonitor<IAEItemStack> monitor = monitorable.getMonitor();
final IMEMonitor<IAEItemStack> monitor = monitorable.getItemMonitor();
if (monitor != null) {
final IEnergySource energy = monitorable.getPowerSource();
final BaseActionSource actionSource = monitorable.getActionSource();
@@ -86,30 +80,6 @@ public class PacketNEIBookmark implements IMessage {
}
}
} else if (Loader.isModLoaded(ModIDs.ThE) && container instanceof ContainerPartArcaneCraftingTerminal act) {
final IMEMonitor<IAEItemStack> monitor = getMonitor(container);
final IGrid grid = act.getHostGrid();
if (grid == null || monitor == null) return null;
final IEnergyGrid energy = grid.getCache(IEnergyGrid.class);
final BaseActionSource actionSource = new PlayerSource(player, act.terminal);
for (Object key : message.bookmarkItems.func_150296_c()) {
final ItemStack bookmarkItem = ItemUtils
.loadItemStackFromNBT(message.bookmarkItems.getCompoundTag((String) key));
bookmarkItem.stackSize = getFreeStackSize(player, bookmarkItem);
if (bookmarkItem.stackSize > 0) {
final AEItemStack requestStack = AEItemStack.create(bookmarkItem);
final IAEItemStack extractedStack = Platform
.poweredExtraction(energy, monitor, requestStack, actionSource);
if (extractedStack != null) {
InventoryAdaptor.getAdaptor(player, ForgeDirection.UNKNOWN)
.addItems(extractedStack.getItemStack());
}
}
}
}
return null;
@@ -16,16 +16,14 @@ import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.storage.data.IAEItemStack;
import appeng.api.storage.data.IItemList;
import appeng.api.storage.data.IAEStack;
import appeng.client.gui.implementations.GuiPatternTerm;
import appeng.client.me.ItemRepo;
import appeng.container.AEBaseContainer;
import appeng.container.implementations.ContainerPatternTerm;
import appeng.helpers.IContainerCraftingPacket;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.ReflectionHelper.UnableToFindFieldException;
import thaumicenergistics.common.container.ContainerPartArcaneCraftingTerminal;
/**
* @author vfyjxf
@@ -78,29 +76,28 @@ public class GuiUtils {
try {
@SuppressWarnings("unchecked")
final IItemList<IAEItemStack> list = (IItemList<IAEItemStack>) ReflectionHelper
final Iterable<IAEStack<?>> list = (Iterable<IAEStack<?>>) ReflectionHelper
.findField(ItemRepo.class, "list").get(repo);
for (IAEItemStack stack : list) {
if (predicate.test(stack)) {
storageStacks.add(stack.copy());
for (IAEStack<?> stack : list) {
if (stack instanceof IAEItemStack ais && predicate.test(ais)) {
storageStacks.add(ais.copy());
}
}
} catch (Exception e) {}
} catch (Exception ignored) {}
try {
final IAEItemStack[] pins = (IAEItemStack[]) ReflectionHelper.findField(ItemRepo.class, "pinsRepo")
final IAEStack<?>[] pins = (IAEStack<?>[]) ReflectionHelper.findField(ItemRepo.class, "pinsRepo")
.get(repo);
for (int i = 0; i < pins.length; i++) {
final IAEItemStack stack = pins[i];
if (stack != null && predicate.test(stack)) {
storageStacks.add(stack.copy());
for (final IAEStack<?> stack : pins) {
if (stack instanceof IAEItemStack ais && predicate.test(ais)) {
storageStacks.add(ais.copy());
}
}
} catch (Exception e) {}
} catch (Exception ignored) {}
}
}
@@ -109,25 +106,16 @@ public class GuiUtils {
}
public static IGrid getGrid(Container container) {
if (Loader.isModLoaded(ModIDs.ThE) && container instanceof ContainerPartArcaneCraftingTerminal act) {
final IGridNode gridNode = act.terminal.getGridNode(ForgeDirection.UNKNOWN);
if (container instanceof AEBaseContainer baseContainer
&& baseContainer.getTarget() instanceof IGridHost gridHost) {
final IGridNode gridNode = gridHost.getGridNode(ForgeDirection.UNKNOWN);
if (gridNode == null) {
return null;
}
return gridNode.getGrid();
} else if (container instanceof AEBaseContainer baseContainer
&& baseContainer.getTarget() instanceof IGridHost gridHost) {
final IGridNode gridNode = gridHost.getGridNode(ForgeDirection.UNKNOWN);
if (gridNode == null) {
return null;
}
return gridNode.getGrid();
}
}
return null;
}