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

Separated Crafting job into a worker thread.

Browse Source 
Crafting calculation can be canceled.
Hooked up a crafting calculation launch and the confirmation GUI.
This commit is contained in:
AlgorithmX2
2014-06-18 01:23:37 -05:00
parent 0a18f2d926
commit 32ee57c3a9
11 changed files with 320 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/sync/packets/PacketCraftRequest.java
+38
View File
@@ -4,9 +4,13 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.AEApi;
import appeng.api.config.Actionable;
@@ -14,18 +18,38 @@ import appeng.api.networking.IGrid;
import appeng.api.networking.IGridHost;
import appeng.api.networking.IGridNode;
import appeng.api.storage.data.IAEItemStack;
import appeng.container.ContainerOpenContext;
import appeng.container.implementations.ContainerCraftAmount;
import appeng.container.implementations.ContainerCraftConfirm;
import appeng.core.AELog;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.INetworkInfo;
import appeng.crafting.CraftingJob;
import appeng.me.cache.CraftingCache;
import appeng.util.Platform;
import appeng.util.item.AEItemStack;
public class PacketCraftRequest extends AppEngPacket
{
final public IAEItemStack slotItem;
final public static ExecutorService craftingPool;
static
{
ThreadFactory factory = new ThreadFactory() {
@Override
public Thread newThread(Runnable ar)
{
return new Thread( ar, "AE Crafting Calculator" );
}
};
craftingPool = Executors.newCachedThreadPool( factory );
}
// automatic.
public PacketCraftRequest(ByteBuf stream) throws IOException {
@@ -56,6 +80,20 @@ public class PacketCraftRequest extends AppEngPacket
{
CraftingJob cj = new CraftingJob( cca, slotItem, Actionable.SIMULATE );
ContainerOpenContext context = cca.openContext;
if ( context != null )
{
TileEntity te = context.w.getTileEntity( context.x, context.y, context.z );
Platform.openGUI( player, te, cca.openContext.side, GuiBridge.GUI_CRAFTING_CONFIRM );
if ( player.openContainer instanceof ContainerCraftConfirm )
{
ContainerCraftConfirm ccc = (ContainerCraftConfirm) player.openContainer;
ccc.job = craftingPool.submit( cj, cj );
cca.detectAndSendChanges();
}
}
}
catch (Throwable e)
{