keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix for showing config default values twice in tooltip (#2257) (#3338) 

(cherry picked from commit be73ec3d5ebd972cfacb0f255f71112a0430bc43)
This commit is contained in:
LexManos 2016-12-05 12:07:44 -08:00
parent f9c74cfc77
commit 4b7219c07f
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/net/minecraftforge/fml/client/config/GuiConfigEntries.java
View File

@ -1507,9 +1507,9 @@ public class GuiConfigEntries extends GuiListExtended
comment = I18n.format(configElement.getLanguageKey() + ".tooltip").replace("\\n", "\n");
if (!comment.equals(configElement.getLanguageKey() + ".tooltip"))
Collections.addAll(toolTip, (TextFormatting.GREEN + name + "\n" + TextFormatting.YELLOW + comment).split("\n"));
Collections.addAll(toolTip, (TextFormatting.GREEN + name + "\n" + TextFormatting.YELLOW + removeTag(comment, "[default:", "]")).split("\n"));
else if (configElement.getComment() != null && !configElement.getComment().trim().isEmpty())
Collections.addAll(toolTip, (TextFormatting.GREEN + name + "\n" + TextFormatting.YELLOW + configElement.getComment()).split("\n"));
Collections.addAll(toolTip, (TextFormatting.GREEN + name + "\n" + TextFormatting.YELLOW + removeTag(configElement.getComment(), "[default:", "]")).split("\n"));
else
Collections.addAll(toolTip, (TextFormatting.GREEN + name + "\n" + TextFormatting.RED + "No tooltip defined.").split("\n"));
@ -1665,6 +1665,23 @@ public class GuiConfigEntries extends GuiListExtended
@Override
public void onGuiClosed()
{}
/**
* Get string surrounding tagged area.
*/
private String removeTag(String target, String tagStart, String tagEnd)
{
int tagStartPosition = tagStartPosition = target.indexOf(tagStart);
int tagEndPosition = tagEndPosition = target.indexOf(tagEnd, tagStartPosition + tagStart.length());
if (-1 == tagStartPosition || -1 == tagEndPosition)
return target;
String taglessResult = target.substring(0, tagStartPosition);
taglessResult += target.substring(tagEndPosition + 1, target.length());
return taglessResult;
}
}
/**