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

Fixed Crafting for real, attempt 2.

Browse source
This commit is contained in:
AlgorithmX2 2014-07-28 21:51:52 -05:00
parent 9ae5477b90
commit 843b2cd9c5
7 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
container/ContainerOpenContext.java
View file

@ -1,7 +1,9 @@
package appeng.container;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import appeng.api.parts.IPart;
public class ContainerOpenContext
{
@ -9,5 +11,18 @@ public class ContainerOpenContext
public World w;
public int x, y, z;
public ForgeDirection side;
final public boolean isItem;
public ContainerOpenContext(Object myItem) {
boolean isWorld = myItem instanceof IPart || myItem instanceof TileEntity;
isItem = !isWorld;
}
public TileEntity getTile()
{
if ( isItem )
return null;
return w.getTileEntity( x, y, z );
}
}

2
container/implementations/ContainerCraftConfirm.java
View file

@ -336,7 +336,7 @@ public class ContainerCraftConfirm extends AEBaseContainer
// :(
}
TileEntity te = openContext.w.getTileEntity( openContext.x, openContext.y, openContext.z );
TileEntity te = openContext.getTile();
Platform.openGUI( invPlayer.player, te, openContext.side, OriginalGui );
}
}

10
core/sync/GuiBridge.java
View file

@ -284,12 +284,12 @@ public enum GuiBridge implements IGuiHandler
return null;
}
private Object updateGui(Object newContainer, World w, int x, int y, int z, ForgeDirection side)
private Object updateGui(Object newContainer, World w, int x, int y, int z, ForgeDirection side, Object myItem)
{
if ( newContainer instanceof AEBaseContainer )
{
AEBaseContainer bc = (AEBaseContainer) newContainer;
bc.openContext = new ContainerOpenContext();
bc.openContext = new ContainerOpenContext( myItem );
bc.openContext.w = w;
bc.openContext.x = x;
bc.openContext.y = y;
@ -311,7 +311,7 @@ public enum GuiBridge implements IGuiHandler
ItemStack it = player.inventory.getCurrentItem();
Object myItem = getGuiObject( it, player, w, x, y, z );
if ( myItem != null && ID.CorrectTileOrPart( myItem ) )
return updateGui( ID.ConstructContainer( player.inventory, side, myItem ), w, x, y, z, side );
return updateGui( ID.ConstructContainer( player.inventory, side, myItem ), w, x, y, z, side, myItem );
}
if ( ID.type.isTile() )
@ -322,12 +322,12 @@ public enum GuiBridge implements IGuiHandler
((IPartHost) TE).getPart( side );
IPart part = ((IPartHost) TE).getPart( side );
if ( ID.CorrectTileOrPart( part ) )
return updateGui( ID.ConstructContainer( player.inventory, side, part ), w, x, y, z, side );
return updateGui( ID.ConstructContainer( player.inventory, side, part ), w, x, y, z, side, part );
}
else
{
if ( ID.CorrectTileOrPart( TE ) )
return updateGui( ID.ConstructContainer( player.inventory, side, TE ), w, x, y, z, side );
return updateGui( ID.ConstructContainer( player.inventory, side, TE ), w, x, y, z, side, TE );
}
}

2
core/sync/packets/PacketCraftRequest.java
View file

@ -67,7 +67,7 @@ public class PacketCraftRequest extends AppEngPacket
ContainerOpenContext context = cca.openContext;
if ( context != null )
{
TileEntity te = context.w.getTileEntity( context.x, context.y, context.z );
TileEntity te = context.getTile();
Platform.openGUI( player, te, cca.openContext.side, GuiBridge.GUI_CRAFTING_CONFIRM );
if ( player.openContainer instanceof ContainerCraftConfirm )

2
core/sync/packets/PacketInventoryAction.java
View file

@ -52,7 +52,7 @@ public class PacketInventoryAction extends AppEngPacket
ContainerOpenContext context = aebc.openContext;
if ( context != null )
{
TileEntity te = context.w.getTileEntity( context.x, context.y, context.z );
TileEntity te = context.getTile();
Platform.openGUI( sender, te, aebc.openContext.side, GuiBridge.GUI_CRAFTING_AMOUNT );
if ( sender.openContainer instanceof ContainerCraftAmount )

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

@ -36,7 +36,7 @@ public class PacketSwitchGuis extends AppEngPacket
ContainerOpenContext context = bc.openContext;
if ( context != null )
{
TileEntity te = context.w.getTileEntity( context.x, context.y, context.z );
TileEntity te = context.getTile();
Platform.openGUI( player, te, context.side, newGui );
}
}

4
util/Platform.java
View file

@ -299,10 +299,6 @@ public class Platform
z = tile.zCoord;
}
// valid tile?
if ( !type.CorrectTileOrPart( tile ) )
tile = null;
if ( (type.getType().isItem() && tile == null) || type.hasPermissions( tile, x, y, z, side, p ) )
{
if ( tile == null )