Initial 1.4.5

SignatureBeef · SignatureBeef · commit 103b58f60596 · 2026-01-28T05:32:30.000+10:00
Quick stack hooks needs rework for 145+
Large worlds may stack overflow
diff --git a/OTAPI.Patcher/Targets/IPatchTarget.cs b/OTAPI.Patcher/Targets/IPatchTarget.cs
@@ -160,6 +160,8 @@ public static void AddConstants(this IModPatchTarget target, string inputName, M
             constants.Add($"{inputName}_1442_OrAbove");
         if (version >= new Version("1.4.4.8"))
             constants.Add($"{inputName}_1448_OrAbove");
+        if (version >= new Version("1.4.5"))
+            constants.Add($"{inputName}_1450_OrAbove");
 
         target.ModContext.ReferenceConstants.AddRange(constants.Select(x => $"#define {x}"));
 
diff --git a/OTAPI.Scripts/Mods/HookCommandProcessing.Server.cs b/OTAPI.Scripts/Mods/HookCommandProcessing.Server.cs
@@ -47,8 +47,13 @@ void HookCommandProcessing(MonoModder modder)
         throw new NotSupportedException("Expected the second variable to be string");
 
     var exceptionHandler = startDedInputCallBack.Body.ExceptionHandlers.Single(
-        x => x.TryStart.Next.OpCode == OpCodes.Ldstr
+        x => (
+            x.TryStart.Next.OpCode == OpCodes.Ldstr
             && x.TryStart.Next.Operand.Equals("CLI.Help_Command")
+        ) || (
+            x.TryStart.OpCode == OpCodes.Ldstr
+            && x.TryStart.Operand.Equals("CLI.Help_Command")
+        )
     );
 
     startDedInputCallBack.Goto(exceptionHandler.TryStart, MoveType.Before);
diff --git a/OTAPI.Scripts/Mods/HookNpcBossBag.Server.cs b/OTAPI.Scripts/Mods/HookNpcBossBag.Server.cs
@@ -39,7 +39,9 @@ void HookNpcBossBag(ModFramework.ModFwModder modder)
     })
     {
         var callback = csr.Module.ImportReference(
-#if TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+            modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(null, 0, 0, 0, 0, 0, 0, false, 0, false, null))
+#elif TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
             modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(null, 0, 0, 0, 0, 0, 0, false, 0, false, false, null))
 #else
             modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeBossBag(0, 0, 0, 0, 0, 0, false, 0, false, false, null))
@@ -98,6 +100,9 @@ public class BossBagEventArgs : EventArgs
                 public bool NoBroadcast { get; set; }
                 public int Pfix { get; set; }
                 public bool NoGrabDelay { get; set; }
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                [Obsolete("ReverseLookup is no longer used in Terraria 1.4.5 and above, but is kept for API compatibility.")]
+#endif
                 public bool ReverseLookup { get; set; }
             }
             public static event EventHandler<BossBagEventArgs> BossBag;
@@ -115,7 +120,9 @@ public static int InvokeBossBag(
                 bool noBroadcast,
                 int pfix,
                 bool noGrabDelay,
+#if !TerrariaServer_1450_OrAbove && !Terraria__1450_OrAbove && !tModLoader_1450_OrAbove
                 bool reverseLookup,
+#endif
                 Terraria.NPC npc
             )
             {
@@ -133,14 +140,19 @@ Terraria.NPC npc
                     NoBroadcast = noBroadcast,
                     Pfix = pfix,
                     NoGrabDelay = noGrabDelay,
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                    ReverseLookup = false, // no longer used, but kept for api compatibility.
+#else
                     ReverseLookup = reverseLookup,
+#endif
                     Npc = npc,
                 };
                 BossBag?.Invoke(null, args);
                 if (args.Result == HookResult.Cancel)
                     return -1;
-
-#if TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                return Terraria.Item.NewItem(Source, args.X, args.Y, args.Width, args.Height, args.Type, args.Stack, args.NoBroadcast, args.Pfix, args.NoGrabDelay);
+#elif TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
                 return Terraria.Item.NewItem(Source, args.X, args.Y, args.Width, args.Height, args.Type, args.Stack, args.NoBroadcast, args.Pfix, args.NoGrabDelay, args.ReverseLookup);
 #else
                 return Terraria.Item.NewItem(args.X, args.Y, args.Width, args.Height, args.Type, args.Stack, args.NoBroadcast, args.Pfix, args.NoGrabDelay, args.ReverseLookup);
