Conflicts:
	core/localization/GuiText.java
	core/sync/AppEngPacketHandlerBase.java
This commit is contained in:
AlgorithmX2
2014-05-03 14:12:19 -05:00
50 changed files with 1652 additions and 148 deletions
+5
View File
@@ -65,6 +65,11 @@ public abstract class AEBaseContainer extends Container
int ticksSinceCheck = 900;
public BaseActionSource getSource()
{
return mySrc;
}
public void verifyPermissions(SecurityPermissions security, boolean requirePower)
{
if ( Platform.isClient() )
@@ -22,7 +22,7 @@ public class ContainerCraftingTerm extends ContainerMEMonitorable implements IAE
SlotCraftingMatrix craftingSlots[] = new SlotCraftingMatrix[9];
SlotCraftingTerm outputSlot;
PartCraftingTerminal ct;
public PartCraftingTerminal ct;
/**
* Callback for when the crafting matrix is changed.
@@ -62,6 +62,11 @@ public class ContainerMEMonitorable extends AEBaseContainer implements IConfigMa
public IConfigManagerHost gui;
private IGridNode networkNode;
public IGridNode getNetworkNode()
{
return networkNode;
}
protected ContainerMEMonitorable(InventoryPlayer ip, ITerminalHost montiorable, boolean bindInventory) {
super( ip, montiorable instanceof TileEntity ? (TileEntity) montiorable : null, montiorable instanceof IPart ? (IPart) montiorable : null );