Skip to content

Commit dcba09b

Browse files
committed
Made some more "minor" changes to fix the startup crashing (API init methods are now invoked directly instead of using the LoaderInitialize attribute)
1 parent c22fb0c commit dcba09b

41 files changed

Lines changed: 231 additions & 251 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LabExtended/API/Audio/AudioManager.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ private static void OnFileAdded(object _, FileSystemEventArgs ev)
258258
private static void OnFileModified(object _, FileSystemEventArgs ev)
259259
=> OnFileAdded(_, ev);
260260

261-
[LoaderInitialize(1)]
262-
private static void OnInit()
261+
internal static void Internal_Init()
263262
{
264263
ClipDirectory = Path.Combine(ApiLoader.DirectoryPath, "Audio");
265264

LabExtended/API/Camera.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,7 @@ private static void OnWaiting()
424424
}
425425
}
426426

427-
[LoaderInitialize(1)]
428-
private static void OnInit()
427+
internal static void Internal_Init()
429428
{
430429
InternalEvents.OnRoundRestart += Lookup.Clear;
431430
InternalEvents.OnRoundWaiting += OnWaiting;

LabExtended/API/Containers/SwitchContainer.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,7 @@ private static void Internal_PickingUpScp330(PlayerPickingUpScp330EventArgs args
468468
}
469469
}
470470

471-
[LoaderInitialize(-1)]
472-
private static void Internal_Init()
471+
internal static void Internal_Init()
473472
{
474473
PlayerEvents.PickingUpAmmo += Internal_PickingUpAmmo;
475474
PlayerEvents.PickingUpItem += Internal_PickingUpItem;

LabExtended/API/CustomEffects/CustomPlayerEffect.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ private static void OnDiscovered(Type type)
142142
Effects.Add(type);
143143
}
144144

145-
[LoaderInitialize(1)]
146-
private static void OnInit()
145+
internal static void Internal_Init()
147146
{
148147
ReflectionUtils.Discovered += OnDiscovered;
149148
}

LabExtended/API/CustomFirearms/CustomFirearmEvents.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ private static void OnProcessedEvent(FirearmProcessedEventEventArgs args)
142142
=> CustomItemUtils.ProcessEvent<CustomFirearmInventoryBehaviour>(args.Firearm.ItemSerial,
143143
item => item.OnProcessedEvent(args));
144144

145-
[LoaderInitialize(1)]
146-
private static void OnInit()
145+
internal static void Internal_Init()
147146
{
148147
ExPlayerEvents.ChangingAttachments += OnChangingAttachments;
149148
ExPlayerEvents.ChangedAttachments += OnChangedAttachments;

LabExtended/API/CustomItems/CustomItemRegistry.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,7 @@ private static void OnDiscovered(Type type)
574574
Register(type);
575575
}
576576

577-
[LoaderInitialize(1)]
578-
private static void OnInit()
577+
internal static void Internal_Init()
579578
{
580579
PlayerUpdateHelper.OnUpdate += OnUpdate;
581580

LabExtended/API/CustomRoles/CustomRoleManager.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,7 @@ private static void OnPlayerLeft(ExPlayer? player)
463463
player.Role.CustomRole = null;
464464
}
465465

466-
[LoaderInitialize(1)]
467-
private static void OnInit()
466+
internal static void Internal_Init()
468467
{
469468
InternalEvents.OnPlayerLeft += OnPlayerLeft;
470469
}

LabExtended/API/CustomTeams/CustomTeamHandler.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ private static void Internal_OnChangedRole(PlayerChangedRoleEventArgs args)
289289
player.Role.CustomTeam = null;
290290
}
291291

292-
[LoaderInitialize(1)]
293-
private static void Internal_Init()
292+
internal static void Internal_Init()
294293
{
295294
PlayerEvents.ChangingRole += Internal_OnChangingRole;
296295
PlayerEvents.ChangedRole += Internal_OnChangedRole;

LabExtended/API/CustomTeams/CustomTeamRegistry.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ private static void OnDiscovered(Type type)
113113
Register(type);
114114
}
115115

116-
[LoaderInitialize(1)]
117-
private static void OnInit()
116+
internal static void Internal_Init()
118117
{
119118
ReflectionUtils.Discovered += OnDiscovered;
120119
}

LabExtended/API/Elevator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,8 +479,7 @@ private static void OnElevatorSpawned(ElevatorChamber chamber)
479479
private static void OnElevatorDestroyed(ElevatorChamber chamber)
480480
=> Lookup.Remove(chamber);
481481

482-
[LoaderInitialize(1)]
483-
private static void OnInit()
482+
internal static void Internal_Init()
484483
{
485484
ElevatorChamber.OnElevatorSpawned += OnElevatorSpawned;
486485
ElevatorChamber.OnElevatorRemoved += OnElevatorDestroyed;

0 commit comments

Comments
 (0)