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

Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 (#6902)

This commit is contained in:
Richard Freimer 2020-07-06 17:26:54 -04:00 committed by GitHub
parent d26e285e09
commit 2ad347b043
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraftforge/client/settings/KeyModifier.java
View File

@ -58,7 +58,7 @@ public enum KeyModifier {
public ITextComponent getCombinedName(InputMappings.Input key, Supplier<ITextComponent> defaultLogic) public ITextComponent getCombinedName(InputMappings.Input key, Supplier<ITextComponent> defaultLogic)
{ {
String localizationFormatKey = Minecraft.IS_RUNNING_ON_MAC ? "forge.controlsgui.control.mac" : "forge.controlsgui.control"; String localizationFormatKey = Minecraft.IS_RUNNING_ON_MAC ? "forge.controlsgui.control.mac" : "forge.controlsgui.control";
return new TranslationTextComponent(localizationFormatKey).func_240702_b_(" + ").func_230529_a_(defaultLogic.get()); return new TranslationTextComponent(localizationFormatKey, defaultLogic.get());
} }
}, },
SHIFT { SHIFT {
@ -77,7 +77,7 @@ public enum KeyModifier {
@Override @Override
public ITextComponent getCombinedName(InputMappings.Input key, Supplier<ITextComponent> defaultLogic) public ITextComponent getCombinedName(InputMappings.Input key, Supplier<ITextComponent> defaultLogic)
{ {
return new TranslationTextComponent("forge.controlsgui.shift").func_240702_b_(" + ").func_230529_a_(defaultLogic.get()); return new TranslationTextComponent("forge.controlsgui.shift", defaultLogic.get());
} }
}, },
ALT { ALT {
@ -96,7 +96,7 @@ public enum KeyModifier {
@Override @Override
public ITextComponent getCombinedName(InputMappings.Input keyCode, Supplier<ITextComponent> defaultLogic) public ITextComponent getCombinedName(InputMappings.Input keyCode, Supplier<ITextComponent> defaultLogic)
{ {
return new TranslationTextComponent("forge.controlsgui.alt").func_240702_b_(" + ").func_230529_a_(defaultLogic.get()); return new TranslationTextComponent("forge.controlsgui.alt", defaultLogic.get());
} }
}, },
NONE { NONE {

8
src/main/resources/assets/forge/lang/en_us.json
View File

@ -148,10 +148,10 @@
"forge.configgui.disableVersionCheck.tooltip": "Set to true to disable Forge version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.", "forge.configgui.disableVersionCheck.tooltip": "Set to true to disable Forge version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.",
"forge.configgui.disableVersionCheck": "Disable Forge Version Check", "forge.configgui.disableVersionCheck": "Disable Forge Version Check",
"forge.controlsgui.shift": "SHIFT", "forge.controlsgui.shift": "SHIFT + %s",
"forge.controlsgui.control": "CTRL", "forge.controlsgui.control": "CTRL + %s",
"forge.controlsgui.control.mac": "CMD", "forge.controlsgui.control.mac": "CMD + %s",
"forge.controlsgui.alt": "ALT", "forge.controlsgui.alt": "ALT + %s",
"forge.container.enchant.limitedEnchantability": "Limited Enchantability", "forge.container.enchant.limitedEnchantability": "Limited Enchantability",
"attribute.name.generic.reachDistance": "Reach Distance", "attribute.name.generic.reachDistance": "Reach Distance",