Merge branch 'upcoming' into upcoming-nuget-release

Author: SignatureBeef

OTAPI.Client.Launcher/OTAPI.Client.Launcher.csproj

@@ -53,9 +53,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="ImGui.NET" Version="1.91.6.1" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.14" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.14" GeneratePathProperty="true" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.14" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.15" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.15" GeneratePathProperty="true" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.15" GeneratePathProperty="true" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
 		<PackageReference Include="System.Drawing.Common" Version="9.0.2" />
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />

OTAPI.Patcher/OTAPI.Patcher.csproj

@@ -3,16 +3,16 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>3.2.5</Version>
+		<Version>3.2.6</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
 		<PackageReleaseNotes>Terraria 1.4.4.9 on .NET9</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.14" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.14" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.14" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.15" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.15" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.15" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
 		<PackageReference Include="MonoMod.RuntimeDetour" Version="25.2.3" />

OTAPI.Scripts/OTAPI.Scripts.csproj

@@ -32,7 +32,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\FNA\FNA.Core.csproj" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
-		<PackageReference Include="ModFramework" Version="1.1.14" />
+		<PackageReference Include="ModFramework" Version="1.1.15" />
 		<PackageReference Include="MonoMod" Version="22.7.31.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>

OTAPI.Scripts/Shims/System.Drawing/Redirect.Server.cs

@@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 using ModFramework;
+using System.Linq;
 
 /// <summary>
 /// @doc Shims and relinks System.Drawing.Graphics
@@ -31,5 +32,19 @@ public static void RedirectAssembly(ModFwModder modder)
         {
             modder.RelinkAssembly("System.Drawing.Graphics");
         }
+
+        /// <summary>
+        /// Renames the System.Graphics shim due to conflicts with plugins that use the newer NuGet package.
+        /// </summary>
+        /// <remarks>These shims are not intended for use</remarks>
+        /// <see cref="https://github.com/elevatorguy/map/issues/4"/>
+        /// <param name="modder"></param>
+        [Modification(ModType.PostPatch, "Renaming System.Drawing")]
+        public static void Rename(ModFwModder modder)
+        {
+            var type = modder.Module.Types.Where(x => x.Namespace == "System.Drawing");
+            foreach (var mod in type)
+                mod.Namespace += ".Shims";
+        }
     }
 }

OTAPI.Server.Launcher/OTAPI.Server.Launcher.csproj

@@ -12,12 +12,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.14">
+		<PackageReference Include="ModFramework" Version="1.1.15">
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 		</PackageReference>
-		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.14" />
-		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.14" />
-		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.14" />
+		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.15" />
+		<PackageReference Include="ModFramework.Modules.CSharp" Version="1.1.15" />
+		<PackageReference Include="ModFramework.Modules.Lua" Version="1.1.15" />
 		<PackageReference Include="Steamworks.NET" Version="2024.8.0" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" />

examples/RuntimeExample.Client/RuntimeExample.Client.csproj

@@ -11,7 +11,7 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.14" />
+		<PackageReference Include="ModFramework" Version="1.1.15" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="OTAPI.Runtime">

examples/RuntimeExample.Server/RuntimeExample.Server.csproj

@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ModFramework" Version="1.1.14" />
+		<PackageReference Include="ModFramework" Version="1.1.15" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>