From 7766eed754766c85983e3ed0344e1daae2d5fbfd Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 25 Feb 2019 19:57:11 -0800 Subject: [PATCH] Add missing constructors in KeyBinding to match existing vanilla constructors. (#5480) --- .../client/settings/KeyBinding.java.patch | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch b/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch index b9060dce02..daf73f9584 100644 --- a/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch +++ b/patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch @@ -94,7 +94,7 @@ return this.field_74512_d.equals(p_197983_1_.field_74512_d); } -@@ -153,14 +173,94 @@ +@@ -153,14 +173,110 @@ } public String func_197978_k() { @@ -120,6 +120,14 @@ + /** + * Convenience constructor for creating KeyBindings with keyConflictContext set. + */ ++ public KeyBinding(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, final InputMappings.Type inputType, final int keyCode, String category) ++ { ++ this(description, keyConflictContext, inputType.func_197944_a(keyCode), category); ++ } ++ ++ /** ++ * Convenience constructor for creating KeyBindings with keyConflictContext set. ++ */ + public KeyBinding(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, InputMappings.Input keyCode, String category) + { + this(description, keyConflictContext, net.minecraftforge.client.settings.KeyModifier.NONE, keyCode, category); @@ -128,6 +136,14 @@ + /** + * Convenience constructor for creating KeyBindings with keyConflictContext and keyModifier set. + */ ++ public KeyBinding(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, final InputMappings.Type inputType, final int keyCode, String category) ++ { ++ this(description, keyConflictContext, keyModifier, inputType.func_197944_a(keyCode), category); ++ } ++ ++ /** ++ * Convenience constructor for creating KeyBindings with keyConflictContext and keyModifier set. ++ */ + public KeyBinding(String description, net.minecraftforge.client.settings.IKeyConflictContext keyConflictContext, net.minecraftforge.client.settings.KeyModifier keyModifier, InputMappings.Input keyCode, String category) + { + this.field_74515_c = description;