diff --git a/OTAPI.Scripts/Mods/HookNpcKilled.Server.cs b/OTAPI.Scripts/Mods/HookNpcKilled.Server.cs
@@ -34,10 +34,16 @@ void HookNpcKilled(MonoModder modder)
 {
     var checkDead = modder.GetILCursor(() => (new Terraria.NPC()).checkDead());
 
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+    var declaringType = "Terraria.NPC";
+#else
+    var declaringType = "Terraria.Entity";
+#endif
+
     checkDead.GotoNext(
         // active = false;
         i => i.OpCode == OpCodes.Ldc_I4_0
-        , i => i.OpCode == OpCodes.Stfld && i.Operand is FieldReference fieldReference && fieldReference.Name == "active" && fieldReference.DeclaringType.FullName == "Terraria.Entity"
+        , i => i.OpCode == OpCodes.Stfld && i.Operand is FieldReference fieldReference && fieldReference.Name == "active" && fieldReference.DeclaringType.FullName == declaringType
     );
 
     checkDead.EmitDelegate(OTAPI.Hooks.NPC.InvokeKilled);
diff --git a/OTAPI.Scripts/Mods/HookNpcLoot.Server.cs b/OTAPI.Scripts/Mods/HookNpcLoot.Server.cs
@@ -42,7 +42,9 @@ void HookNpcLoot(MonoModder modder)
     );
 
     NewNPC.Emit(OpCodes.Ldarg_0); // NPC instance
-#if TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+    NewNPC.Next.Operand = modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeDropLoot(default, default, default, default, default, default, default, default, default, default, default));
+#elif TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
     NewNPC.Next.Operand = modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeDropLoot(default, default, default, default, default, default, default, default, default, default, default, default));
 #else
     NewNPC.Next.Operand = modder.GetMethodDefinition(() => OTAPI.Hooks.NPC.InvokeDropLoot(default, default, default, default, default, default, default, default, default, default, default));
@@ -74,6 +76,9 @@ public class DropLootEventArgs : EventArgs
                 public bool NoBroadcast { get; set; }
                 public int Pfix { get; set; }
                 public bool NoGrabDelay { get; set; }
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                [Obsolete("ReverseLookup is no longer used in Terraria 1.4.5 and above, but is kept for API compatibility.")]
+#endif
                 public bool ReverseLookup { get; set; }
             }
             public static event EventHandler<DropLootEventArgs>? DropLoot;
