Merge branch 'upcoming' into upcoming-nuget-release

Author: SignatureBeef

.github/workflows/ci.yml

@@ -38,11 +38,11 @@ jobs:
             patch_target: p,
             package_path: OTAPI.PC.nupkg,
           },
-          {
-            name: Mobile,
-            patch_target: m,
-            package_path: OTAPI.Mobile.nupkg,
-          },
+          # { plugins can do this, 1.4.5 might make this better, too.
+          #   name: Mobile,
+          #   patch_target: m,
+          #   package_path: OTAPI.Mobile.nupkg,
+          # },
           # { this is ultimately not supported yet, consideration in future when time permits
           #   name: tModLoader,
           #   patch_target: t,

OTAPI.Patcher/OTAPI.Patcher.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net9.0</TargetFramework>
-		<Version>3.3.0</Version>
+		<Version>3.3.1</Version>
 		<PreserveCompilationContext>true</PreserveCompilationContext>
 		<RuntimeIdentifiers>win;osx;linux;</RuntimeIdentifiers>
 		<Nullable>enable</Nullable>

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-1449.zip";
+    public virtual string SupportedDownloadUrl { get; } = $"{TerrariaWebsite}/api/download/pc-dedicated-server/terraria-server-1450.zip";
 
     public virtual string GetUrlFromHttpResponse(string content)
     {

OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs

@@ -73,17 +73,18 @@ static void PatchNpcStrikeArgs(ModFwModder modder)
                         switch (methodName.Replace(HookEmitter.HookMethodNamePrefix, ""))
                         {
                             case "MessageBuffer.GetData":
+                                // order matters with this logic...
+                                var hasWhoAmI = instr.Previous.OpCode == OpCodes.Ldfld &&
+                                    instr.Previous.Operand is FieldReference fieldReference && 
+                                    fieldReference.Name == "whoAmI";    
+
                                 var playerRef = Instruction.Create(OpCodes.Ldsfld, modder.Module.ImportReference(modder.GetFieldDefinition(() => Terraria.Main.player)));
                                 body.GetILProcessor().InsertBefore(instr, playerRef);
                                 body.GetILProcessor().InsertBefore(instr,
                                     new { OpCodes.Ldarg_0 }, 
                                     new { OpCodes.Ldfld, Operand = modder.Module.ImportReference(modder.GetFieldDefinition(() => (new Terraria.MessageBuffer()).whoAmI)) }, 
                                     new { OpCodes.Ldelem_Ref } 
-                                ); 
-
-                                var hasWhoAmI = instr.Previous.OpCode == OpCodes.Ldfld &&
-                                    instr.Previous.Operand is FieldReference fieldReference && 
-                                    fieldReference.Name == "whoAmI";                                     
+                                );                                  
                                 if (hasWhoAmI) { // 145+  
                                     // rewire the branching
                                     var brs = instr.Previous(x => x.OpCode == OpCodes.Br_S);

OTAPI.Scripts/Shims/Xna/Graphics/GraphicsResource.Server.cs

@@ -32,5 +32,7 @@ public void Dispose()
         public GraphicsDevice GraphicsDevice { get; set; }
 
         public bool IsDisposed { get; set; }
+        public string Name { get; set; }
+        public object Tag { get; set; }
     }
 }

OTAPI.Scripts/Shims/Xna/Graphics/Texture2D.Server.cs

@@ -15,9 +15,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#pragma warning disable CS0436 // Type conflicts with imported type
-
+*/
+#pragma warning disable CS0436 // Type conflicts with imported type
+
 using System;
 using System.Runtime.InteropServices;
 
@@ -35,6 +35,8 @@ public class Texture2D : Texture
 		public int Height { get; set; }
 
 		public int Width { get; set; }
+		
+		public Rectangle Bounds => new (0, 0, Width, Height);
 
 		public Texture2D (
 			GraphicsDevice graphicsDevice,

OTAPI.Scripts/Shims/Xna/Input/KeyboardState.Server.cs

@@ -29,6 +29,11 @@ public bool IsKeyDown(Keys key)
             return false;
         }
 
+        public bool IsKeyUp(Keys key)
+        {
+            return false;
+        }
+
         public Keys[] GetPressedKeys() { return Empty; }
     }
 }