upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing constructors in KeyBinding to match existing vanilla constructors. (#5480)

Browse Source
This commit is contained in:
kashike authored and LexManos committed 2019-02-25 19:57:11 -08:00
1 parent 5fa02f53d9
commit 7766eed754
1 file changed
+17 -1
Download Patch File Download Diff File Expand all files Collapse all files
patches/minecraft/net/minecraft/client/settings/KeyBinding.java.patch
+17 -1
View File
@@ -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;