fix: Remove debug information

Yushu2606 · Yushu2606 · commit 3f7918e31526 · 2024-02-04T22:20:43.000+08:00
diff --git a/src/Events/HookEventBase.cs b/src/Events/HookEventBase.cs
@@ -1,6 +1,4 @@
-﻿using Hosihikari.Minecraft.Extension.Events.Implements;
-using Hosihikari.NativeInterop.Hook.ObjectOriented;
-using Microsoft.Extensions.Logging;
+﻿using Hosihikari.NativeInterop.Hook.ObjectOriented;
 using System.Runtime.CompilerServices;
 
 namespace Hosihikari.Minecraft.Extension.Events;
@@ -112,35 +110,18 @@ protected virtual void AfterEventAllRemoved()
 
     protected virtual void OnEventBefore(TEventArgs e)
     {
-        try
-        {
-            InternalBefore?.Invoke(this, e);
-        }
-        catch (Exception ex)
-        {
-            Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}",
-                _className + "::" + nameof(OnEventBefore), ex);
-        }
+        InternalBefore?.Invoke(this, e);
     }
 
     protected virtual void OnEventAfter(TEventArgs e)
     {
-        try
-        {
-            InternalAfter?.Invoke(this, e);
-        }
-        catch (Exception ex)
-        {
-            Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}",
-                _className + "::" + nameof(OnEventBefore), ex);
-        }
-
+        InternalAfter?.Invoke(this, e);
         Task? task = InternalAsync?.Invoke(this, e);
         //todo allow user to toggle off in config ?
         //output error when async event throw exception
         task?.ContinueWith(
-            t => Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}",
-                _className + "::" + nameof(OnEventAfter) + "Async", t.Exception),
+            t => Environment.FailFast($"Unhandled Exception in {_className + "::" + nameof(OnEventAfter) + "Async"}",
+                t.Exception),
             TaskContinuationOptions.OnlyOnFaulted
         );
     }
diff --git a/src/Events/Implements/Log.cs b/src/Events/Implements/Log.cs
diff --git a/src/Events/Implements/Player/ChatEvent.cs b/src/Events/Implements/Player/ChatEvent.cs
@@ -1,5 +1,4 @@
 ﻿using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.Events.Implements.Player;
 
@@ -27,37 +26,30 @@ Reference<TextPacket> textPacket
     public override HookDelegate HookedFunc =>
         (networkHandlerPtr, networkIdentifierPtr, textPacketPtr) =>
         {
-            try
-            {
-                ServerNetworkHandler networkHandler = networkHandlerPtr.Target;
-                NetworkIdentifier networkIdentifier = networkIdentifierPtr.Target;
-                TextPacket packet = textPacketPtr.Target;
+            ServerNetworkHandler networkHandler = networkHandlerPtr.Target;
+            NetworkIdentifier networkIdentifier = networkIdentifierPtr.Target;
+            TextPacket packet = textPacketPtr.Target;
 
-                throw new NotImplementedException();
+            throw new NotImplementedException();
 
-                //if (networkHandler.TryFetchPlayer(networkIdentifier, packet, out var player))
-                //{
-                //    var textType = *((byte*)textPacketPtr + OffsetData.Current.TextPacketTextTypeOffsetByte);//44
-                //    if (textType != 1)//not a chat packet
-                //    {
-                //        Original(networkHandlerPtr, networkIdentifierPtr, textPacketPtr);
-                //        return;
-                //    }
-                //    var e = new ChatEventArgs
-                //    {
-                //        ServerPlayer = player,
-                //        Message = NativeInterop.Utils.StringUtils.MarshalStdString((byte*)textPacketPtr + OffsetData.Current.TextPacketMessageOffsetByte)//80
-                //    };
-                //    OnEventBefore(e);
-                //    if (e.IsCanceled)
-                //        return; //cancel the original
-                //    Original(networkHandlerPtr, networkIdentifierPtr, textPacketPtr);
-                //    OnEventAfter(e);
-                //}
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}", nameof(ChatEvent), ex);
-            }
+            //if (networkHandler.TryFetchPlayer(networkIdentifier, packet, out var player))
+            //{
+            //    var textType = *((byte*)textPacketPtr + OffsetData.Current.TextPacketTextTypeOffsetByte);//44
+            //    if (textType != 1)//not a chat packet
+            //    {
+            //        Original(networkHandlerPtr, networkIdentifierPtr, textPacketPtr);
+            //        return;
+            //    }
+            //    var e = new ChatEventArgs
+            //    {
+            //        ServerPlayer = player,
+            //        Message = NativeInterop.Utils.StringUtils.MarshalStdString((byte*)textPacketPtr + OffsetData.Current.TextPacketMessageOffsetByte)//80
+            //    };
+            //    OnEventBefore(e);
+            //    if (e.IsCanceled)
+            //        return; //cancel the original
+            //    Original(networkHandlerPtr, networkIdentifierPtr, textPacketPtr);
+            //    OnEventAfter(e);
+            //}
         };
 }
