diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f1c2c5d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/Source/.vs +/Source/.vs +/Source/obj +/Source/obj diff --git a/1.6/Assemblies/0PrepatcherAPI.dll b/1.6/Assemblies/0PrepatcherAPI.dll new file mode 100644 index 0000000..d869ece Binary files /dev/null and b/1.6/Assemblies/0PrepatcherAPI.dll differ diff --git a/1.6/Assemblies/1Fishery.dll b/1.6/Assemblies/1Fishery.dll new file mode 100644 index 0000000..e875424 Binary files /dev/null and b/1.6/Assemblies/1Fishery.dll differ diff --git a/1.6/Assemblies/1Fishery.pdb b/1.6/Assemblies/1Fishery.pdb new file mode 100644 index 0000000..d5e6082 Binary files /dev/null and b/1.6/Assemblies/1Fishery.pdb differ diff --git a/1.6/Assemblies/BetterLog.dll b/1.6/Assemblies/BetterLog.dll new file mode 100644 index 0000000..8371a34 Binary files /dev/null and b/1.6/Assemblies/BetterLog.dll differ diff --git a/1.6/Assemblies/BetterLog.pdb b/1.6/Assemblies/BetterLog.pdb new file mode 100644 index 0000000..2fdafd3 Binary files /dev/null and b/1.6/Assemblies/BetterLog.pdb differ diff --git a/1.6/Assemblies/FisheryLib.dll b/1.6/Assemblies/FisheryLib.dll new file mode 100644 index 0000000..e875424 Binary files /dev/null and b/1.6/Assemblies/FisheryLib.dll differ diff --git a/1.6/Assemblies/System.Runtime.CompilerServices.Unsafe.dll b/1.6/Assemblies/System.Runtime.CompilerServices.Unsafe.dll new file mode 100644 index 0000000..c5ba4e4 Binary files /dev/null and b/1.6/Assemblies/System.Runtime.CompilerServices.Unsafe.dll differ diff --git a/About/About.xml b/About/About.xml index c9d258f..f2b14bc 100644 --- a/About/About.xml +++ b/About/About.xml @@ -6,6 +6,7 @@
  • 1.3
  • 1.4
  • 1.5
    • +
  • 1.6
    • bradson BetterLog/ModIcon diff --git a/DateStamp b/DateStamp new file mode 100644 index 0000000..c101d89 --- /dev/null +++ b/DateStamp @@ -0,0 +1 @@ +19 Dec, 2022 @ 10:43am \ No newline at end of file diff --git a/Source/1.6.csproj b/Source/1.6.csproj new file mode 100644 index 0000000..8f829c7 --- /dev/null +++ b/Source/1.6.csproj @@ -0,0 +1,23 @@ + + + + ..\1.6\Assemblies\ + Copyright (c) 2024 Bradson + + + DEBUG;V1_6 + + + V1_6 + + + + + + + + + D:\Games & Programs\Steam\steamapps\common\RimWorld\Mods\Fishery\1.6\Assemblies\1Fishery.dll + + + diff --git a/Source/1.6.csproj.Backup.tmp b/Source/1.6.csproj.Backup.tmp new file mode 100644 index 0000000..ae08954 --- /dev/null +++ b/Source/1.6.csproj.Backup.tmp @@ -0,0 +1,18 @@ + + + + ..\1.6\Assemblies\ + Copyright (c) 2024 Bradson + + + DEBUG;V1_6 + + + V1_6 + + + + + + + diff --git a/Source/BetterLog.sln b/Source/BetterLog.sln index 7803e67..aeefed0 100644 --- a/Source/BetterLog.sln +++ b/Source/BetterLog.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29215.179 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "1.6", "1.6.csproj", "{400DA299-C4F8-4967-8119-8F74BF1C9784}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "1.5", "1.5.csproj", "{300DA299-C4F8-4967-8119-8F74BF1C9784}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "1.4", "1.4.csproj", "{13E3677F-ECFD-473A-A3F0-0734686609AF}" @@ -15,6 +17,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {400DA299-C4F8-4967-8119-8F74BF1C9784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {400DA299-C4F8-4967-8119-8F74BF1C9784}.Debug|Any CPU.Build.0 = Debug|Any CPU + {400DA299-C4F8-4967-8119-8F74BF1C9784}.Release|Any CPU.ActiveCfg = Release|Any CPU + {400DA299-C4F8-4967-8119-8F74BF1C9784}.Release|Any CPU.Build.0 = Release|Any CPU {300DA299-C4F8-4967-8119-8F74BF1C9784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {300DA299-C4F8-4967-8119-8F74BF1C9784}.Debug|Any CPU.Build.0 = Debug|Any CPU {300DA299-C4F8-4967-8119-8F74BF1C9784}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Source/Patches.cs b/Source/Patches.cs index aaca223..c87e955 100644 --- a/Source/Patches.cs +++ b/Source/Patches.cs @@ -6,6 +6,9 @@ #if !V1_3 && !V1_4 #define V1_5_OR_LATER #endif +#if V1_6 +#define V1_6_OR_LATER +#endif using System.Linq; using System.Linq.Expressions; @@ -253,13 +256,13 @@ public class Log_Notify_MessageReceivedThreadedInternal_Modify_Patch : FishPatch public override string Name { get; } = "Modify Log Limit"; public override string Description { get; } - = "RimWorld normally stops logging after 1000 messages. This allows changing that number. Use the slider " + = "RimWorld normally stops logging after 10000 messages (1000 in older versions). This allows changing that number. Use the slider " + "below to set the new value."; public override Delegate TargetMethodGroup { get; } = Log.Notify_MessageReceivedThreadedInternal; public static CodeInstructions Transpiler(CodeInstructions codes) - => codes.Replace(static code => code.operand is 1000, static code => FishTranspiler + => codes.Replace(static code => code.operand is 10000, static code => FishTranspiler .PropertyGetter(typeof(Settings), nameof(Settings.LoggingLimit)) .WithLabelsAndBlocks(code)); } diff --git a/Source/Settings.cs b/Source/Settings.cs index 65bc6fe..e40cb10 100644 --- a/Source/Settings.cs +++ b/Source/Settings.cs @@ -56,7 +56,7 @@ public static List AllColors => _allColors ??= DefDatabase.AllDefsListForReading.Select(static def => def.color) .Union(typeof(ColorLibrary).GetFields(AccessTools.allDeclared) - .Select(static field => (Color)field.GetValue(null))) + .Select(static fieldInfo => (Color)fieldInfo.GetValue(null!))) .Union(new[] { Color.red, Color.yellow, Color.white }).ToList(); public override void ExposeData()