@@ -83,7 +88,12 @@ public static int InvokeDropLoot(Terraria.DataStructures.IEntitySource source, i
 #else
             public static int InvokeDropLoot(int X, int Y, int Width, int Height, int Type,
 #endif
+
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                int Stack, bool noBroadcast, int pfix, bool noGrabDelay,
+#else            
                 int Stack, bool noBroadcast, int pfix, bool noGrabDelay, bool reverseLookup,
+#endif
                 Terraria.NPC instance)
             {
                 var args = new DropLootEventArgs()
@@ -101,15 +111,21 @@ public static int InvokeDropLoot(int X, int Y, int Width, int Height, int Type,
                     NoBroadcast = noBroadcast,
                     Pfix = pfix,
                     NoGrabDelay = noGrabDelay,
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                    ReverseLookup = false, // no longer used, but kept for api compatibility.
+#else
                     ReverseLookup = reverseLookup,
+#endif
                     Npc = instance,
 
                     ItemIndex = 0,
                 };
                 DropLoot?.Invoke(null, args);
                 if (args.Result != HookResult.Cancel)
                 {
-#if TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                    args.ItemIndex = Terraria.Item.NewItem(args.Source, X, Y, Width, Height, Type, Stack, noBroadcast, pfix, noGrabDelay);
+#elif TerrariaServer_EntitySourcesActive || Terraria_EntitySourcesActive || tModLoader_EntitySourcesActive
                     args.ItemIndex = Terraria.Item.NewItem(args.Source, X, Y, Width, Height, Type, Stack, noBroadcast, pfix, noGrabDelay, reverseLookup);
 #else
                     args.ItemIndex = Terraria.Item.NewItem(X, Y, Width, Height, Type, Stack, noBroadcast, pfix, noGrabDelay, reverseLookup);
diff --git a/OTAPI.Scripts/Mods/HookNpcTransform.Server.cs b/OTAPI.Scripts/Mods/HookNpcTransform.Server.cs
@@ -33,11 +33,16 @@ You should have received a copy of the GNU General Public License
 [MonoMod.MonoModIgnore]
 void HookNpcTransform(MonoModder modder)
 {
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+    var transform = modder.GetILCursor(() => (new Terraria.NPC()).Transform(0, 0f, 0f, 0f, 0f, false));
+#else
     var transform = modder.GetILCursor(() => (new Terraria.NPC()).Transform(0));
+#endif
 
     transform.GotoNext(ins => ins.Operand is FieldReference fr && fr.Name == "netMode" && ins.Next.OpCode == OpCodes.Ldc_I4_2);
     transform.Emit(OpCodes.Ldarg_0);
-    transform.Emit(OpCodes.Ldarga, transform.Method.Parameters.Single());
+    foreach(var parameter in transform.Method.Parameters)
+        transform.Emit(OpCodes.Ldarga, parameter);
     transform.EmitDelegate(OTAPI.Hooks.NPC.InvokeTransforming);
     transform.Emit(OpCodes.Brtrue, transform.Next);
     transform.Emit(OpCodes.Ret);
@@ -55,18 +60,44 @@ public class TransformingEventArgs : EventArgs
 
                 public Terraria.NPC Npc { get; set; }
                 public int NewType { get; set; }
+
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                public float Ai0 { get; set; }
+                public float Ai1 { get; set; }
+                public float Ai2 { get; set; }
+                public float Ai3 { get; set; }
+                public bool WithReposition { get; set; }
+#endif
             }
             public static event EventHandler<TransformingEventArgs> Transforming;
 
-            public static bool InvokeTransforming(Terraria.NPC instance, ref int newType)
+            public static bool InvokeTransforming(Terraria.NPC instance, ref int newType
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                , float ai0, float ai1, float ai2, float ai3, bool withReposition
+#endif      
+            )
             {
                 var args = new TransformingEventArgs()
                 {
                     Npc = instance,
                     NewType = newType,
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                    Ai0 = ai0,
+                    Ai1 = ai1,
+                    Ai2 = ai2,
+                    Ai3 = ai3,
+                    WithReposition = withReposition,
+#endif
                 };
                 Transforming?.Invoke(null, args);
                 newType = args.NewType;
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+                ai0 = args.Ai0;
+                ai1 = args.Ai1;
+                ai2 = args.Ai2;
+                ai3 = args.Ai3;
+                withReposition = args.WithReposition;
+#endif
                 return args.Result != HookResult.Cancel;
             }
         }
diff --git a/OTAPI.Scripts/Mods/OnPacketWrite.Server.cs b/OTAPI.Scripts/Mods/OnPacketWrite.Server.cs
@@ -57,7 +57,9 @@ void OnPacketWrite(MonoModder modder)
     callback.Parameters.Add(new ParameterDefinition("ms", ParameterAttributes.None, ms.VariableType));
     callback.Parameters.Add(new ParameterDefinition("bw", ParameterAttributes.None, bw.VariableType));
 
-    sendData.GotoNext(ins => ins.Operand is MethodReference mr && mr.Name == "IsConnected" && mr.DeclaringType.Name == "ISocket");
+    sendData.GotoNext(ins => ins.Operand is MethodReference mr && mr.Name == "IsConnected" && (
+        mr.DeclaringType.Name == "ISocket" || mr.DeclaringType.Name == "RemoteServer"
+    ));
     sendData.GotoPrev(ins => ins.Operand is FieldReference fr && fr.Name == "netMode" && fr.DeclaringType.Name == "Main");
 
     sendData.Emit(OpCodes.Ldloc, bufferID);
diff --git a/OTAPI.Scripts/Patches/HookChestQuickStack.Server.cs b/OTAPI.Scripts/Patches/HookChestQuickStack.Server.cs
@@ -38,6 +38,9 @@ partial class ChestHooks
     [Modification(ModType.PreMerge, "Hooking chest stacking")]
     static void HookChestQuickStack(ModFwModder modder)
     {
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+        Console.WriteLine("[TODO] reimplement HookChestQuickStack for 1.4.5+");
+#else
         var csr = modder.GetILCursor(() => Terraria.Chest.PutItemInNearbyChest(null, default));
         PutItemInNearbyChest = csr.Method;
 
@@ -74,6 +77,7 @@ static void HookChestQuickStack(ModFwModder modder)
                 new { OpCodes.Br, Operand = (Instruction)beginInstruction.Operand }
             );
         }
+#endif
     }
 
     private static void Modder_OnRewritingMethodBody(MonoModder modder, MethodBody body, Instruction instr, int instri)
