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

Interface Terminal now is better at showing Names on automatic interfaces.

Browse Source 
Named Interfaces now show their name in the Interface Terminal.
This commit is contained in:
AlgorithmX2
2014-07-12 17:30:41 -05:00
parent 8f65aad67b
commit c0c28e6681
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helpers/DualityInterface.java
+26 -3
View File
@@ -9,6 +9,7 @@ import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -52,7 +53,6 @@ import appeng.api.util.AECableType;
import appeng.api.util.DimensionalCoord;
import appeng.api.util.IConfigManager;
import appeng.api.util.IConfigureableObject;
import appeng.core.localization.GuiText;
import appeng.core.settings.TickRates;
import appeng.me.GridAccessException;
import appeng.me.helpers.AENetworkProxy;
@@ -972,6 +972,10 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
TileEntity tile = iHost.getTileEntity();
World w = tile.getWorldObj();
String name = ((ICustomNameObject) iHost).getCustomName();
if ( name != null )
return name;
EnumSet<ForgeDirection> possibleDirections = iHost.getTargets();
for (ForgeDirection s : possibleDirections)
{
@@ -985,7 +989,20 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
TileEntity te = w.getTileEntity( tile.xCoord + s.offsetX, tile.yCoord + s.offsetY, tile.zCoord + s.offsetZ );
if ( te == null )
return "Nothing";
continue;
if ( te instanceof IInterfaceHost )
{
try
{
if ( ((IInterfaceHost) te).getInterfaceDuality().sameGrid( gridProxy.getGrid() ) )
continue;
}
catch (GridAccessException e)
{
continue;
}
}
Item item = Item.getItemFromBlock( blk );
@@ -1002,6 +1019,12 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
{
if ( te instanceof ICraftingMachine || InventoryAdaptor.getAdaptor( te, s.getOpposite() ) != null )
{
if ( te instanceof IInventory && ((IInventory) te).getSizeInventory() == 0 )
continue;
if ( te instanceof ISidedInventory && ((ISidedInventory) te).getAccessibleSlotsFromSide( s.getOpposite().ordinal() ).length == 0 )
continue;
if ( mop.blockX == te.xCoord && mop.blockY == te.yCoord && mop.blockZ == te.zCoord )
{
ItemStack g = blk.getPickBlock( mop, w, te.xCoord, te.yCoord, te.zCoord );
@@ -1020,6 +1043,6 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
return what.getUnlocalizedName();
}
return GuiText.Interface.getUnlocalized();
return "Nothing";
}
}