diff --git a/Scripting/API.cs b/Scripting/API.cs index 7e422dc..3c520a3 100644 --- a/Scripting/API.cs +++ b/Scripting/API.cs @@ -114,13 +114,13 @@ static List GetDelCall(string Name) })}; case "bind": - return new List {Name, new Action(delegate(string FunctionName, string InputString){ - Bindings.Bind(FunctionName, InputString); + return new List {Name, new Action(delegate(string InputString, string FunctionName){ + Bindings.Bind(InputString, FunctionName); })}; case "unbind": - return new List {Name, new Action(delegate(string FunctionName){ - Bindings.UnBind(FunctionName); + return new List {Name, new Action(delegate(string InputString){ + Bindings.UnBind(InputString); })}; case "player_input_forward": diff --git a/Scripting/Bindings.cs b/Scripting/Bindings.cs index acf9c45..1ee6e86 100644 --- a/Scripting/Bindings.cs +++ b/Scripting/Bindings.cs @@ -19,7 +19,7 @@ private Bindings() } - public static void Bind(string FunctionName, string InputString) + public static void Bind(string InputString, string FunctionName) { dynamic Variable; Scripting.ConsoleScope.TryGetVariable(FunctionName, out Variable); diff --git a/Scripting/SetupScript.py b/Scripting/SetupScript.py index 03ccec3..924026d 100644 --- a/Scripting/SetupScript.py +++ b/Scripting/SetupScript.py @@ -15,30 +15,30 @@ import Startup -bind("player_input_forward", "W") -bind("player_input_backward", "S") -bind("player_input_right", "D") -bind("player_input_left", "A") -bind("player_input_sprint", "Shift") -bind("player_input_jump", "Space") -bind("player_input_crouch", "Control") - -bind("player_input_inventory_up", "WheelUp") -bind("player_input_inventory_down", "WheelDown") - -bind("player_input_look_up", "MouseUp") -bind("player_input_look_down", "MouseDown") -bind("player_input_look_right", "MouseRight") -bind("player_input_look_left", "MouseLeft") - -bind("player_input_build_rotate", "R") -bind("player_input_drop", "Q") - -bind("player_position_reset", "K") -bind("fly_toggle", "T") - -bind("player_input_primary_fire", "MouseOne") -bind("player_input_secondary_fire", "MouseTwo") +bind("W", "player_input_forward") +bind("S", "player_input_backward") +bind("D", "player_input_right") +bind("A", "player_input_left") +bind("Shift", "player_input_sprint") +bind("Space", "player_input_jump") +bind("Control", "player_input_crouch") + +bind("WheelUp", "player_input_inventory_up") +bind("WheelDown", "player_input_inventory_down") + +bind("MouseUp", "player_input_look_up") +bind("MouseDown", "player_input_look_down") +bind("MouseRight", "player_input_look_right") +bind("MouseLeft", "player_input_look_left") + +bind("R", "player_input_build_rotate") +bind("Q", "player_input_drop") + +bind("K", "player_position_reset") +bind("T", "fly_toggle") + +bind("MouseOne", "player_input_primary_fire") +bind("MouseTwo", "player_input_secondary_fire") chunk_render_distance(10) fps_max(200)