tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed Bug: #0737 - Searching and crafting

Browse source
This commit is contained in:
AlgorithmX2 2014-07-27 12:31:25 -05:00
parent 823fa4bd73
commit 4790ab51e0
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
container/implementations/ContainerCraftConfirm.java
View file

@ -34,6 +34,7 @@ import appeng.core.AELog;
import appeng.core.sync.GuiBridge; import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketMEInventoryUpdate; import appeng.core.sync.packets.PacketMEInventoryUpdate;
import appeng.core.sync.packets.PacketSwitchGuis;
import appeng.helpers.WirelessTerminalGuiObject; import appeng.helpers.WirelessTerminalGuiObject;
import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartCraftingTerminal;
import appeng.parts.reporting.PartPatternTerminal; import appeng.parts.reporting.PartPatternTerminal;
@ -326,6 +327,15 @@ public class ContainerCraftConfirm extends AEBaseContainer
autoStart = false; autoStart = false;
if ( g != null && OriginalGui != null && openContext != null ) if ( g != null && OriginalGui != null && openContext != null )
{ {
try
{
NetworkHandler.instance.sendTo( new PacketSwitchGuis( OriginalGui ), (EntityPlayerMP) invPlayer.player );
}
catch (IOException e)
{
// :(
}
TileEntity te = openContext.w.getTileEntity( openContext.x, openContext.y, openContext.z ); TileEntity te = openContext.w.getTileEntity( openContext.x, openContext.y, openContext.z );
Platform.openGUI( invPlayer.player, te, openContext.side, OriginalGui ); Platform.openGUI( invPlayer.player, te, openContext.side, OriginalGui );
} }

7
core/sync/packets/PacketSwitchGuis.java
View file

@ -42,11 +42,18 @@ public class PacketSwitchGuis extends AppEngPacket
} }
} }
@Override
public void clientPacketData(INetworkInfo network, AppEngPacket packet, EntityPlayer player)
{
AEBaseGui.switchingGuis = true;
}
// api // api
public PacketSwitchGuis(GuiBridge newGui) throws IOException { public PacketSwitchGuis(GuiBridge newGui) throws IOException {
this.newGui = newGui; this.newGui = newGui;
if ( Platform.isClient() )
AEBaseGui.switchingGuis = true; AEBaseGui.switchingGuis = true;
ByteBuf data = Unpooled.buffer(); ByteBuf data = Unpooled.buffer();