Merge branch 'upcoming' into upcoming-nuget-release

Author: SignatureBeef

OTAPI.Patcher/OTAPI.Patcher.csproj

@@ -3,11 +3,11 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>3.3.10</Version>
+		<Version>3.3.11</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>
-		<PackageReleaseNotes>Terraria 1.4.5.5 on .NET9</PackageReleaseNotes>
+		<PackageReleaseNotes>Terraria 1.4.5.6 on .NET9</PackageReleaseNotes>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="ModFramework.Modules.ClearScript" Version="1.1.15" />

OTAPI.Patcher/Resolvers/PCFileResolver.cs

@@ -28,7 +28,7 @@ public class PCFileResolver : IFileResolver
 {
     public const String TerrariaWebsite = "https://terraria.org";
 
-    public virtual string SupportedDownloadUrl { get; } = $"{TerrariaWebsite}/api/download/pc-dedicated-server/terraria-server-1455.zip";
+    public virtual string SupportedDownloadUrl { get; } = $"{TerrariaWebsite}/api/download/pc-dedicated-server/terraria-server-1456.zip";
 
     public virtual string GetUrlFromHttpResponse(string content)
     {

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

@@ -35,28 +35,28 @@
 
 	<ItemGroup>
 		<Reference Include="OTAPI">
-			<HintPath>..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\OTAPI.dll</HintPath>
+			<HintPath>../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/OTAPI.dll</HintPath>
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 		</Reference>
 		<Reference Include="OTAPI.Runtime">
-			<HintPath>..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\OTAPI.Runtime.dll</HintPath>
+			<HintPath>../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/OTAPI.Runtime.dll</HintPath>
 			<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
 		</Reference>
 	</ItemGroup>
 
-	<Import Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\AutoGenerated.target')" Project="..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\AutoGenerated.target" />
+	<Import Condition="Exists('../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/AutoGenerated.target')" Project="../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/AutoGenerated.target" />
 
 	<ItemGroup>
-		<ProjectReference Include="..\examples\RuntimeExample.Server\RuntimeExample.Server.csproj" />
+		<ProjectReference Include="../examples/RuntimeExample.Server/RuntimeExample.Server.csproj" />
 	</ItemGroup>
 
-	<ItemGroup Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader')">
-		<Content Include="..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader\**\*.*">
+	<ItemGroup Condition="Exists('../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/tModLoader')">
+		<Content Include="../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/tModLoader/***.*">
 			<Link>tModLoader\%(RecursiveDir)%(Filename)%(Extension)</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
-	<PropertyGroup Condition="Exists('..\OTAPI.Patcher\bin\$(Configuration)\$(TargetFramework)\tModLoader')">
+	<PropertyGroup Condition="Exists('../OTAPI.Patcher/bin/$(Configuration)/$(TargetFramework)/tModLoader')">
 		<DefineConstants>$(DefineConstants);TML</DefineConstants>
 	</PropertyGroup>
 

OTAPI.Server.Launcher/Program.cs

@@ -133,7 +133,7 @@ void Print<TSender, TArgs>(TSender sender, TArgs args)
     HookEvents.Terraria.WorldGen.StartHardmode += Print;
     HookEvents.Terraria.WorldGen.SpreadGrass += Print;
     HookEvents.Terraria.Chat.ChatHelper.BroadcastChatMessage += Print;
-    HookEvents.Terraria.IO.WorldFile.SaveWorld_Boolean_Boolean += Print;
+    HookEvents.Terraria.IO.WorldFile.SaveWorld += Print;
     HookEvents.Terraria.Net.NetManager.SendData += Print;
     HookEvents.Terraria.Projectile.SetDefaults += Print;
     HookEvents.Terraria.Projectile.AI += Print;