From 4e1b93b8423a50af1efb7edeec818fe164edd2ec Mon Sep 17 00:00:00 2001 From: thatsIch Date: Tue, 4 Nov 2014 15:31:55 +0100 Subject: [PATCH] Use type safe base method to add information to the tooltip --- src/main/java/appeng/items/AEBaseItem.java | 15 +++++++++++++++ .../appeng/items/materials/ItemMultiMaterial.java | 14 +++++++------- .../java/appeng/items/misc/ItemCrystalSeed.java | 9 +++++---- .../appeng/items/misc/ItemEncodedPattern.java | 10 +++++----- .../items/storage/ItemBasicStorageCell.java | 12 ++++++------ .../items/storage/ItemSpatialStorageCell.java | 6 +++--- .../appeng/items/tools/ToolBiometricCard.java | 8 ++++---- .../java/appeng/items/tools/ToolMemoryCard.java | 8 ++++---- .../items/tools/powered/ToolColorApplicator.java | 6 +++--- .../items/tools/powered/ToolMassCannon.java | 6 +++--- .../items/tools/powered/ToolPortableCell.java | 6 +++--- .../items/tools/powered/ToolWirelessTerminal.java | 14 +++++++------- .../powered/powersink/AERootPoweredItem.java | 6 +++--- 13 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 8c2bf498b..0685fede7 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -1,7 +1,10 @@ package appeng.items; import java.util.EnumSet; +import java.util.List; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import appeng.core.features.AEFeature; @@ -53,4 +56,16 @@ public class AEBaseItem extends Item implements IAEFeature { // override! } + + @Override + @SuppressWarnings( "unchecked" ) + public final void addInformation( ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) + { + this.addCheckedInformation( stack, player, lines, displayAdditionalInformation ); + } + + public void addCheckedInformation( ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) + { + super.addInformation( stack, player, lines, displayAdditionalInformation ); + } } diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/ItemMultiMaterial.java index a08970d5d..a70e7d8fa 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMultiMaterial.java @@ -92,21 +92,21 @@ public class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, } @Override - public void addInformation(ItemStack is, EntityPlayer player, List details, boolean displayAdditionalInformation) + public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) { - super.addInformation( is, player, details, displayAdditionalInformation ); + super.addCheckedInformation( stack, player, lines, displayAdditionalInformation ); - MaterialType mt = getTypeByStack( is ); + MaterialType mt = getTypeByStack( stack ); if ( mt == null ) return; if ( mt == MaterialType.NamePress ) { - NBTTagCompound c = Platform.openNbtData( is ); - details.add( c.getString( "InscribeName" ) ); + NBTTagCompound c = Platform.openNbtData( stack ); + lines.add( c.getString( "InscribeName" ) ); } - Upgrades u = getType( is ); + Upgrades u = getType( stack ); if ( u != null ) { List textList = new LinkedList(); @@ -134,7 +134,7 @@ public class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, Pattern p = Pattern.compile( "(\\d+)[^\\d]" ); SlightlyBetterSort s = new SlightlyBetterSort( p ); Collections.sort( textList, s ); - details.addAll( textList ); + lines.addAll( textList ); } } diff --git a/src/main/java/appeng/items/misc/ItemCrystalSeed.java b/src/main/java/appeng/items/misc/ItemCrystalSeed.java index 53a1848b2..ad9151fb8 100644 --- a/src/main/java/appeng/items/misc/ItemCrystalSeed.java +++ b/src/main/java/appeng/items/misc/ItemCrystalSeed.java @@ -123,12 +123,13 @@ public class ItemCrystalSeed extends AEBaseItem implements IGrowableCrystal } @Override - public void addInformation(ItemStack stack, EntityPlayer p, List l, boolean b) + public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) { - l.add( ButtonToolTips.DoesntDespawn.getLocal() ); + lines.add( ButtonToolTips.DoesntDespawn.getLocal() ); int progress = getProgress( stack ) % SINGLE_OFFSET; - l.add( Math.floor( (float) progress / (float) (SINGLE_OFFSET / 100) ) + "%" ); - super.addInformation( stack, p, l, b ); + lines.add( Math.floor( (float) progress / (float) (SINGLE_OFFSET / 100) ) + "%" ); + + super.addCheckedInformation( stack, player, lines, displayAdditionalInformation ); } @Override diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index 29a3a0794..acda7f3fe 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -69,13 +69,13 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt } @Override - public void addInformation(ItemStack is, EntityPlayer p, List l, boolean more) + public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) { - ICraftingPatternDetails details = getPatternForItem( is, p.worldObj ); + ICraftingPatternDetails details = getPatternForItem( stack, player.worldObj ); if ( details == null ) { - l.add( EnumChatFormatting.RED + GuiText.InvalidPattern.getLocal() ); + lines.add( EnumChatFormatting.RED + GuiText.InvalidPattern.getLocal() ); return; } @@ -96,7 +96,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt continue; } - l.add( (first ? label : and) + anOut.getStackSize() + " " + Platform.getItemDisplayName( anOut ) ); + lines.add( (first ? label : and) + anOut.getStackSize() + " " + Platform.getItemDisplayName( anOut ) ); first = false; } @@ -108,7 +108,7 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt continue; } - l.add( (first ? with : and) + anIn.getStackSize() + " " + Platform.getItemDisplayName( anIn ) ); + lines.add( (first ? with : and) + anIn.getStackSize() + " " + Platform.getItemDisplayName( anIn ) ); first = false; } } diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index cfde1ed93..f26355a22 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -72,9 +72,9 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II } @Override - public void addInformation(ItemStack i, EntityPlayer p, List l, boolean b) + public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) { - IMEInventory inventory = AEApi.instance().registries().cell().getCellInventory( i, null, StorageChannel.ITEMS ); + IMEInventory inventory = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS ); if ( inventory instanceof ICellInventoryHandler ) { @@ -83,11 +83,11 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II if (cellInventory != null) { - l.add(cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + " " + lines.add(cellInventory.getUsedBytes() + " " + GuiText.Of.getLocal() + " " + cellInventory.getTotalBytes() + " " + GuiText.BytesUsed.getLocal()); - l.add(cellInventory.getStoredItemTypes() + " " + GuiText.Of.getLocal() + lines.add(cellInventory.getStoredItemTypes() + " " + GuiText.Of.getLocal() + " " + cellInventory.getTotalItemTypes() + " " + GuiText.Types.getLocal()); @@ -97,9 +97,9 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II : GuiText.Excluded ).getLocal(); if ( handler.isFuzzy() ) - l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Fuzzy.getLocal() ); + lines.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Fuzzy.getLocal() ); else - l.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Precise.getLocal() ); + lines.add( GuiText.Partitioned.getLocal() + " - " + List + " " + GuiText.Precise.getLocal() ); } } diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index 2b57d0a33..f71d2769f 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -35,11 +35,11 @@ public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorag } @Override - public void addInformation(ItemStack is, EntityPlayer player, List list, boolean adv) + public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, boolean displayAdditionalInformation ) { - WorldCoord wc = getStoredSize( is ); + WorldCoord wc = getStoredSize( stack ); if ( wc.x > 0 ) - list.add( GuiText.StoredSize.getLocal() + ": " + wc.x + " x " + wc.y + " x " + wc.z ); + lines.add( GuiText.StoredSize.getLocal() + ": " + wc.x + " x " + wc.y + " x " + wc.z ); } @Override diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 82b914ec6..4b2b6569c 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -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 lines, boolean displayAdditionalInformation ) { - EnumSet perms = getPermissions( is ); + EnumSet 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 ); } } diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index 09c0ba821..ab6376a17 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -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 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 diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 299553bfb..1e1f4c5a6 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -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 lines, boolean displayAdditionalInformation ) { - super.addInformation( is, player, lines, advancedItemTooltips ); + super.addCheckedInformation( stack, player, lines, displayAdditionalInformation ); - IMEInventory cdi = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS ); + IMEInventory cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS ); if ( cdi instanceof CellInventoryHandler ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index 3f29703e7..b35f132a3 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -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 lines, boolean displayAdditionalInformation ) { - super.addInformation( is, player, lines, advancedItemTooltips ); + super.addCheckedInformation( stack, player, lines, displayAdditionalInformation ); - IMEInventory cdi = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS ); + IMEInventory cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS ); if ( cdi instanceof CellInventoryHandler ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index a0cc81adc..c07b3a888 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -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 lines, boolean displayAdditionalInformation ) { - super.addInformation( is, player, lines, advancedItemTooltips ); + super.addCheckedInformation( stack, player, lines, displayAdditionalInformation ); - IMEInventory cdi = AEApi.instance().registries().cell().getCellInventory( is, null, StorageChannel.ITEMS ); + IMEInventory cdi = AEApi.instance().registries().cell().getCellInventory( stack, null, StorageChannel.ITEMS ); if ( cdi instanceof CellInventoryHandler ) { diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 157402690..2dc352dca 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -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 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 diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index c23178d6e..e97b8625d 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java @@ -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 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 ) {