diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..09c9c3c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +################################################################################ +# Данный GITIGNORE-файл был автоматически создан Microsoft(R) Visual Studio. +################################################################################ + +/.vs diff --git a/RuntimeGC/Assemblies/RuntimeGC.dll b/RuntimeGC/1.0/Assemblies/RuntimeGC.dll similarity index 100% rename from RuntimeGC/Assemblies/RuntimeGC.dll rename to RuntimeGC/1.0/Assemblies/RuntimeGC.dll diff --git a/RuntimeGC/Defs/MainButton.xml b/RuntimeGC/1.0/Defs/MainButton.xml similarity index 97% rename from RuntimeGC/Defs/MainButton.xml rename to RuntimeGC/1.0/Defs/MainButton.xml index 4abfa81..66f1496 100644 --- a/RuntimeGC/Defs/MainButton.xml +++ b/RuntimeGC/1.0/Defs/MainButton.xml @@ -1,13 +1,13 @@ - - - - RGC_UI - - No_Need_To_Translate_This_File_Because_This_Text_Is_Replaced_In_Dll - RuntimeGC.UserInterface - RuntimeGC.MainButtonWorker_RuntimeGC - 177 - - true - - + + + + RGC_UI + + No_Need_To_Translate_This_File_Because_This_Text_Is_Replaced_In_Dll + RuntimeGC.UserInterface + RuntimeGC.MainButtonWorker_RuntimeGC + 177 + + true + + diff --git a/RuntimeGC/1.1/Assemblies/RuntimeGC.dll b/RuntimeGC/1.1/Assemblies/RuntimeGC.dll new file mode 100644 index 0000000..b5eff35 Binary files /dev/null and b/RuntimeGC/1.1/Assemblies/RuntimeGC.dll differ diff --git a/RuntimeGC/1.1/Defs/MainButton.xml b/RuntimeGC/1.1/Defs/MainButton.xml new file mode 100644 index 0000000..66f1496 --- /dev/null +++ b/RuntimeGC/1.1/Defs/MainButton.xml @@ -0,0 +1,13 @@ + + + + RGC_UI + + No_Need_To_Translate_This_File_Because_This_Text_Is_Replaced_In_Dll + RuntimeGC.UserInterface + RuntimeGC.MainButtonWorker_RuntimeGC + 177 + + true + + diff --git a/RuntimeGC/About/About.xml b/RuntimeGC/About/About.xml index 023f738..f374d31 100644 --- a/RuntimeGC/About/About.xml +++ b/RuntimeGC/About/About.xml @@ -2,8 +2,12 @@ RuntimeGC user19990313 + user19990313.RuntimeGC https://ludeon.com/forums/index.php?topic=46581.0 - 1.0.2059 + +
  • 1.0
    • +
  • 1.1
    • +     <size=20>RuntimeGC In-Game Cleaner</size> diff --git a/RuntimeGC/Folders.xml b/RuntimeGC/Folders.xml new file mode 100644 index 0000000..855fef1 --- /dev/null +++ b/RuntimeGC/Folders.xml @@ -0,0 +1,9 @@ + + +
  • Common
    • +     + +
  • Common
    • +
  • 1.1
    • +     +     \ No newline at end of file diff --git a/src/RuntimeGC/.vs/RuntimeGC/v16/.suo b/src/RuntimeGC/.vs/RuntimeGC/v16/.suo new file mode 100644 index 0000000..e022bde Binary files /dev/null and b/src/RuntimeGC/.vs/RuntimeGC/v16/.suo differ diff --git a/src/RuntimeGC/Release/RuntimeGC.dll b/src/RuntimeGC/Release/RuntimeGC.dll index 4161def..b5eff35 100644 Binary files a/src/RuntimeGC/Release/RuntimeGC.dll and b/src/RuntimeGC/Release/RuntimeGC.dll differ diff --git a/src/RuntimeGC/RuntimeGC/RuntimeGC.cs b/src/RuntimeGC/RuntimeGC/RuntimeGC.cs index e394365..b8b9079 100644 --- a/src/RuntimeGC/RuntimeGC/RuntimeGC.cs +++ b/src/RuntimeGC/RuntimeGC/RuntimeGC.cs @@ -10,7 +10,7 @@ public class RuntimeGC:Mod public RuntimeGC(ModContentPack pack) : base(pack) { - Settings = LoadedModManager.ReadModSettings(Content.Identifier, this.GetType().Name); + Settings = LoadedModManager.ReadModSettings(Content.PackageId, this.GetType().Name); Toolbox.Launcher.Launch(Settings.AutoCleanModMetaData, Settings.AutoCleanLanguageData, Settings.AutoCleanDefPackage); Mute.Launcher.Launch(Settings.DoMuteGC, Settings.DoMuteBL); Verse.Log.Message("[RuntimeGC] Mod settings loaded."); @@ -19,7 +19,7 @@ public RuntimeGC(ModContentPack pack) : base(pack) public override void WriteSettings() { Settings.UpdateCache(); - LoadedModManager.WriteModSettings(Content.Identifier, "RuntimeGC", Settings); + LoadedModManager.WriteModSettings(Content.PackageId, "RuntimeGC", Settings); if (Settings.RequiresRestart()) { Find.WindowStack.Add(Dialog_MessageBox.CreateConfirmation("DlgTextRestartRequest".Translate(), delegate diff --git a/src/RuntimeGC/RuntimeGC/RuntimeGC.csproj b/src/RuntimeGC/RuntimeGC/RuntimeGC.csproj index f8abe64..b9dd60d 100644 --- a/src/RuntimeGC/RuntimeGC/RuntimeGC.csproj +++ b/src/RuntimeGC/RuntimeGC/RuntimeGC.csproj @@ -9,7 +9,7 @@ Properties RuntimeGC RuntimeGC - v3.5 + v4.7.2 512 @@ -22,6 +22,7 @@ prompt 4 true + false pdbonly @@ -31,11 +32,13 @@ prompt 4 true + false False - ..\..\..\..\_dependency_\2059\x64\Assembly-CSharp.dll + ..\..\..\..\..\RimWorldWin64_Data\Managed\Assembly-CSharp.dll + False @@ -46,7 +49,16 @@ False - ..\..\..\..\_dependency_\2059\x64\UnityEngine.dll + ..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.dll + False + + + ..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.CoreModule.dll + False + + + ..\..\..\..\..\RimWorldWin64_Data\Managed\UnityEngine.IMGUIModule.dll + False diff --git a/src/RuntimeGC/RuntimeGC/Toolbox.cs b/src/RuntimeGC/RuntimeGC/Toolbox.cs index b74d507..5481fd6 100644 --- a/src/RuntimeGC/RuntimeGC/Toolbox.cs +++ b/src/RuntimeGC/RuntimeGC/Toolbox.cs @@ -30,7 +30,7 @@ public static void CleanModMetaData() else { s2.AppendWithComma(list[i].Name); - list[i].previewImage = new Texture2D(0, 0); + list[i].UnsetPreviewImage(); b++; } } @@ -89,8 +89,8 @@ public static void CleanDefPackage() foreach (ModContentPack pack in LoadedModManager.RunningMods) { if (pack.IsCoreMod) coreMod = pack; - a += ((List)defPackages.GetValue(pack)).Count; - defPackages.SetValue(pack, new List()); + a += ((List)defPackages.GetValue(pack)).Count; + defPackages.SetValue(pack, new List()); } Verse.Log.Message("[DefPackageCleaner] Cleaned " + a + " DefPackages."); diff --git a/src/RuntimeGC/RuntimeGC/UserInterface.cs b/src/RuntimeGC/RuntimeGC/UserInterface.cs index 292a855..087dfb7 100644 --- a/src/RuntimeGC/RuntimeGC/UserInterface.cs +++ b/src/RuntimeGC/RuntimeGC/UserInterface.cs @@ -56,7 +56,7 @@ public override void DoWindowContents(Rect canvas) Text.Font = GameFont.Medium; std.Label("RuntimeGCTitle".Translate()); Text.Font = GameFont.Small; - std.Label("RuntimeGCVer".Translate("1.0")); + std.Label("RuntimeGCVer".Translate("1.1")); std.Label("By user19990313"); std.Gap(); std.Label(string.Concat(new object[]{"pawnsAlive:", @@ -167,7 +167,7 @@ public void GC_wrapped(bool verbose=false) j); Find.WindowStack.Add(new Dialog_MessageBox(str + "\n\n" + (i == j ? "DlgTextGCAdvice1".Translate() : "DlgTextGCAdvice2".Translate(i - j)) - + (verbose ? "\n\n" + "DlgTextGCV".Translate() : "") + + (verbose ? "\n\n" + (string)"DlgTextGCV".Translate() : "") )); if(RuntimeGC.Settings.ArchiveGCDialog) Find.Archive.Add(new ArchivedDialog(str, "DlgArchiveTitle".Translate(), null)); diff --git a/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.dll b/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.dll index 4161def..b5eff35 100644 Binary files a/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.dll and b/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.dll differ diff --git a/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.pdb b/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.pdb index 6837dd6..d51419b 100644 Binary files a/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.pdb and b/src/RuntimeGC/RuntimeGC/bin/Release/RuntimeGC.pdb differ diff --git a/src/RuntimeGC/RuntimeGC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/src/RuntimeGC/RuntimeGC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8d108bb..5d021c0 100644 Binary files a/src/RuntimeGC/RuntimeGC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/src/RuntimeGC/RuntimeGC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.CoreCompileInputs.cache b/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.CoreCompileInputs.cache index ff9ad34..b2e357b 100644 --- a/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.CoreCompileInputs.cache +++ b/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d60b52f1cce8489d08cb1798f524e95e6589fb6a +86204394c73f165acc6c9b04efd7d785ff5b8557 diff --git a/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.FileListAbsolute.txt b/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.FileListAbsolute.txt index 695aa5f..c31a2aa 100644 --- a/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.FileListAbsolute.txt +++ b/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csproj.FileListAbsolute.txt @@ -14,3 +14,7 @@ D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.csproj.Core D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.csproj.CopyComplete D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.dll D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.pdb +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.csprojAssemblyReference.cache +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.csproj.CoreCompileInputs.cache +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.dll +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Debug\RuntimeGC.pdb diff --git a/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csprojAssemblyReference.cache b/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csprojAssemblyReference.cache index 566c2aa..5598c45 100644 Binary files a/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csprojAssemblyReference.cache and b/src/RuntimeGC/RuntimeGC/obj/Debug/RuntimeGC.csprojAssemblyReference.cache differ diff --git a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.CoreCompileInputs.cache b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.CoreCompileInputs.cache index ff9ad34..a634b1b 100644 --- a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.CoreCompileInputs.cache +++ b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d60b52f1cce8489d08cb1798f524e95e6589fb6a +a88d89317d8aeb4f6a6a4ad0a07d440eb96f6f32 diff --git a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.FileListAbsolute.txt b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.FileListAbsolute.txt index 1d4e85d..ae8c591 100644 --- a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.FileListAbsolute.txt +++ b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csproj.FileListAbsolute.txt @@ -14,3 +14,9 @@ D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.csproj.Co D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.csproj.CopyComplete D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.dll D:\CSharp\Workspace\Projects\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.pdb +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\bin\Release\RuntimeGC.dll +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\bin\Release\RuntimeGC.pdb +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.csprojAssemblyReference.cache +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.csproj.CoreCompileInputs.cache +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.dll +D:\Games\Steam\steamapps\common\RimWorld\Mods\RGC\src\RuntimeGC\RuntimeGC\obj\Release\RuntimeGC.pdb diff --git a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csprojAssemblyReference.cache b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csprojAssemblyReference.cache index 75b6dfe..1f8c07d 100644 Binary files a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csprojAssemblyReference.cache and b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.csprojAssemblyReference.cache differ diff --git a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.dll b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.dll index 4161def..b5eff35 100644 Binary files a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.dll and b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.dll differ diff --git a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.pdb b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.pdb index 6837dd6..d51419b 100644 Binary files a/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.pdb and b/src/RuntimeGC/RuntimeGC/obj/Release/RuntimeGC.pdb differ