fix: Fix building

HosihikariArchive · Feb 23, 2024 · 0d7616f · 0d7616f
1 parent b1656d7
commit 0d7616f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/src/EntryPoint.cs b/src/EntryPoint.cs
@@ -1,5 +1,4 @@
-using Hosihikari.Minecraft.Extension.GlobalService;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 namespace Hosihikari.Minecraft.Extension;
 
@@ -11,7 +10,7 @@ internal static class EntryPoint
     internal static void Main() // must be loaded
     {
         LevelTick.InitHook();
-        Global.Init();
+        GlobalService.Global.Init();
         if (!OperatingSystem.IsWindows())
         {
             PackHelper.PackHelper.Init();

diff --git a/src/Event/HookEventBase.cs b/src/Event/HookEventBase.cs
@@ -15,15 +15,15 @@ public abstract class HookEventBase<TEventArgs, THookDelegate> : HookBase<THookD
     protected HookEventBase(string symbol, [CallerFilePath] string sourceFile = "")
         : base(symbol)
     {
-        _className = Path.GetFileNameWithoutExtension(
+        _className = System.IO.Path.GetFileNameWithoutExtension(
             sourceFile.Replace("\\", "/") /*fix if compile in windows*/
         );
     }
 
     protected HookEventBase(Delegate func, [CallerFilePath] string sourceFile = "")
         : base(func)
     {
-        _className = Path.GetFileNameWithoutExtension(
+        _className = System.IO.Path.GetFileNameWithoutExtension(
             sourceFile.Replace("\\", "/") /*fix if compile in windows*/
         );
     }

diff --git a/src/Event/Implements/Player/DestroyBlockEvent.cs b/src/Event/Implements/Player/DestroyBlockEvent.cs
@@ -5,14 +5,14 @@ namespace Hosihikari.Minecraft.Extension.Event.Implements.Player;
 
 public sealed class DestroyBlockEventArgs : CancelableEventArgsBase
 {
-    internal DestroyBlockEventArgs(Minecraft.Player player, nint position, int dimensionId = -1)
+    internal DestroyBlockEventArgs(Hosihikari.Minecraft.Player player, nint position, int dimensionId = -1)
     {
         Player = player;
         Position = position;
         DimensionId = dimensionId;
     }
 
-    public Minecraft.Player Player { get; }
+    public Hosihikari.Minecraft.Player Player { get; }
     public nint Position { get; }
     public int DimensionId { get; }
 }
@@ -21,15 +21,15 @@ public sealed class DestroyBlockEvent()
     : HookEventBase<DestroyBlockEventArgs, DestroyBlockEvent.HookDelegateType>(Block.Original.PlayerWillDestroy)
 {
     [return: MarshalAs(UnmanagedType.U1)]
-    public unsafe delegate bool HookDelegateType(Pointer<Block> @this, Pointer<Minecraft.Player> player,
+    public unsafe delegate bool HookDelegateType(Pointer<Block> @this, Pointer<Hosihikari.Minecraft.Player> player,
         nint* pos);
 
     private const int DimensionIdOffset = 352;
 
     protected override unsafe HookDelegateType HookDelegate =>
         (@this, _player, pos) =>
         {
-            Minecraft.Player player = _player.Target;
+            Hosihikari.Minecraft.Player player = _player.Target;
             using Actor actor = player.As<Actor>();
             using Dimension dim = actor.Dimension.Target;
             int dimensionId = Memory.DAccess<int>(dim.Pointer, DimensionIdOffset);

diff --git a/src/FormUI/FormHandler.cs b/src/FormUI/FormHandler.cs
@@ -84,7 +84,7 @@ public static unsafe class FormHandler
 
     private static readonly Dictionary<uint, FormBase> s_forms = new();
 
-    private static readonly Random s_random = new();
+    private static readonly System.Random s_random = new();
 
     // static FormHandler()
     // {

diff --git a/src/GlobalService/Hook/RakPeerHook.cs b/src/GlobalService/Hook/RakPeerHook.cs
@@ -3,16 +3,17 @@
 
 namespace Hosihikari.Minecraft.Extension.GlobalService.Hook;
 
-internal sealed class RakPeerHook() : HookBase<RakPeerHook.HookDelegateType>(RakPeer.Original.Constructor_RakPeer)
+internal sealed class RakPeerHook()
+    : HookBase<RakPeerHook.HookDelegateType>(RakNet.RakPeer.Original.Constructor_RakPeer)
 {
     protected override HookDelegateType HookDelegate =>
         @this =>
         {
-            Pointer<RakPeer> result = Original(@this);
+            Pointer<RakNet.RakPeer> result = Original(@this);
             Global.RakPeer.Instance = @this.Target;
             TryUninstall();
             return result;
         };
 
-    internal delegate Pointer<RakPeer> HookDelegateType(Pointer<RakPeer> @this);
+    internal delegate Pointer<RakNet.RakPeer> HookDelegateType(Pointer<RakNet.RakPeer> @this);
 }
diff --git a/src/PackHelper/LinkCreator.cs b/src/PackHelper/LinkCreator.cs
@@ -21,7 +21,7 @@ public static void AddPack(PackType packType, string packDirectory, PackInfo inf
             throw new DirectoryNotFoundException($"packDirectory {packDirectory} not found");
         }
 
-        string target = Path.Combine(
+        string target = System.IO.Path.Combine(
             Environment.CurrentDirectory,
             packType switch
             {
@@ -36,7 +36,7 @@ public static void AddPack(PackType packType, string packDirectory, PackInfo inf
             Directory.CreateDirectory(target);
         }
 
-        string link = Path.Combine(target, info.PackId.ToString());
+        string link = System.IO.Path.Combine(target, info.PackId.ToString());
         if (Directory.Exists(link))
         {
             if (LinkUtils.IsLink(link))
@@ -77,16 +77,16 @@ void CopyFolder(string sourceFolder, string destFolder)
                         string[] files = Directory.GetFiles(sourceFolder);
                         foreach (string file in files)
                         {
-                            string name = Path.GetFileName(file);
-                            string dest = Path.Combine(destFolder, name);
+                            string name = System.IO.Path.GetFileName(file);
+                            string dest = System.IO.Path.Combine(destFolder, name);
                             File.Copy(file, dest);
                         }
 
                         string[] folders = Directory.GetDirectories(sourceFolder);
                         foreach (string folder in folders)
                         {
-                            string name = Path.GetFileName(folder);
-                            string dest = Path.Combine(destFolder, name);
+                            string name = System.IO.Path.GetFileName(folder);
+                            string dest = System.IO.Path.Combine(destFolder, name);
                             CopyFolder(folder, dest);
                         }
                     }