mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-06-23 13:43:22 +00:00
Code Issues Releases Wiki Activity

Show computer/disk ids in the tool tip more often

Browse Source 
- Remove the parenthesis around the text (so it's now
   "Computer ID: 12"), rather than "(Computer ID: 12").
 - Show the tooltip if the computer has an ID and no label (as well as
   when in advanced mode).
This commit is contained in:
SquidDev 2020-05-02 10:16:36 +01:00
parent e1663f3df0
commit 3fb906ef6c
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dan200/computercraft/shared/computer/items/ItemComputerBase.java
View File

@ -39,7 +39,7 @@ public final int getMetadata( int damage )
@Override
public void addInformation( @Nonnull ItemStack stack, @Nullable World world, @Nonnull List<String> list, @Nonnull ITooltipFlag flag )
{
if( flag.isAdvanced() )
if( flag.isAdvanced() || getLabel( stack ) == null )
{
int id = getComputerID( stack );
if( id >= 0 ) list.add( StringUtil.translateFormatted( "gui.computercraft.tooltip.computer_id", id ) );

2
src/main/java/dan200/computercraft/shared/media/items/ItemDiskLegacy.java
View File

@ -80,7 +80,7 @@ protected void setDiskID( @Nonnull ItemStack stack, int id )
@Override
public void addInformation( @Nonnull ItemStack stack, World world, List<String> list, ITooltipFlag flag )
{
if( flag.isAdvanced() )
if( flag.isAdvanced() || getLabel( stack ) == null )
{
int id = getDiskID( stack );
if( id >= 0 ) list.add( StringUtil.translateFormatted( "gui.computercraft.tooltip.disk_id", id ) );

2
src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
View File

@ -211,7 +211,7 @@ public String getItemStackDisplayName( @Nonnull ItemStack stack )
@Override
public void addInformation( @Nonnull ItemStack stack, World world, List<String> list, ITooltipFlag flag )
{
if( flag.isAdvanced() )
if( flag.isAdvanced() || getLabel( stack ) == null )
{
int id = getComputerID( stack );
if( id >= 0 ) list.add( StringUtil.translateFormatted( "gui.computercraft.tooltip.computer_id", id ) );

4
src/main/resources/assets/computercraft/lang/da_dk.lang
View File

@ -44,5 +44,5 @@ chat.computercraft.wired_modem.peripheral_disconnected=Perifer enhed "%s" koblet
# Misc tooltips
gui.computercraft.tooltip.copy=Kopier til udklipsholder
gui.computercraft.tooltip.computer_id=(Computer-ID: %s)
gui.computercraft.tooltip.disk_id=(Disk-ID: %s)
gui.computercraft.tooltip.computer_id=Computer-ID: %s
gui.computercraft.tooltip.disk_id=Disk-ID: %s

4
src/main/resources/assets/computercraft/lang/de_de.lang
View File

@ -148,8 +148,8 @@ tracking_field.computercraft.coroutines_dead.name=Koroutinen gelöscht
# Misc tooltips
gui.computercraft.tooltip.copy=In die Zwischenablage kopieren
gui.computercraft.tooltip.computer_id=(Computer ID: %s)
gui.computercraft.tooltip.disk_id=(Disketten ID: %s)
gui.computercraft.tooltip.computer_id=Computer ID: %s
gui.computercraft.tooltip.disk_id=Disketten ID: %s
# Config options
gui.computercraft:config.computer_space_limit=Speicherplatz von Computern (Bytes)

4
src/main/resources/assets/computercraft/lang/en_us.lang
View File

@ -148,8 +148,8 @@ tracking_field.computercraft.coroutines_dead.name=Coroutines disposed
# Misc tooltips
gui.computercraft.tooltip.copy=Copy to clipboard
gui.computercraft.tooltip.computer_id=(Computer ID: %s)
gui.computercraft.tooltip.disk_id=(Disk ID: %s)
gui.computercraft.tooltip.computer_id=Computer ID: %s
gui.computercraft.tooltip.disk_id=Disk ID: %s
# Config options
gui.computercraft:config.computer_space_limit=Computer space limit (bytes)

4
src/main/resources/assets/computercraft/lang/ko_kr.lang
View File

@ -148,8 +148,8 @@ tracking_field.computercraft.coroutines_dead.name=코루틴 처리됨
# Misc tooltips
gui.computercraft.tooltip.copy=클립보드에 복사
gui.computercraft.tooltip.computer_id=(컴퓨터 ID: %s)
gui.computercraft.tooltip.disk_id=(디스크 ID: %s)
gui.computercraft.tooltip.computer_id=컴퓨터 ID: %s
gui.computercraft.tooltip.disk_id=디스크 ID: %s
# Config options
gui.computercraft:config.computer_space_limit=컴퓨터 공간 제한 (바이트)

4
src/main/resources/assets/computercraft/lang/zh_cn.lang
View File

@ -148,8 +148,8 @@ tracking_field.computercraft.coroutines_dead.name=协同处理
# Misc tooltips
gui.computercraft.tooltip.copy=复制到剪贴板
gui.computercraft.tooltip.computer_id=(计算机ID: %s)
gui.computercraft.tooltip.disk_id=(磁盘ID: %s)
gui.computercraft.tooltip.computer_id=计算机ID: %s
gui.computercraft.tooltip.disk_id=磁盘ID: %s
# Config options
gui.computercraft:config.computer_space_limit=计算机空间限制(字节)