diff --git a/src/Events/Implements/Player/DeathEvent.cs b/src/Events/Implements/Player/DeathEvent.cs
@@ -1,5 +1,4 @@
 ﻿using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.Events.Implements.Player;
 
@@ -23,22 +22,9 @@ public sealed class DeathEvent() : HookEventBase<DeathEventArgs, DeathEvent.Hook
     public override HookDelegate HookedFunc =>
         (serverPlayerPtr, damageSource) =>
         {
-            bool needCallOriginal = true;
-            try
-            {
-                DeathEventArgs e = new(serverPlayerPtr.Target);
-                OnEventBefore(e);
-                needCallOriginal = false;
-                Original(serverPlayerPtr, damageSource);
-                OnEventAfter(e);
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}", nameof(DeathEvent), ex);
-                if (needCallOriginal)
-                {
-                    Original(serverPlayerPtr, damageSource);
-                }
-            }
+            DeathEventArgs e = new(serverPlayerPtr.Target);
+            OnEventBefore(e);
+            Original(serverPlayerPtr, damageSource);
+            OnEventAfter(e);
         };
 }
diff --git a/src/Events/Implements/Player/InitializedEvent.cs b/src/Events/Implements/Player/InitializedEvent.cs
@@ -1,5 +1,4 @@
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.Events.Implements.Player;
 
@@ -22,16 +21,9 @@ public sealed class InitializedEvent()
     public override HookDelegate HookedFunc =>
         serverPlayerPtr =>
         {
-            try
-            {
-                InitializedEventArgs e = new(serverPlayerPtr.Target);
-                OnEventBefore(e);
-                Original(serverPlayerPtr);
-                OnEventAfter(e);
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}", nameof(InitializedEvent), ex);
-            }
+            InitializedEventArgs e = new(serverPlayerPtr.Target);
+            OnEventBefore(e);
+            Original(serverPlayerPtr);
+            OnEventAfter(e);
         };
 }
diff --git a/src/Events/Implements/Player/JoinEvent.cs b/src/Events/Implements/Player/JoinEvent.cs
@@ -1,5 +1,4 @@
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.Events.Implements.Player;
 
@@ -26,16 +25,9 @@ Reference<ServerPlayer> a3
     public override HookDelegate HookedFunc =>
         (handler, identifier, request, serverPlayerPtr) =>
         {
-            try
-            {
-                JoinEventArgs e = new(serverPlayerPtr.Target);
-                OnEventBefore(e);
-                Original(handler, identifier, request, serverPlayerPtr);
-                OnEventAfter(e);
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}", nameof(JoinEvent), ex);
-            }
+            JoinEventArgs e = new(serverPlayerPtr.Target);
+            OnEventBefore(e);
+            Original(handler, identifier, request, serverPlayerPtr);
+            OnEventAfter(e);
         };
 }
diff --git a/src/Events/Implements/Player/LeftEvent.cs b/src/Events/Implements/Player/LeftEvent.cs
@@ -1,5 +1,4 @@
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.Events.Implements.Player;
 
