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

Fixes tooltips for ME Slots (#3205)

Browse Source 
No longer strips colors from names, lore, etc.
Now uses the translation again for "Items Stored:" instead of a hardcoded string.
Removed obsolete methods.
This commit is contained in:
yueh
2017-11-12 12:35:05 +01:00
committed by GitHub
parent a126112a2d
commit f5dd2c8b0a
2 changed files with 31 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/AEBaseMEGui.java
+26 -69
View File
@@ -23,7 +23,6 @@ import java.text.NumberFormat;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.inventory.Container; import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -43,70 +42,17 @@ public abstract class AEBaseMEGui extends AEBaseGui
super( container ); super( container );
} }
public List<String> handleItemTooltip( final ItemStack stack, final int mouseX, final int mouseY, final List<String> currentToolTip )
{
if( !stack.isEmpty() )
{
final Slot s = this.getSlot( mouseX, mouseY );
if( s instanceof SlotME )
{
final int BigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999;
IAEItemStack myStack = null;
try
{
final SlotME theSlotField = (SlotME) s;
myStack = theSlotField.getAEStack();
}
catch( final Throwable ignore )
{
}
if( myStack != null )
{
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
{
final String local = ButtonToolTips.ItemsStored.getLocal();
final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() );
final String format = String.format( local, formattedAmount );
currentToolTip.add( TextFormatting.GRAY + format );
}
if( myStack.getCountRequestable() > 0 )
{
final String local = ButtonToolTips.ItemsRequestable.getLocal();
final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() );
final String format = String.format( local, formattedAmount );
currentToolTip.add( TextFormatting.GRAY + format );
}
}
else if( stack.getCount() > BigNumber || ( stack.getCount() > 1 && stack.isItemDamaged() ) )
{
final String local = ButtonToolTips.ItemsStored.getLocal();
final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( stack.getCount() );
final String format = String.format( local, formattedAmount );
currentToolTip.add( TextFormatting.GRAY + format );
}
}
}
return currentToolTip;
}
// Vanilla version...
// protected void drawItemStackTooltip(ItemStack stack, int x, int y)
@Override @Override
protected void renderToolTip( final ItemStack stack, final int x, final int y ) protected void renderToolTip( final ItemStack stack, final int x, final int y )
{ {
final Slot s = this.getSlot( x, y ); final Slot s = this.getSlot( x, y );
if( s instanceof SlotME && !stack.isEmpty() ) if( s instanceof SlotME && !stack.isEmpty() )
{ {
final int BigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999; final int bigNumber = AEConfig.instance().useTerminalUseLargeFont() ? 999 : 9999;
IAEItemStack myStack = null; IAEItemStack myStack = null;
final List<String> currentToolTip = this.getItemToolTip( stack );
try try
{ {
@@ -117,33 +63,44 @@ public abstract class AEBaseMEGui extends AEBaseGui
{ {
} }
ITooltipFlag.TooltipFlags tooltipFlag = this.mc.gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL;
if( myStack != null ) if( myStack != null )
{ {
final List<String> currentToolTip = stack.getTooltip( this.mc.player, tooltipFlag ); if( myStack.getStackSize() > bigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
if( myStack.getStackSize() > BigNumber || ( myStack.getStackSize() > 1 && stack.isItemDamaged() ) )
{ {
currentToolTip.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() ) ); final String local = ButtonToolTips.ItemsStored.getLocal();
final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( myStack.getStackSize() );
final String format = String.format( local, formattedAmount );
currentToolTip.add( TextFormatting.GRAY + format );
} }
if( myStack.getCountRequestable() > 0 ) if( myStack.getCountRequestable() > 0 )
{ {
currentToolTip.add( "Items Requestable: " + NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() ) ); final String local = ButtonToolTips.ItemsRequestable.getLocal();
final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( myStack.getCountRequestable() );
final String format = String.format( local, formattedAmount );
currentToolTip.add( format );
} }
this.drawTooltip( x, y, currentToolTip ); this.drawHoveringText( currentToolTip, x, y, this.fontRenderer );
return; return;
} }
else if( stack.getCount() > BigNumber ) else if( stack.getCount() > bigNumber )
{ {
List<String> var4 = stack.getTooltip( this.mc.player, tooltipFlag ); final String local = ButtonToolTips.ItemsStored.getLocal();
var4.add( "Items Stored: " + NumberFormat.getNumberInstance( Locale.US ).format( stack.getCount() ) ); final String formattedAmount = NumberFormat.getNumberInstance( Locale.US ).format( stack.getCount() );
this.drawTooltip( x, y, var4 ); final String format = String.format( local, formattedAmount );
currentToolTip.add( TextFormatting.GRAY + format );
this.drawHoveringText( currentToolTip, x, y, this.fontRenderer );
return; return;
} }
} }
super.renderToolTip( stack, x, y ); super.renderToolTip( stack, x, y );
// super.drawItemStackTooltip( stack, x, y );
} }
} }
src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java
+5 -3
View File
@@ -237,10 +237,11 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
this.getScrollBar().setRange( 0, ( size + 4 ) / 5 - this.rows, 1 ); this.getScrollBar().setRange( 0, ( size + 4 ) / 5 - this.rows, 1 );
} }
// Vanilla version... @Override
protected void drawItemStackTooltip( final ItemStack stack, final int x, final int y ) protected void renderToolTip( final ItemStack stack, final int x, final int y )
{ {
final Slot s = this.getSlot( x, y ); final Slot s = this.getSlot( x, y );
if( s instanceof SlotME && stack != null ) if( s instanceof SlotME && stack != null )
{ {
IAEItemStack myStack = null; IAEItemStack myStack = null;
@@ -270,7 +271,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
this.drawTooltip( x, y, currentToolTip ); this.drawTooltip( x, y, currentToolTip );
} }
} }
// super.drawItemStackTooltip( stack, x, y );
super.renderToolTip( stack, x, y );
} }
@Override @Override