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

Use type safe base method to add information to the tooltip

Browse Source
This commit is contained in:
thatsIch
2014-11-04 15:31:55 +01:00
parent 8c144b22cc
commit 4e1b93b842
13 changed files with 68 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/ToolBiometricCard.java
+4 -4
View File
@@ -78,11 +78,11 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
}
@Override
public void addInformation(ItemStack is, EntityPlayer p, List l, boolean b)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
EnumSet<SecurityPermissions> perms = getPermissions( is );
EnumSet<SecurityPermissions> perms = getPermissions( stack );
if ( perms.isEmpty() )
l.add( GuiText.NoPermissions.getLocal() );
lines.add( GuiText.NoPermissions.getLocal() );
else
{
String msg = null;
@@ -94,7 +94,7 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard
else
msg = msg + ", " + Platform.gui_localize( sp.getUnlocalizedName() );
}
l.add( msg );
lines.add( msg );
}
}
src/main/java/appeng/items/tools/ToolMemoryCard.java
+4 -4
View File
@@ -47,13 +47,13 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
}
@Override
public void addInformation(ItemStack i, EntityPlayer p, List l, boolean b)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
l.add( getLocalizedName( getSettingsName( i ) + ".name", getSettingsName( i ) ) );
lines.add( getLocalizedName( getSettingsName( stack ) + ".name", getSettingsName( stack ) ) );
NBTTagCompound data = getData( i );
NBTTagCompound data = getData( stack );
if ( data.hasKey( "tooltip" ) )
l.add( StatCollector.translateToLocal( getLocalizedName( data.getString( "tooltip" ) + ".name", data.getString( "tooltip" ) ) ) );
lines.add( StatCollector.translateToLocal( getLocalizedName( data.getString( "tooltip" ) + ".name", data.getString( "tooltip" ) ) ) );
}
@Override
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
+3 -3
View File
@@ -367,11 +367,11 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
}
@Override
public void addInformation(ItemStack is, EntityPlayer player, List lines, boolean advancedItemTooltips)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
super.addInformation( is, player, lines, advancedItemTooltips );
super.addCheckedInformation( stack, player, lines, displayAdditionalInformation );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
if ( cdi instanceof CellInventoryHandler )
{
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+3 -3
View File
@@ -72,11 +72,11 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
@Override
public void addInformation(ItemStack is, EntityPlayer player, List lines, boolean advancedItemTooltips)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
super.addInformation( is, player, lines, advancedItemTooltips );
super.addCheckedInformation( stack, player, lines, displayAdditionalInformation );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
if ( cdi instanceof CellInventoryHandler )
{
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
+3 -3
View File
@@ -56,11 +56,11 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
}
@Override
public void addInformation(ItemStack is, EntityPlayer player, List lines, boolean advancedItemTooltips)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
super.addInformation( is, player, lines, advancedItemTooltips );
super.addCheckedInformation( stack, player, lines, displayAdditionalInformation );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS );
IMEInventory<IAEItemStack> cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS );
if ( cdi instanceof CellInventoryHandler )
{
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+7 -7
View File
@@ -48,25 +48,25 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
}
@Override
public void addInformation(ItemStack i, EntityPlayer p, List l, boolean b)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
super.addInformation( i, p, l, b );
super.addCheckedInformation( stack, player, lines, displayAdditionalInformation );
if ( i.hasTagCompound() )
if ( stack.hasTagCompound() )
{
NBTTagCompound tag = Platform.openNbtData( i );
NBTTagCompound tag = Platform.openNbtData( stack );
if ( tag != null )
{
String encKey = tag.getString( "encryptionKey" );
if ( encKey == null || encKey.equals( "" ) )
l.add( GuiText.Unlinked.getLocal() );
lines.add( GuiText.Unlinked.getLocal() );
else
l.add( GuiText.Linked.getLocal() );
lines.add( GuiText.Linked.getLocal() );
}
}
else
l.add( StatCollector.translateToLocal( "AppEng.GuiITooltip.Unlinked" ) );
lines.add( StatCollector.translateToLocal( "AppEng.GuiITooltip.Unlinked" ) );
}
@Override
src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java
+3 -3
View File
@@ -32,11 +32,11 @@ public class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage
}
@Override
public void addInformation(ItemStack is, EntityPlayer player, List lines, boolean advancedItemTooltips)
public void addCheckedInformation(ItemStack stack, EntityPlayer player, List<String> lines, boolean displayAdditionalInformation )
{
NBTTagCompound tag = is.getTagCompound();
NBTTagCompound tag = stack.getTagCompound();
double internalCurrentPower = 0;
double internalMaxPower = getAEMaxPower( is );
double internalMaxPower = getAEMaxPower( stack );
if ( tag != null )
{