@@ -20,16 +19,9 @@ public sealed class LeftEvent() : HookEventBase<LeftEventArgs, LeftEvent.HookDel
     public override HookDelegate HookedFunc =>
         serverPlayerPtr =>
         {
-            try
-            {
-                LeftEventArgs e = new(serverPlayerPtr.Target);
-                OnEventBefore(e);
-                Original(serverPlayerPtr);
-                OnEventAfter(e);
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}", nameof(InitializedEvent), ex);
-            }
+            LeftEventArgs e = new(serverPlayerPtr.Target);
+            OnEventBefore(e);
+            Original(serverPlayerPtr);
+            OnEventAfter(e);
         };
 }
diff --git a/src/Events/Implements/Player/RespawnEvent.cs b/src/Events/Implements/Player/RespawnEvent.cs
@@ -1,5 +1,4 @@
 ﻿using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.Events.Implements.Player;
 
@@ -20,17 +19,10 @@ public class RespawnEvent() : HookEventBase<RespawnEventArgs, RespawnEvent.HookD
     public override HookDelegate HookedFunc =>
         serverPlayerPtr =>
         {
-            try
-            {
-                //Actor::getIsExperienceDropEnabled
-                RespawnEventArgs e = new(serverPlayerPtr.Target);
-                OnEventBefore(e);
-                Original(serverPlayerPtr);
-                OnEventAfter(e);
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}", nameof(InitializedEvent), ex);
-            }
+            //Actor::getIsExperienceDropEnabled
+            RespawnEventArgs e = new(serverPlayerPtr.Target);
+            OnEventBefore(e);
+            Original(serverPlayerPtr);
+            OnEventAfter(e);
         };
 }