diff --git a/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs b/OTAPI.Scripts/Patches/PatchNpcStrikeArgs.Server.cs
@@ -15,28 +15,30 @@ 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/>.
-*/
+*/
 #if !tModLoaderServer_V1_3
 using ModFramework;
-using Mono.Cecil;
-using Mono.Cecil.Cil;
-using MonoMod;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using MonoMod;
 using System;
-using System.Linq;
-
-/// <summary>
-/// @doc Adds a Terraria.Entity entity parameter to Terraria.NPC.StrikeNPC.
-/// </summary>
-[MonoModIgnore]
-partial class NpcStrikeArgs
-{
-    //static ParameterDefinition Entity { get; set; }
-    //static MethodDefinition StrikeNPC { get; set; }
-
-    [Modification(ModType.PreMerge, "Patching in entity source for NPC strike")]
-    static void PatchNpcStrikeArgs(ModFwModder modder)
-    {
+using System.Linq;
+
+/// <summary>
+/// @doc Adds a Terraria.Entity entity parameter to Terraria.NPC.StrikeNPC.
+/// </summary>
+[MonoModIgnore]
+partial class NpcStrikeArgs
+{
+    [Modification(ModType.PreMerge, "Patching in entity source for NPC strike")]
+    static void PatchNpcStrikeArgs(ModFwModder modder)
+    {
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+        var csr = modder.GetILCursor(() => (new Terraria.NPC()).StrikeNPC(0, 0, 0, false, false, false, 0));
+#else
         var csr = modder.GetILCursor(() => (new Terraria.NPC()).StrikeNPC(0, 0, 0, false, false, false));
+#endif
+        
         var redirects = csr.Method.DeclaringType.Methods
             .Where(x => (HookEmitter.HookMethodNamePrefix + x.Name) == csr.Method.Name || ("orig_" + x.Name) == csr.Method.Name)
             .Select(x => x.GetILCursor())
@@ -45,16 +47,16 @@ static void PatchNpcStrikeArgs(ModFwModder modder)
         foreach (var method in redirects.Append(csr))
         {
             ParameterDefinition Entity;
-            method.Method.Parameters.Add(Entity = new ("entity",
-                ParameterAttributes.HasDefault | ParameterAttributes.Optional,
-
-                modder.Module.ImportReference(modder.GetDefinition<Terraria.Entity>())
+            method.Method.Parameters.Add(Entity = new ("entity",
+                ParameterAttributes.HasDefault | ParameterAttributes.Optional,
+
+                modder.Module.ImportReference(modder.GetDefinition<Terraria.Entity>())
             )
             {
                 Constant = null
             });
 
-            modder.OnRewritingMethodBody += (MonoModder modder, MethodBody body, Instruction instr, int instri) =>
+            modder.OnRewritingMethodBody += (MonoModder modder, MethodBody body, Instruction instr, int instri) =>
             {
                 if (instr.Operand is MethodReference methodReference)
                 {
@@ -96,13 +98,21 @@ static void PatchNpcStrikeArgs(ModFwModder modder)
                                 );
                                 break;
 
+                            case "Projectile.Damage_PVE_Inner":
+                                // find the NPC parameter
+                                var prm = body.Method.Parameters.Single(x => x.ParameterType.FullName == "Terraria.NPC");
+                                body.GetILProcessor().InsertBefore(instr,
+                                    new { OpCodes.Ldarg, Operand = prm }
+                                );
+                                break;
+
                             default:
-                                throw new NotImplementedException($"{body.Method.Name} is not a supported caller for this modification");
+                                throw new NotImplementedException($"{body.Method.FullName} is not a supported caller for this modification");
                         }
                     }
                 }
             };
-        }
-    }
+        }
+    }
 }
 #endif
