diff --git a/client/gui/AEBaseGui.java b/client/gui/AEBaseGui.java index 8d5e2ed03..bc4562b72 100644 --- a/client/gui/AEBaseGui.java +++ b/client/gui/AEBaseGui.java @@ -576,11 +576,12 @@ public abstract class AEBaseGui extends GuiContainer this.zLevel = 100.0F; itemRender.zLevel = 100.0F; + GL11.glPushAttrib( GL11.GL_ALL_ATTRIB_BITS ); GL11.glEnable( GL11.GL_LIGHTING ); GL11.glEnable( GL12.GL_RESCALE_NORMAL ); RenderHelper.enableGUIStandardItemLighting(); itemRender.renderItemAndEffectIntoGUI( this.fontRendererObj, this.mc.renderEngine, is, x, y ); - GL11.glDisable( GL11.GL_LIGHTING ); + GL11.glPopAttrib(); itemRender.zLevel = 0.0F; this.zLevel = 0.0F; diff --git a/tile/storage/TileIOPort.java b/tile/storage/TileIOPort.java index 8cc008f4f..4f75dbbc7 100644 --- a/tile/storage/TileIOPort.java +++ b/tile/storage/TileIOPort.java @@ -12,6 +12,7 @@ import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; +import appeng.api.networking.GridFlags; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; @@ -84,6 +85,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC public TileIOPort() { addNewHandler( new TileIOPortHandler() ); + gridProxy.setFlags( GridFlags.REQUIRE_CHANNEL ); cm.registerSetting( Settings.REDSTONE_CONTROLLED, RedstoneMode.IGNORE ); cm.registerSetting( Settings.FULLNESS_MODE, FullnessMode.EMPTY ); cm.registerSetting( Settings.OPERATION_MODE, OperationMode.EMPTY ); @@ -340,7 +342,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC if ( src instanceof IMEMonitor ) myList = ((IMEMonitor) src).getStorageList(); else - myList = src.getAvailableItems( src.getChannel().createList() ); + myList = src.getAvailableItems( src.getChannel().createList() ); boolean didStuff; @@ -383,7 +385,7 @@ public class TileIOPort extends AENetworkInvTile implements IUpgradeableHost, IC itemsToMove -= possible; didStuff = true; } - + break; } }