diff --git a/src/FormUI/FormHandler.cs b/src/FormUI/FormHandler.cs
@@ -176,7 +176,7 @@ private static void HandleFormPacket(object? sender, FormResponseEventArgs e)
 
                     if (customForm.IsNullCallback is false)
                     {
-                        Dictionary<string, CustomFormElement> elements = new Dictionary<string, CustomFormElement>();
+                        Dictionary<string, CustomFormElement> elements = new();
                         foreach ((string k, CustomFormElement v) in customForm.Elements)
                         {
                             elements.Add(k, v);
diff --git a/src/GlobalService/GlobalInstance.cs b/src/GlobalService/GlobalInstance.cs
@@ -1,5 +1,4 @@
 ﻿using Hosihikari.NativeInterop.Hook.ObjectOriented;
-using Microsoft.Extensions.Logging;
 using System.Runtime.CompilerServices;
 
 namespace Hosihikari.Minecraft.Extension.GlobalService;
@@ -79,18 +78,7 @@ public void OnInit(
         [CallerLineNumber] int line = 0
     )
     {
-        PostOnInit(v =>
-        {
-            try
-            {
-                callback(v);
-            }
-            catch (Exception ex)
-            {
-                Log.Logger.LogError("Unhandled Exception in {ModuleName}: {Exception}\n  in {FileName}:{LineNumber}",
-                    GetType().Name + "::" + nameof(OnInit), ex, file, line);
-            }
-        });
+        PostOnInit(v => { callback(v); });
     }
 
     public static implicit operator T(GlobalInstance<T> instance)
diff --git a/src/GlobalService/Hook/DbStorageHook.cs b/src/GlobalService/Hook/DbStorageHook.cs
@@ -1,6 +1,5 @@
 using Hosihikari.NativeInterop.Hook.ObjectOriented;
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.GlobalService.Hook;
 
@@ -9,7 +8,6 @@ internal sealed class DbStorageHook() : HookBase<DbStorageHook.HookDelegate>(DBS
     public override unsafe HookDelegate HookedFunc =>
         (@this, a2, a3) =>
         {
-            Log.Logger.LogTrace("In {ModuleName}", nameof(DbStorageHook));
             Pointer<DBStorage> result = Original(@this, a2, a3);
             Global.DbStorage.Instance = @this.Target;
             Global.LevelStorage.Instance = @this.Target.As<LevelStorage>();
diff --git a/src/GlobalService/Hook/FilePathManagerHook.cs b/src/GlobalService/Hook/FilePathManagerHook.cs
@@ -1,6 +1,5 @@
 ﻿using Hosihikari.NativeInterop.Hook.ObjectOriented;
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.GlobalService.Hook;
 
@@ -10,7 +9,6 @@ internal sealed class FilePathManagerHook()
     public override HookDelegate HookedFunc =>
         (@this, a2, a3) =>
         {
-            Log.Logger.LogTrace("In {ModuleName}", nameof(FilePathManagerHook));
             Pointer<Core.FilePathManager> result = Original(@this, a2, a3);
             Global.FilePathManager.Instance = @this.Target;
             TryUninstall();
diff --git a/src/GlobalService/Hook/MinecraftCommandsHook.cs b/src/GlobalService/Hook/MinecraftCommandsHook.cs
@@ -1,6 +1,5 @@
 using Hosihikari.NativeInterop.Hook.ObjectOriented;
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.GlobalService.Hook;
 
@@ -10,7 +9,6 @@ internal sealed class MinecraftCommandsHook()
     public override HookDelegate HookedFunc =>
         (@this, a2, a3, a4, a5, a6) =>
         {
-            Log.Logger.LogTrace("In {ModuleName}", nameof(MinecraftCommandsHook));
             Global.MinecraftCommands.Instance = @this.Target;
             Original(@this, a2, a3, a4, a5, a6);
             TryUninstall();
diff --git a/src/GlobalService/Hook/MinecraftHook.cs b/src/GlobalService/Hook/MinecraftHook.cs
@@ -1,6 +1,5 @@
 using Hosihikari.NativeInterop.Hook.ObjectOriented;
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 
 namespace Hosihikari.Minecraft.Extension.GlobalService.Hook;
 
@@ -9,7 +8,6 @@ internal sealed class MinecraftHook() : HookBase<MinecraftHook.HookDelegate>(Min
     public override HookDelegate HookedFunc =>
         @this =>
         {
-            Log.Logger.LogTrace("In {ModuleName}", nameof(MinecraftHook));
             Original(@this);
             Global.Minecraft.Instance = new(@this);
             TryUninstall();
diff --git a/src/GlobalService/Hook/RakPeerHook.cs b/src/GlobalService/Hook/RakPeerHook.cs
@@ -1,6 +1,5 @@
 using Hosihikari.NativeInterop.Hook.ObjectOriented;
 using Hosihikari.NativeInterop.Unmanaged;
-using Microsoft.Extensions.Logging;
 using static Hosihikari.Minecraft.RakNet;
 
 namespace Hosihikari.Minecraft.Extension.GlobalService.Hook;
@@ -10,7 +9,6 @@ internal sealed class RakPeerHook() : HookBase<RakPeerHook.HookDelegate>(RakPeer
     public override HookDelegate HookedFunc =>
         @this =>
         {
-            Log.Logger.LogTrace("In {ModuleName}", nameof(RakPeerHook));
             Pointer<RakPeer> result = Original(@this);
             Global.RakPeer.Instance = @this.Target;
             TryUninstall();
diff --git a/src/GlobalService/Hook/ScoreboardHook.cs b/src/GlobalService/Hook/ScoreboardHook.cs
diff --git a/src/GlobalService/Hook/ServerNetworkHandlerHook.cs b/src/GlobalService/Hook/ServerNetworkHandlerHook.cs
diff --git a/src/GlobalService/Hook/StructureManager.cs b/src/GlobalService/Hook/StructureManager.cs
diff --git a/src/GlobalService/Log.cs b/src/GlobalService/Log.cs
diff --git a/src/Hosihikari.Minecraft.Extension.csproj b/src/Hosihikari.Minecraft.Extension.csproj
diff --git a/src/PackHelper/PackStackHook.cs b/src/PackHelper/PackStackHook.cs

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private static void HandleFormPacket(object? sender, FormResponseEventArgs e)`
`176`	`176`
`177`	`177`	`if (customForm.IsNullCallback is false)`
`178`	`178`	`{`
`179`		`- Dictionary<string, CustomFormElement> elements = new Dictionary<string, CustomFormElement>();`
	`179`	`+ Dictionary<string, CustomFormElement> elements = new();`
`180`	`180`	`foreach ((string k, CustomFormElement v) in customForm.Elements)`
`181`	`181`	`{`
`182`	`182`	`elements.Add(k, v);`