Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #254 from SignatureBeef/net9-upgrade
Upgrade to .NET 9 and OTAPI Static Hooks for ARM64
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,96 +1,96 @@ | ||
| using OTAPI; | ||
|
|
||
| namespace TerrariaApi.Server.Hooking; | ||
|
|
||
| internal static class GameHooks | ||
| { | ||
| private static HookManager _hookManager; | ||
|
|
||
| /// <summary> | ||
| /// Attaches any of the OTAPI Game hooks to the existing <see cref="HookManager"/> implementation | ||
| /// </summary> | ||
| /// <param name="hookManager">HookManager instance which will receive the events</param> | ||
| public static void AttachTo(HookManager hookManager) | ||
| { | ||
| _hookManager = hookManager; | ||
|
|
||
| HookEvents.Terraria.Main.Update += OnUpdate; | ||
| HookEvents.Terraria.Main.Initialize += OnInitialize; | ||
| HookEvents.Terraria.Netplay.StartServer += OnStartServer; | ||
|
|
||
| Hooks.WorldGen.HardmodeTilePlace += OnHardmodeTilePlace; | ||
| Hooks.WorldGen.HardmodeTileUpdate += OnHardmodeTileUpdate; | ||
| Hooks.Item.MechSpawn += OnItemMechSpawn; | ||
| Hooks.NPC.MechSpawn += OnNpcMechSpawn; | ||
| } | ||
|
|
||
| private static void OnUpdate(Terraria.Main instance, HookEvents.Terraria.Main.UpdateEventArgs args) | ||
| { | ||
| if (!args.ContinueExecution) return; | ||
| args.ContinueExecution = false; | ||
| _hookManager.InvokeGameUpdate(); | ||
| args.OriginalMethod(args.gameTime); | ||
| _hookManager.InvokeGamePostUpdate(); | ||
| } | ||
|
|
||
| private static void OnHardmodeTileUpdate(object sender, Hooks.WorldGen.HardmodeTileUpdateEventArgs e) | ||
| { | ||
| if (e.Result == HookResult.Cancel) | ||
| { | ||
| return; | ||
| } | ||
| if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type)) | ||
| { | ||
| e.Result = HookResult.Cancel; | ||
| } | ||
| } | ||
|
|
||
| private static void OnHardmodeTilePlace(object sender, Hooks.WorldGen.HardmodeTilePlaceEventArgs e) | ||
| { | ||
| if (e.Result == HardmodeTileUpdateResult.Cancel) | ||
| { | ||
| return; | ||
| } | ||
| if (_hookManager.InvokeGameHardmodeTileUpdate(e.X, e.Y, e.Type)) | ||
| { | ||
| e.Result = HardmodeTileUpdateResult.Cancel; | ||
| } | ||
| } | ||
|
|
||
| private static void OnInitialize(Terraria.Main instance, HookEvents.Terraria.Main.InitializeEventArgs args) | ||
| { | ||
| if (!args.ContinueExecution) return; | ||
| HookManager.InitialiseAPI(); | ||
| _hookManager.InvokeGameInitialize(); | ||
| } | ||
|
|
||
| private static void OnStartServer(object? sender, HookEvents.Terraria.Netplay.StartServerEventArgs args) | ||
|
Check warning on line 67 in TerrariaServerAPI/TerrariaApi.Server/Hooking/GameHooks.cs
|
||
| { | ||
| if (!args.ContinueExecution) return; | ||
| _hookManager.InvokeGamePostInitialize(); | ||
| } | ||
|
|
||
| private static void OnItemMechSpawn(object sender, Hooks.Item.MechSpawnEventArgs e) | ||
| { | ||
| if (e.Result == HookResult.Cancel) | ||
| { | ||
| return; | ||
| } | ||
| if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, false)) | ||
| { | ||
| e.Result = HookResult.Cancel; | ||
| } | ||
| } | ||
|
|
||
| private static void OnNpcMechSpawn(object sender, Hooks.NPC.MechSpawnEventArgs e) | ||
| { | ||
| if (e.Result == HookResult.Cancel) | ||
| { | ||
| return; | ||
| } | ||
| if (!_hookManager.InvokeGameStatueSpawn(e.Num2, e.Num3, e.Num, (int)(e.X / 16f), (int)(e.Y / 16f), e.Type, true)) | ||
| { | ||
| e.Result = HookResult.Cancel; | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.