Skip to content

Commit 629dd18

Browse files
committed
fix bingo import
1 parent d93deaf commit 629dd18

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

SomethingNeedDoing/LuaMacro/Modules/PlayerModule.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public unsafe class PlayerModule : LuaModuleBase
1010
public override string ModuleName => "Player";
1111
public override void Register(Lua lua)
1212
{
13-
lua.DoString("WeeklyBingoTaskStatus = luanet.import_type('FFXIVClientStructs.FFXIV.Client.Game.UI.WeeklyBingoTaskStatus')");
13+
lua.DoString("WeeklyBingoTaskStatus = luanet.import_type('FFXIVClientStructs.FFXIV.Client.Game.UI.PlayerState+WeeklyBingoTaskStatus')");
1414
base.Register(lua);
1515
}
1616

SomethingNeedDoing/Managers/TriggerEventManager.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ public void RegisterFunctionTrigger(IMacro macro, string functionName)
9999
var triggerFunction = new TriggerFunction(macro, functionName, TriggerEvent.OnAddonEvent);
100100
if (_eventHandlers[TriggerEvent.OnAddonEvent].Contains(triggerFunction))
101101
{
102-
Svc.Log.Debug($"[TriggerEventManager] Function trigger already registered for macro {macro.Name} function {functionName} (Addon: {parts[1]}, Event: {parts[2]})");
102+
Svc.Log.Debug($"[{nameof(TriggerEventManager)}] Function trigger already registered for macro {macro.Name} function {functionName} (Addon: {parts[1]}, Event: {parts[2]})");
103103
return;
104104
}
105-
Svc.Log.Debug($"[TriggerEventManager] Registering OnAddonEvent trigger for macro {macro.Name} function {functionName} (Addon: {parts[1]}, Event: {parts[2]})");
105+
Svc.Log.Debug($"[{nameof(TriggerEventManager)}] Registering OnAddonEvent trigger for macro {macro.Name} function {functionName} (Addon: {parts[1]}, Event: {parts[2]})");
106106
_eventHandlers[TriggerEvent.OnAddonEvent].Add(triggerFunction);
107107
return;
108108
}
@@ -121,10 +121,10 @@ public void RegisterFunctionTrigger(IMacro macro, string functionName)
121121
var triggerFunction = new TriggerFunction(macro, functionName, eventType);
122122
if (_eventHandlers[eventType].Contains(triggerFunction))
123123
{
124-
Svc.Log.Debug($"[TriggerEventManager] Function trigger already registered for macro {macro.Name} function {functionName} event {eventType}");
124+
Svc.Log.Debug($"[{nameof(TriggerEventManager)}] Function trigger already registered for macro {macro.Name} function {functionName} event {eventType}");
125125
return;
126126
}
127-
Svc.Log.Debug($"[TriggerEventManager] Registering trigger event {eventType} for macro {macro.Name} function {functionName}");
127+
Svc.Log.Debug($"[{nameof(TriggerEventManager)}] Registering trigger event {eventType} for macro {macro.Name} function {functionName}");
128128
_eventHandlers[eventType].Add(triggerFunction);
129129
return;
130130
}
@@ -159,7 +159,7 @@ public void UnregisterFunctionTrigger(IMacro macro, string functionName)
159159
{
160160
var removed = value.RemoveAll(tf => tf.Macro.Id == macro.Id && tf.FunctionName == functionName);
161161
if (removed > 0)
162-
Svc.Log.Debug($"Unregistering OnAddonEvent trigger for macro {macro.Name} function {functionName}");
162+
Svc.Log.Debug($"[{nameof(TriggerEventManager)}] Unregistering OnAddonEvent trigger for macro {macro.Name} function {functionName}");
163163
}
164164
return;
165165
}
@@ -176,7 +176,7 @@ public void UnregisterFunctionTrigger(IMacro macro, string functionName)
176176
{
177177
var removed = value.RemoveAll(tf => tf.Macro.Id == macro.Id && tf.FunctionName == functionName);
178178
if (removed > 0)
179-
Svc.Log.Debug($"Unregistering trigger event {eventType} for macro {macro.Name} function {functionName}");
179+
Svc.Log.Debug($"[{nameof(TriggerEventManager)}] Unregistering trigger event {eventType} for macro {macro.Name} function {functionName}");
180180
}
181181
return;
182182
}
@@ -203,7 +203,7 @@ public async Task RaiseTriggerEvent(TriggerEvent eventType, object? data = null)
203203
if (!_eventHandlers.TryGetValue(eventType, out var handlers))
204204
return;
205205

206-
Svc.Log.Verbose($"[TriggerEventManager] Handlers for {eventType}: {string.Join(", ", handlers.Select(h => $"{h.Macro.Name}:{h.FunctionName}"))}");
206+
Svc.Log.Verbose($"[{nameof(TriggerEventManager)}] Handlers for {eventType}: {string.Join(", ", handlers.Select(h => $"{h.Macro.Name}:{h.FunctionName}"))}");
207207

208208
var args = new TriggerEventArgs(eventType, data);
209209
foreach (var triggerFunction in handlers.ToList())

0 commit comments

Comments
 (0)