Merge pull request #1 from notcarlton/master

stuff

Author: VastraKai

Injector/Debug.cs

@@ -39,16 +39,15 @@ static bool CheckDirectories()
 
         // Create tree of all subdirectories and files
 
-        var tree = new List<string>();
+        // needed?
+        //var tree = new List<string>();
 
         Logger.Log("Debug", "Checking files...");
-        foreach (var dir in Directory.GetDirectories(praxDir))
+        
+        foreach (var file in Directory.GetFiles(praxDir, "*", SearchOption.AllDirectories))
         {
-            Logger.Log("Debug", "Directory found: " + dir);
-            foreach (var file in Directory.GetFiles(dir))
-            {
-                Logger.Log("Debug", "File found: " + file);
-            }
+            Logger.Log("Debug", "Directory found: " + Path.GetDirectoryName(file));
+            Logger.Log("Debug", "File found: " + file);
         }
 
 
@@ -88,7 +87,7 @@ public static void PerformChecks()
         Logger.Log("Debug", isGameUpToDate ? "Game is up to date" : "It's possible the game version is not supported", isGameUpToDate ? Logger.LType.Info : Logger.LType.Error);
 
 
-        Logger.Log("Debug", "Checks complete, Send a picture of this in your support ticket and make sure all text is readable.");
+        Logger.Log("Debug", "Checks complete. Send a screenshot of this in your support ticket and make sure all text is readable.");
 
 
     }

Injector/Inject.cs

@@ -153,35 +153,34 @@ private static void ApplyAppPackages(string dllPath)
     public static bool InjectDLL()
     {
 
-        Logger.Log("InjectDLL", "Injecting " + Path);
+        Logger.Log("Inject", "Injecting " + Path);
 
         ApplyAppPackages(Path);
         var target = Process.GetProcessesByName("Minecraft.Windows").FirstOrDefault();
         if (target == null)
         {
-            Logger.Log("InjectDLL", "Failed to find Minecraft.Windows process", Logger.LType.Error);
+            Logger.Log("Inject", "Failed to find Minecraft.Windows process", Logger.LType.Error);
             return false;
         }
 
         // Check if the dll is already injected
         var modules = target.Modules.Cast<ProcessModule>().ToList();
         if (modules.Any(module => module.FileName == Path))
         {
-            Logger.Log("InjectDLL", "Prax.dll is already injected", Logger.LType.Error);
+            Logger.Log("Inject", "Prax.dll is already injected", Logger.LType.Error);
             return false;
         }
 
-        Logger.Log("InjectDLL", "Injecting Prax.dll");
+        Logger.Log("Inject", "Injecting Prax.dll");
 
         var hProc = OpenProcess(0xFFFF, false, target.Id);
         var loadLibraryProc = GetProcAddress(GetModuleHandleW("kernel32.dll"), "LoadLibraryA");
         var allocated = VirtualAllocEx(hProc, IntPtr.Zero, (uint)Path.Length + 1, 0x00001000 | 0x00002000,
             0x40);
         WriteProcessMemory(hProc, allocated, Encoding.UTF8.GetBytes(Path), (uint)Path.Length + 1, out _);
-        Logger.Log("InjectDLL", "Allocated memory");
+        Logger.Log("Inject", "Allocated memory");
         CreateRemoteThread(hProc, IntPtr.Zero, 0, loadLibraryProc, allocated, 0, IntPtr.Zero);
-        Logger.Log("InjectDLL", "Remote thread created");
-        Logger.Log("InjectDLL", "Prax.dll injected");
+        Logger.Log("Inject", "Remote thread created");
         return true;
     }
 

Injector/Program.cs

@@ -9,7 +9,7 @@ class Program
 
     public static async Task Main(string[] args)
     {
-        Program.Client.DefaultRequestHeaders.Add("User-Agent", "Prax Injector");
+        Client.DefaultRequestHeaders.Add("User-Agent", "Prax Injector");
         Console.Title = "Prax Injector";
 
         Console.ForegroundColor = ConsoleColor.Magenta;
@@ -47,7 +47,7 @@ public static async Task Main(string[] args)
 
             Logger.Log("Main", "Continuing...");
         } else if (latestSupportedVersion == string.Empty) Logger.Log("Main", "Failed to get latest supported version!", Logger.LType.Error);
-        else Logger.Log("Main", $"Minecraft version {mcVersion} is supported.", Logger.LType.Info);
+        else Logger.Log("Main", $"Minecraft version {mcVersion} is supported.");
 
 
         Inject.LaunchMinecraft();
@@ -63,7 +63,11 @@ public static async Task Main(string[] args)
         }
 
         bool result = Inject.InjectDLL();
-        if (result) Thread.Sleep(2000);
+        if (result)
+        {
+            Logger.Log("Main", "Prax injected successfully! Press insert in game to open the menu.");
+            Thread.Sleep(5000);
+        }
         else
         {
             Logger.Log("Main", "Failed to inject Prax.dll", Logger.LType.Error);