Some additional fixes from other branch.
This commit is contained in:
@@ -21,7 +21,7 @@ package appeng.client.me;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
|
||||
import appeng.tile.inventory.AppEngInternalInventory;
|
||||
|
||||
@@ -45,10 +45,10 @@ public class ClientDCInternalInv implements Comparable<ClientDCInternalInv>
|
||||
|
||||
public String getName()
|
||||
{
|
||||
final String s = I18n.translateToLocal( this.unlocalizedName + ".name" );
|
||||
final String s = I18n.format( this.unlocalizedName + ".name" );
|
||||
if( s.equals( this.unlocalizedName + ".name" ) )
|
||||
{
|
||||
return I18n.translateToLocal( this.unlocalizedName );
|
||||
return I18n.format( this.unlocalizedName );
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
@@ -40,6 +40,7 @@ import appeng.core.AEConfig;
|
||||
import appeng.fluids.util.FluidSorters;
|
||||
import appeng.util.Platform;
|
||||
import appeng.util.prioritylist.IPartitionList;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
|
||||
|
||||
/**
|
||||
@@ -132,11 +133,11 @@ public class FluidRepo
|
||||
|
||||
if( terminalSearchToolTips && notDone && !searchMod )
|
||||
{
|
||||
final List<String> tooltip = Platform.getTooltip( fs );
|
||||
final List<ITextComponent> tooltip = Platform.getTooltip( fs );
|
||||
|
||||
for( final String line : tooltip )
|
||||
for( final ITextComponent line : tooltip )
|
||||
{
|
||||
if( m.matcher( line ).find() )
|
||||
if( m.matcher( line.getString() ).find() )
|
||||
{
|
||||
foundMatchingFluidStack = true;
|
||||
break;
|
||||
|
||||
@@ -45,6 +45,7 @@ import appeng.items.storage.ItemViewCell;
|
||||
import appeng.util.ItemSorters;
|
||||
import appeng.util.Platform;
|
||||
import appeng.util.prioritylist.IPartitionList;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
|
||||
|
||||
public class ItemRepo
|
||||
@@ -180,11 +181,11 @@ public class ItemRepo
|
||||
|
||||
if( terminalSearchToolTips && notDone && !searchMod )
|
||||
{
|
||||
final List<String> tooltip = Platform.getTooltip( is );
|
||||
final List<ITextComponent> tooltip = Platform.getTooltip( is );
|
||||
|
||||
for( final String line : tooltip )
|
||||
for( final ITextComponent line : tooltip )
|
||||
{
|
||||
if( m.matcher( line ).find() )
|
||||
if( m.matcher( line.getString() ).find() )
|
||||
{
|
||||
foundMatchingItemStack = true;
|
||||
notDone = false;
|
||||
|
||||
Reference in New Issue
Block a user