diff --git a/OTAPI.Scripts/Patches/ReLogic.OS.Windows.PathService.Server.cs b/OTAPI.Scripts/Patches/ReLogic.OS.Windows.PathService.Server.cs
@@ -27,12 +27,20 @@ namespace ReLogic.OS.Windows
 {
     public class patch_PathService : ReLogic.OS.Windows.PathService
     {
+#if TerrariaServer_1450_OrAbove || Terraria__1450_OrAbove || tModLoader_1450_OrAbove
+        public extern void orig_MoveToRecycleBin(string path);
+        public override void MoveToRecycleBin(string path)
+        {
+            System.IO.File.Delete(path);
+        }
+#else
         public extern bool orig_MoveToRecycleBin(string path);
         public override bool MoveToRecycleBin(string path)
         {
             System.IO.File.Delete(path);
             return true;
         }
+#endif
     }
 }
 #endif
diff --git a/OTAPI.Server.Launcher/Program.cs b/OTAPI.Server.Launcher/Program.cs
@@ -117,7 +117,7 @@ void Print<TSender, TArgs>(TSender sender, TArgs args)
     HookEvents.Terraria.Main.checkXMas += Print;
     HookEvents.Terraria.Main.checkHalloween += Print;
     HookEvents.Terraria.Main.startDedInput += Print;
-#if !TML
+#if !TML && !TerrariaServer_1450_OrAbove
     HookEvents.Terraria.Item.SetDefaults_Int32_Boolean_ItemVariant += Print;
 #endif
     HookEvents.Terraria.Item.netDefaults += Print;

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ partial class ChestHooks`
`38`	`38`	`[Modification(ModType.PreMerge, "Hooking chest stacking")]`
`39`	`39`	`static void HookChestQuickStack(ModFwModder modder)`
`40`	`40`	`{`
	`41`	`+#if TerrariaServer_1450_OrAbove \|\| Terraria__1450_OrAbove \|\| tModLoader_1450_OrAbove`
	`42`	`+ Console.WriteLine("[TODO] reimplement HookChestQuickStack for 1.4.5+");`
	`43`	`+#else`
`41`	`44`	`var csr = modder.GetILCursor(() => Terraria.Chest.PutItemInNearbyChest(null, default));`
`42`	`45`	`PutItemInNearbyChest = csr.Method;`
`43`	`46`
`@@ -74,6 +77,7 @@ static void HookChestQuickStack(ModFwModder modder)`
`74`	`77`	`new { OpCodes.Br, Operand = (Instruction)beginInstruction.Operand }`
`75`	`78`	`);`
`76`	`79`	`}`
	`80`	`+#endif`
`77`	`81`	`}`
`78`	`82`
`79`	`83`	`private static void Modder_OnRewritingMethodBody(MonoModder modder, MethodBody body, Instruction instr, int instri)`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,20 @@ namespace ReLogic.OS.Windows`
`27`	`27`	`{`
`28`	`28`	`public class patch_PathService : ReLogic.OS.Windows.PathService`
`29`	`29`	`{`
	`30`	`+#if TerrariaServer_1450_OrAbove \|\| Terraria__1450_OrAbove \|\| tModLoader_1450_OrAbove`
	`31`	`+ public extern void orig_MoveToRecycleBin(string path);`
	`32`	`+ public override void MoveToRecycleBin(string path)`
	`33`	`+ {`
	`34`	`+ System.IO.File.Delete(path);`
	`35`	`+ }`
	`36`	`+#else`
`30`	`37`	`public extern bool orig_MoveToRecycleBin(string path);`
`31`	`38`	`public override bool MoveToRecycleBin(string path)`
`32`	`39`	`{`
`33`	`40`	`System.IO.File.Delete(path);`
`34`	`41`	`return true;`
`35`	`42`	`}`
	`43`	`+#endif`
`36`	`44`	`}`
`37`	`45`	`}`
`38`	`46`	`#endif`