Merge branch 'Beta' into Translation

MacSergey · Jun 13, 2023 · 5cac2dc · 5cac2dc
2 parents efdc22d + 2d7c8b3
commit 5cac2dc
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 9 deletions.
diff --git a/IMT/IntersectionMarkingTool.csproj b/IMT/IntersectionMarkingTool.csproj
@@ -16,11 +16,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <AssemblyVersion>1.14.0.1153</AssemblyVersion>
+    <AssemblyVersion>1.14.0.1159</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Stable Release' OR '$(Configuration)' == 'Stable Debug'">
-    <AssemblyVersion>1.14.2</AssemblyVersion>
+    <AssemblyVersion>1.14.3</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Stable Release|AnyCPU'">

diff --git a/IMT/MarkingItems/Filler/Style/2D/Asphalt.cs b/IMT/MarkingItems/Filler/Style/2D/Asphalt.cs
@@ -12,7 +12,7 @@
 
 namespace IMT.Manager
 {
-    public class AsphaltFillerStyle : BaseFillerStyle, IColorStyle
+    public class AsphaltFillerStyle : BaseFillerStyle, IColorStyle, IThemeFiller
     {
         public override StyleType Type => StyleType.FillerAsphalt;
         public override MarkingLOD SupportLOD => MarkingLOD.LOD0 | MarkingLOD.LOD1;

diff --git a/IMT/MarkingItems/Filler/Style/3D/CustomTexture.cs b/IMT/MarkingItems/Filler/Style/3D/CustomTexture.cs
@@ -12,7 +12,7 @@
 
 namespace IMT.Manager
 {
-    public class CustomTextureFillerStyle : CurbFillerStyle
+    public class CustomTextureFillerStyle : CurbFillerStyle, IThemeFiller
     {
         public override StyleType Type => StyleType.FillerTexture;
         public override MarkingLOD SupportLOD => MarkingLOD.LOD0 | MarkingLOD.LOD1;

diff --git a/IMT/MarkingItems/Filler/Style/Base/BaseFillerStyle.cs b/IMT/MarkingItems/Filler/Style/Base/BaseFillerStyle.cs
@@ -36,6 +36,7 @@ public interface IFollowGuideFiller : IGuideFiller
     {
         PropertyValue<bool> FollowGuides { get; }
     }
+    public interface IThemeFiller { }
     public abstract class BaseFillerStyle : Style<BaseFillerStyle>, IFillerStyle
     {
         public static float DefaultAngle => 0f;

diff --git a/IMT/MarkingItems/Filler/Style/Base/MeshFillerStyle.cs b/IMT/MarkingItems/Filler/Style/Base/MeshFillerStyle.cs
@@ -11,7 +11,7 @@
 
 namespace IMT.Manager
 {
-    public abstract class MeshFillerStyle : BaseFillerStyle
+    public abstract class MeshFillerStyle : BaseFillerStyle, IThemeFiller
     {
         public PropertyThemeValue PavementTheme { get; }
         public PropertyValue<float> Elevation { get; }

diff --git a/IMT/MarkingItems/Filler/Style/Base/ThemeFillerStyle.cs b/IMT/MarkingItems/Filler/Style/Base/ThemeFillerStyle.cs
@@ -10,7 +10,7 @@
 
 namespace IMT.Manager
 {
-    public abstract class ThemeFillerStyle : CurbFillerStyle
+    public abstract class ThemeFillerStyle : CurbFillerStyle, IThemeFiller
     {
         public PropertyThemeValue Theme { get; }
         protected abstract ThemeHelper.TextureType TextureType { get; }

diff --git a/IMT/Mod.cs b/IMT/Mod.cs
@@ -32,6 +32,7 @@ public class Mod : BasePatcherMod<Mod>
         protected override string IdRaw => "IntersectionMarkingTool";
         public override List<ModVersion> Versions { get; } = new List<ModVersion>
         {
+            new ModVersion(new Version(1,14,3), new DateTime(2023, 6, 13)),
             new ModVersion(new Version(1,14,2), new DateTime(2023, 5, 27)),
             new ModVersion(new Version(1,14,1), new DateTime(2023, 4, 15)),
             new ModVersion(new Version(1,14), new DateTime(2023, 4, 1)),
@@ -64,7 +65,7 @@ public class Mod : BasePatcherMod<Mod>
             new ModVersion(new Version(1,1), new DateTime(2020, 7, 14)),
             new ModVersion(new Version(1,0), new DateTime(2020, 7, 7)),
         };
-        protected override Version RequiredGameVersion => new Version(1, 17, 0, 3);
+        protected override Version RequiredGameVersion => new Version(1, 17, 1, 2);
 
         public override string NameRaw => "Intersection Marking Tool";
         public override string Description => !IsBeta ? Localize.Mod_Description : CommonLocalize.Mod_DescriptionBeta;
@@ -115,6 +116,8 @@ protected override bool PatchProcess()
             PatchNetInfo(ref success);
             PatchLoading(ref success);
 
+            success &= Patch_ThemeMixer_TerrainTexture();
+
             return success;
         }
 
@@ -627,6 +630,53 @@ private static bool PackageHelperResolveLegacyTypeHandlerPrefix(string type, ref
 
         #endregion
 
+        #region OTHERS
+
+        private bool Patch_ThemeMixer_TerrainTexture()
+        {
+            if (AccessTools.TypeByName("ThemeMixer.Themes.Terrain.TerrainTexture") is Type type)
+                return AddPostfix(typeof(Mod), nameof(Mod.ThemeMixer_TerrainTexture_Postfix), type, "LoadValue");
+            else
+            {
+                Logger.Error($"Theme mixer is not found, patch skiped");
+                return true;
+            }
+        }
+        private static void ThemeMixer_TerrainTexture_Postfix()
+        {
+            if (SingletonManager<NodeMarkingManager>.Exist)
+            {
+                for (int i = 0; i < NetManager.MAX_NODE_COUNT; i += 1)
+                {
+                    if (SingletonManager<NodeMarkingManager>.Instance.TryGetMarking((ushort)i, out var marking))
+                    {
+                        foreach (var filler in marking.Fillers)
+                        {
+                            if (filler.Style.Value is IThemeFiller)
+                                marking.Update(filler, true, false);
+                        }
+                    }
+                }
+            }
+
+            if (SingletonManager<SegmentMarkingManager>.Exist)
+            {
+                for (int i = 0; i < NetManager.MAX_SEGMENT_COUNT; i += 1)
+                {
+                    if (SingletonManager<SegmentMarkingManager>.Instance.TryGetMarking((ushort)i, out var marking))
+                    {
+                        foreach (var filler in marking.Fillers)
+                        {
+                            if (filler.Style.Value is IThemeFiller)
+                                marking.Update(filler, true, false);
+                        }
+                    }
+                }
+            }
+        }
+
+        #endregion
+
         #endregion
     }
 

diff --git a/IMT/Properties/Localize.cs b/IMT/Properties/Localize.cs
@@ -2879,5 +2879,10 @@ public class Localize
 		/// Recalculate all markings
 		/// </summary>
 		public static string Settings_RecalculateMarkings => LocaleManager.GetString("Settings_RecalculateMarkings", Culture);
+
+		/// <summary>
+		/// [FIXED] Update fillers texture when map theme is changed in Theme Mixer mod.
+		/// </summary>
+		public static string Mod_WhatsNewMessage1_14_3 => LocaleManager.GetString("Mod_WhatsNewMessage1_14_3", Culture);
 	}
 }
diff --git a/ModsCommon b/ModsCommon
diff --git a/Workshop/Workshop description.txt b/Workshop/Workshop description.txt
@@ -1,4 +1,4 @@
-[img]https://i.imgur.com/a0VrMRr.png[/img]
+[img]https://i.imgur.com/0O9w9Ta.png[/img]
 [HR][/HR] 
 [url=https://github.com/MacSergey/NodeMarkup/wiki][img]https://i.imgur.com/fkaKgIp.png[/img][/url] 
 [code][h1]Overview[/h1]
+6 −2		LocalizeShared/pl-PL/CommonLocalize.pl-PL.resx
+4 −4		LocalizeShared/zh-CN/CommonLocalize.zh-CN.resx
+6 −4		MathExtension/MathExtention.cs
+2 −2		ModShared/BaseMod.cs
+1 −1		ModShared/Settings/Settings.cs
+1 −0		ModShared/Utilities/Manager.cs