diff --git a/Assets/Main.png b/Assets/Main.png new file mode 100644 index 0000000..094bafc Binary files /dev/null and b/Assets/Main.png differ diff --git a/Assets/Main.psd b/Assets/Main.psd new file mode 100644 index 0000000..66d3415 Binary files /dev/null and b/Assets/Main.psd differ diff --git a/Assets/Unused/24bd-WizardImage.bmp b/Assets/Other/24bd-WizardImage.bmp similarity index 100% rename from Assets/Unused/24bd-WizardImage.bmp rename to Assets/Other/24bd-WizardImage.bmp diff --git a/Assets/Other/Built for.png b/Assets/Other/Built for.png new file mode 100644 index 0000000..016c15a Binary files /dev/null and b/Assets/Other/Built for.png differ diff --git a/Assets/Other/Installer-1.png b/Assets/Other/Installer-1.png new file mode 100644 index 0000000..bb9332c Binary files /dev/null and b/Assets/Other/Installer-1.png differ diff --git a/Assets/Other/Installer-2.png b/Assets/Other/Installer-2.png new file mode 100644 index 0000000..1103d72 Binary files /dev/null and b/Assets/Other/Installer-2.png differ diff --git a/Assets/Other/Installer-3.png b/Assets/Other/Installer-3.png new file mode 100644 index 0000000..90d3565 Binary files /dev/null and b/Assets/Other/Installer-3.png differ diff --git a/Assets/Other/Screenshot.png b/Assets/Other/Screenshot.png new file mode 100644 index 0000000..b316a5d Binary files /dev/null and b/Assets/Other/Screenshot.png differ diff --git a/Assets/Unused/WizardImage.png b/Assets/Other/WizardImage.png similarity index 100% rename from Assets/Unused/WizardImage.png rename to Assets/Other/WizardImage.png diff --git a/Assets/Unused/WizardSmallImage-Alternate.bmp b/Assets/Other/WizardSmallImage-Alternate.bmp similarity index 100% rename from Assets/Unused/WizardSmallImage-Alternate.bmp rename to Assets/Other/WizardSmallImage-Alternate.bmp diff --git a/Assets/Unused/WizardSmallImage.bmp b/Assets/Other/WizardSmallImage.bmp similarity index 100% rename from Assets/Unused/WizardSmallImage.bmp rename to Assets/Other/WizardSmallImage.bmp diff --git a/Assets/Unused/icon-small-1.bmp b/Assets/Other/icon-small-1.bmp similarity index 100% rename from Assets/Unused/icon-small-1.bmp rename to Assets/Other/icon-small-1.bmp diff --git a/Assets/Unused/icon-small-1.png b/Assets/Other/icon-small-1.png similarity index 100% rename from Assets/Unused/icon-small-1.png rename to Assets/Other/icon-small-1.png diff --git a/Assets/Unused/icon-small-2.bmp b/Assets/Other/icon-small-2.bmp similarity index 100% rename from Assets/Unused/icon-small-2.bmp rename to Assets/Other/icon-small-2.bmp diff --git a/Assets/Unused/icon-small-2.png b/Assets/Other/icon-small-2.png similarity index 100% rename from Assets/Unused/icon-small-2.png rename to Assets/Other/icon-small-2.png diff --git a/Assets/Unused/icon.png b/Assets/Other/icon.png similarity index 100% rename from Assets/Unused/icon.png rename to Assets/Other/icon.png diff --git a/Assets/Unused/icon.rli b/Assets/Other/icon.rli similarity index 100% rename from Assets/Unused/icon.rli rename to Assets/Other/icon.rli diff --git a/Assets/Other/watermark.png b/Assets/Other/watermark.png new file mode 100644 index 0000000..ef6a296 Binary files /dev/null and b/Assets/Other/watermark.png differ diff --git a/Installer/QModInstaller.dll b/Installer/QModInstaller.dll index c381f90..6b0ea7a 100644 Binary files a/Installer/QModInstaller.dll and b/Installer/QModInstaller.dll differ diff --git a/Installer/QModManager.exe b/Installer/QModManager.exe index 011e3b0..c466b63 100644 Binary files a/Installer/QModManager.exe and b/Installer/QModManager.exe differ diff --git a/Installer/QModsInstallerScript.iss b/Installer/QModsInstallerScript.iss index ab36f78..94cc7d2 100644 --- a/Installer/QModsInstallerScript.iss +++ b/Installer/QModsInstallerScript.iss @@ -3,7 +3,7 @@ #define MyAppName "QModManager (TerraTech)" #define MyAppVersion "1.3" -#define MyAppPublisher "AlexejheroYTB" +#define MyAppPublisher "AlexejheroYTB, Aceba1 & weskey007" #define MyAppURL "https://github.com/AlexejheroYTB/TerraTech-QModManager" [Setup] diff --git a/Installer/TerraTechQMMSetup.exe b/Installer/TerraTechQMMSetup.exe index b31e060..aa78a54 100644 Binary files a/Installer/TerraTechQMMSetup.exe and b/Installer/TerraTechQMMSetup.exe differ diff --git a/QModInstaller/QModPatcher.cs b/QModInstaller/QModPatcher.cs index 1802ca1..4dff121 100644 --- a/QModInstaller/QModPatcher.cs +++ b/QModInstaller/QModPatcher.cs @@ -8,7 +8,6 @@ using System.Reflection; using System.Reflection.Emit; using UnityEngine.UI; -using UnityEngine; namespace QModInstaller { @@ -179,7 +178,7 @@ public static void Patch() internal static Version version = new Version(1, 3); internal static string GetModsLine() - => $"This game is modded! Using QModManager {version}, amount of mods loaded: {loadedMods.Count} (Check the output log for a complete list of installed mods and respective their load times)"; + => $"This game is modded! Using QModManager {version}, with {loadedMods.Count} loaded mods. (Check the output log for a complete list of installed mods and respective their load times)"; internal static void FlagGame() { @@ -189,8 +188,23 @@ internal static void FlagGame() sw.Start(); string Id = "ttqmm.internal.modflag"; - string Name = "Internal Flagging"; - HarmonyInstance.Create(Id).PatchAll(Assembly.GetExecutingAssembly()); + string Name = "Game Flagging"; + + try + { + HarmonyInstance.Create(Id).PatchAll(Assembly.GetExecutingAssembly()); + } + catch (Exception e) + { + AddLog("EXCEPTION CAUGHT!"); + AddLog(e.Message); + AddLog(e.StackTrace); + if (e.InnerException != null) + { + AddLog(e.InnerException.Message); + AddLog(e.InnerException.StackTrace); + } + } sw.Stop(); @@ -372,7 +386,6 @@ internal static void Prefix(UIScreenBugReport __instance) [HarmonyPatch] internal static class UIScreenBugReport_PostIt { - [HarmonyTargetMethod] internal static MethodInfo TargetMethod() => AccessTools.FirstInner(typeof(UIScreenBugReport), (type) => type.Name.Contains("")).GetMethod("MoveNext", AccessTools.all); @@ -382,6 +395,8 @@ internal static IEnumerable Transpiler(IEnumerable(instructions); var codesToInsert = new List(); + //for (int i = 0; i < codes.Count; i++) + // Console.WriteLine($"[IL-DEBUG] {i}: {codes[i].opcode} : {codes[i].operand}"); int platformStringIndex = -1; int callIndex = -1; @@ -418,9 +433,13 @@ internal static IEnumerable Transpiler(IEnumerable