mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/gui/GuiControls.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/gui/GuiControls.java
|
|
@@ -65,7 +65,7 @@
|
|
{
|
|
for (KeyBinding keybinding : this.field_146297_k.field_71474_y.field_74324_K)
|
|
{
|
|
- keybinding.func_151462_b(keybinding.func_151469_h());
|
|
+ keybinding.setToDefault();
|
|
}
|
|
|
|
KeyBinding.func_74508_b();
|
|
@@ -81,6 +81,7 @@
|
|
{
|
|
if (this.field_146491_f != null)
|
|
{
|
|
+ this.field_146491_f.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), -100 + p_73864_3_);
|
|
this.field_146497_i.func_151440_a(this.field_146491_f, -100 + p_73864_3_);
|
|
this.field_146491_f = null;
|
|
KeyBinding.func_74508_b();
|
|
@@ -105,17 +106,21 @@
|
|
{
|
|
if (p_73869_2_ == 1)
|
|
{
|
|
+ this.field_146491_f.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.NONE, 0);
|
|
this.field_146497_i.func_151440_a(this.field_146491_f, 0);
|
|
}
|
|
else if (p_73869_2_ != 0)
|
|
{
|
|
+ this.field_146491_f.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), p_73869_2_);
|
|
this.field_146497_i.func_151440_a(this.field_146491_f, p_73869_2_);
|
|
}
|
|
else if (p_73869_1_ > 0)
|
|
{
|
|
+ this.field_146491_f.setKeyModifierAndCode(net.minecraftforge.client.settings.KeyModifier.getActiveModifier(), p_73869_1_ + 256);
|
|
this.field_146497_i.func_151440_a(this.field_146491_f, p_73869_1_ + 256);
|
|
}
|
|
|
|
+ if (!net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(p_73869_2_))
|
|
this.field_146491_f = null;
|
|
this.field_152177_g = Minecraft.func_71386_F();
|
|
KeyBinding.func_74508_b();
|
|
@@ -135,7 +140,7 @@
|
|
|
|
for (KeyBinding keybinding : this.field_146497_i.field_74324_K)
|
|
{
|
|
- if (keybinding.func_151463_i() != keybinding.func_151469_h())
|
|
+ if (!keybinding.isSetToDefaultValue())
|
|
{
|
|
flag = true;
|
|
break;
|