From 608e7a99bc68fbb0f9b1fc4cff0835a36d988186 Mon Sep 17 00:00:00 2001 From: xuyuwtu <3082068984@qq.com> Date: Thu, 29 Jan 2026 11:17:13 +0800 Subject: [PATCH] rename NetModuleType member, add check method --- TShockAPI/GetDataHandlers.cs | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index c81c35c4..6c1183cd 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -40,6 +40,8 @@ using TShockAPI.Models.PlayerUpdate; using TShockAPI.Models.Projectiles; using Terraria.Net; using Terraria.GameContent.NetModules; +using Terraria.GameContent; +using Terraria.GameContent.Items; namespace TShockAPI { @@ -156,7 +158,25 @@ namespace TShockAPI { PacketTypes.SyncLoadout, HandleSyncLoadout } }; } - + [Conditional("FALSE")] + private static void NetModuleIDCheck() + { + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Liquid); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Text); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Ping); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Ambience); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Bestiary); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.CreativePowers); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.CreativeUnlocksPlayerReport); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.TeleportPylon); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Particles); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.CreativePowerPermissions); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.Banners); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.CraftingRequests); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.TagEffectState); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.LeashedEntity); + Debug.Assert(NetManager.Instance.GetId() == (int)NetModuleType.UnbreakableWallScan); + } public static bool HandlerGetData(PacketTypes type, TSPlayer player, MemoryStream data) { GetDataHandlerDelegate handler; @@ -4859,8 +4879,8 @@ namespace TShockAPI TeleportPylon, Particles, CreativePowerPermissions, - NetBanners, - NetCraftingRequests, + Banners, + CraftingRequests, TagEffectState, LeashedEntity, UnbreakableWallScan