Clean Up Events

BeStride.lua

@@ -165,13 +165,13 @@ end
 function BeStride:OnEnable()
 	BeStride:buildMountTables()
 
-	self:RegisterEvent("UPDATE_BINDINGS", "UpdateBindings")
-	self:RegisterEvent("NEW_MOUNT_ADDED", "NewMount")
+	--BeStride:RegisterEvent("UPDATE_BINDINGS", "EventUpdateKeyBinding")
+	BeStride:RegisterEvent("NEW_MOUNT_ADDED", "EventNewMount")
 
-	BeStride:RegisterEvent("PLAYER_REGEN_DISABLED", "CombatEnter")
-	BeStride:RegisterEvent("PLAYER_REGEN_ENABLED", "CombatExit")
+	BeStride:RegisterEvent("PLAYER_REGEN_DISABLED", "EventCombatEnter")
+	BeStride:RegisterEvent("PLAYER_REGEN_ENABLED", "EventCombatExit")
 
-	BeStride:UpdateBindings()
+	--BeStride:UpdateBindings()
 	BeStride:Upgrade()
 end
 
@@ -186,27 +186,6 @@ function BeStride:NewMount(...)
 	table.foreach(args,function (k,v) print("Arg: " .. k) end)
 end
 
-function BeStride:CombatEnter()
-	--BeStride_Debug:Verbose("Entering Combat")
-	local combatButton = BeStride_Logic:Combat()
-
-	if combatButton ~= nil then
-		--BeStride_Debug:Verbose("Mount: " .. combatButton)
-		BeStride_ABRegularMount:SetAttribute("macrotext",combatButton)
-		BeStride_ABGroundMount:SetAttribute("macrotext",combatButton)
-		BeStride_ABPassengerMount:SetAttribute("macrotext",combatButton)
-		BeStride_ABRepairMount:SetAttribute("macrotext",combatButton)
-	end
-end
-
-function BeStride:CombatExit()
-	--BeStride_Debug:Verbose("Exiting Combat")
-	BeStride_ABRegularMount:SetAttribute("macrotext",nil)
-	BeStride_ABGroundMount:SetAttribute("macrotext",nil)
-	BeStride_ABPassengerMount:SetAttribute("macrotext",nil)
-	BeStride_ABRepairMount:SetAttribute("macrotext",nil)
-end
-
 function BeStride:UpdateBindings()
 	BeStride_Debug:Verbose("Firing Update Bindings")
 	BeStride:SetKeyBindings(self.buttons["regular"])

BeStride_Events.lua

@@ -1,4 +1,28 @@
-function BeStride_Event:NewMount(arg1, arg2)
+function BeStride:EventNewMount(arg1, arg2)
 	BeStride:AddNewMount(arg2)
 	--BeStride:GUIHandleNewCompanion(arg2)
+end
+
+function BeStride:EventUpdateKeyBinding()
+end
+
+function BeStride:EventCombatEnter()
+	--BeStride_Debug:Verbose("Entering Combat")
+	local combatButton = BeStride_Logic:Combat()
+
+	if combatButton ~= nil then
+		--BeStride_Debug:Verbose("Mount: " .. combatButton)
+		BeStride_ABRegularMount:SetAttribute("macrotext",combatButton)
+		BeStride_ABGroundMount:SetAttribute("macrotext",combatButton)
+		BeStride_ABPassengerMount:SetAttribute("macrotext",combatButton)
+		BeStride_ABRepairMount:SetAttribute("macrotext",combatButton)
+	end
+end
+
+function BeStride:EventCombatExit()
+	--BeStride_Debug:Verbose("Exiting Combat")
+	BeStride_ABRegularMount:SetAttribute("macrotext",nil)
+	BeStride_ABGroundMount:SetAttribute("macrotext",nil)
+	BeStride_ABPassengerMount:SetAttribute("macrotext",nil)
+	BeStride_ABRepairMount:SetAttribute("macrotext",nil)
 end

localization/en-US.lua

@@ -1,8 +1,8 @@
 _G["BINDING_HEADER_BESTRIDE_TITLE"] = "BeStride"
-_G["BINDING_NAME_BeStride_ABRegularMount"] = "Mount Button"
-_G["BINDING_NAME_BeStride_ABGroundMount"] = "Force Ground Mount Button"
-_G["BINDING_NAME_BeStride_ABRepairMount"] = "Force Repair Mount Button"
-_G["BINDING_NAME_BeStride_ABPassengerMount"] = "Force Passenger Mount Button"
+_G["BINDING_NAME_CLICK BeStride_ABRegularMount:LeftButton"] = "Mount Button"
+_G["BINDING_NAME_CLICK BeStride_ABGroundMount:LeftButton"] = "Force Ground Mount Button"
+_G["BINDING_NAME_CLICK BeStride_ABRepairMount:LeftButton"] = "Force Repair Mount Button"
+_G["BINDING_NAME_CLICK BeStride_ABPassengerMount:LeftButton"] = "Force Passenger Mount Button"
 
 BeStride_Locale = {
 	Zone = {