From 6e10bc4f8f8fc76ab87c11dbaa7f4df3424bb7cb Mon Sep 17 00:00:00 2001 From: "Mr. Blue" Date: Thu, 25 Apr 2024 21:20:48 +0200 Subject: [PATCH] Patch for staging branch changes --- resources/Rust.opj | 427 +++++++++++++++++++++++++++++------------- src/Oxide.Rust.csproj | 2 +- 2 files changed, 295 insertions(+), 134 deletions(-) diff --git a/resources/Rust.opj b/resources/Rust.opj index 675167c4b..2189e9ef0 100644 --- a/resources/Rust.opj +++ b/resources/Rust.opj @@ -1,6 +1,6 @@ { "Name": "Rust", - "TargetDirectory": "D:\\Servers\\Rust\\RustDedicated_Data\\Managed", + "TargetDirectory": "D:\\Servers\\Rust-Staging\\RustDedicated_Data\\Managed", "Manifests": [ { "AssemblyName": "Assembly-CSharp.dll", @@ -469,7 +469,7 @@ "HitInfo" ] }, - "MSILHash": "zeuuUBL+EYz5jN9sauL5CTDiJ2+dsqPLlZN3vA0RAvs=", + "MSILHash": "nnUYrcvLr8EtdnRLNhVyEgbuiE2BMMHt8GDWHRfXKIY=", "HookCategory": "Entity" } }, @@ -530,7 +530,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 2043, + "InjectionIndex": 2230, "ReturnBehavior": 1, "ArgumentBehavior": 4, "ArgumentString": "this, l2", @@ -548,7 +548,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "TfqZ/gXIm9013aklZUjmf9QQxqVzjfWRZREbhxYvdDI=", + "MSILHash": "4KMGc2Ua5oRtxFip1L0R+tr3wRYGU49LB8obPONrUss=", "HookCategory": "Player" } }, @@ -573,7 +573,7 @@ "System.Single" ] }, - "MSILHash": "PhCGOVleGOwxzcaa/0dBULlvKyNQPAFAYBY5mfNp1Lo=", + "MSILHash": "Hw9ITE27NvAQskVCK/hJtj92GeP7t7gIwoQwH9+4q0k=", "HookCategory": "Player" } }, @@ -598,7 +598,7 @@ "Network.Connection" ] }, - "MSILHash": "glTsFizhnhHTPDFp3EEy+KIkSr6smt/9P3DGTlrS3sM=", + "MSILHash": "sby/AJuJKDUREIgUpLOYgwEyxWYbhY7BURiWiueQFHA=", "HookCategory": "Player" } }, @@ -663,7 +663,7 @@ "Name": "OnStructureDemolish [immediate = true]", "HookName": "OnStructureDemolish", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Flagged": false, "Signature": { "Exposure": 0, @@ -673,7 +673,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "66ZjJOXD/E8EGvhI0YZKTZBfA3T93VGDmOQpyolmyy0=", + "MSILHash": "O/1gpHnA2EYRF53Tw7g59IWiue7rIIySuls/wgGJpsY=", "HookCategory": "Structure" } }, @@ -1383,7 +1383,7 @@ "BasePlayer" ] }, - "MSILHash": "lpvYUDHOb0dlw8B7gqFoWxxyC7TiK3j/TP+LHyfxsqw=", + "MSILHash": "OZ3meH+nM5zM+OSBkou0hGFByKmBACeisLO7Az7uw/U=", "HookCategory": "Structure" } }, @@ -1768,7 +1768,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 255, + "InjectionIndex": 259, "ReturnBehavior": 1, "ArgumentBehavior": 4, "ArgumentString": "this, l1, l3", @@ -1786,7 +1786,7 @@ "ProtoBuf.CreateBuilding" ] }, - "MSILHash": "9cFOXn7pO8MecIEa9cojA5AN8+cV9BG8f3iXljVQqHA=", + "MSILHash": "TNaoFTwjxQO3M4YXidoIHB6vgc08xAdJIv9MPo8sJpk=", "HookCategory": "Structure" } }, @@ -1998,7 +1998,7 @@ "Name": "OnStructureDemolish [immediate = false]", "HookName": "OnStructureDemolish", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Flagged": false, "Signature": { "Exposure": 0, @@ -2008,7 +2008,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "zYLS015kEcpVnxjR7A0nUwwojuxpF4Fm51QNB66Xj0E=", + "MSILHash": "tZXpEHCmtScT1FBIYwAcysBagsi7z8uIVr1IS9lPunc=", "HookCategory": "Structure" } }, @@ -2269,7 +2269,7 @@ "Network.Message" ] }, - "MSILHash": "Q9mpj8LcaQxd9kEMvBDGtWU+TyZr5m7Tzx3yaWpXPeM=", + "MSILHash": "fj7VWHgehbggfIMuFgkXK2Q+OgIYoQzLsy+vNg8dMBs=", "HookCategory": "Player" } }, @@ -2295,7 +2295,7 @@ "System.Boolean" ] }, - "MSILHash": "m+av8qLcLzvCUhDZafowdMAbwZZet0b9M+Jzhh1sYdI=", + "MSILHash": "iexeW9Z91b5jiig2FobI9aO+NZN63R+4/A2+wgRgYBA=", "HookCategory": "Server" } }, @@ -2324,7 +2324,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 381, + "InjectionIndex": 357, "ReturnBehavior": 1, "ArgumentBehavior": 4, "ArgumentString": "l1", @@ -2343,7 +2343,7 @@ "System.Boolean" ] }, - "MSILHash": "m+av8qLcLzvCUhDZafowdMAbwZZet0b9M+Jzhh1sYdI=", + "MSILHash": "iexeW9Z91b5jiig2FobI9aO+NZN63R+4/A2+wgRgYBA=", "BaseHookName": "OnNewSave", "HookCategory": "Server" } @@ -3450,7 +3450,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "EUP0752X5HRCyqwTz5chJXnwrLhx1pkNwtEeymx+3FQ=", + "MSILHash": "ZKFgJLC7E+Itc4Xq+yLrJxoaAedRJrqEgSHPaE69ZCg=", "HookCategory": "Item" } }, @@ -3645,7 +3645,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "YVAEiK2RVtBhCGjUtX99zM5vTz3nz+ZuduVKff11Cxo=", + "MSILHash": "3SMzCH0LRRfnZrPh2kLzeOMr2eTsk7yZCSOWHqurqEI=", "HookCategory": "Player" } }, @@ -3740,7 +3740,7 @@ "Name": "CanDemolish", "HookName": "CanDemolish", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Flagged": false, "Signature": { "Exposure": 0, @@ -3750,7 +3750,7 @@ "BasePlayer" ] }, - "MSILHash": "zFbeGtXMfWZ6zrKBr/Jbou6Pr31xFsOR/nqzsqXCUcM=", + "MSILHash": "jXrl5DwdSMVlV1QDgRTXqpfDeprNWQ69/sv6s7DUzs0=", "HookCategory": "Structure" } }, @@ -4849,7 +4849,7 @@ "Construction" ] }, - "MSILHash": "x1qOmw8xOgXRQRqKh1NUAfpfay7MTTCW1/r9KQSOkF0=", + "MSILHash": "Srq4CkquZ+ly3n18tO1M2YHoU744o7VzBp+1SmK2Cvw=", "HookCategory": "Structure" } }, @@ -4992,7 +4992,7 @@ "Name": "OnStructureDemolish [false, patch]", "HookName": "OnStructureDemolish [false, patch]", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Flagged": false, "Signature": { "Exposure": 0, @@ -5002,7 +5002,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "zYLS015kEcpVnxjR7A0nUwwojuxpF4Fm51QNB66Xj0E=", + "MSILHash": "tZXpEHCmtScT1FBIYwAcysBagsi7z8uIVr1IS9lPunc=", "BaseHookName": "OnStructureDemolish [immediate = false]", "HookCategory": "_Patches" } @@ -5027,7 +5027,7 @@ "Name": "OnStructureDemolish [true, patch]", "HookName": "OnStructureDemolish [true, patch]", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Flagged": false, "Signature": { "Exposure": 0, @@ -5037,7 +5037,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "66ZjJOXD/E8EGvhI0YZKTZBfA3T93VGDmOQpyolmyy0=", + "MSILHash": "O/1gpHnA2EYRF53Tw7g59IWiue7rIIySuls/wgGJpsY=", "BaseHookName": "OnStructureDemolish [immediate = true]", "HookCategory": "_Patches" } @@ -5115,7 +5115,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "4k4j/MeDyVU01mapg7Vle8HuO61sY5Uf2nPr3tBLR5c=", + "MSILHash": "ysCZvDWyXmHuVGvRy7jO0Pe+lI0dBw5Hkyeo7eXERKA=", "HookCategory": "Player" } }, @@ -5159,7 +5159,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "lvLW6/QZPj2VzvEOhn2PS0vDBFIRL0C3aV95na/pbR8=", + "MSILHash": "7CDtgJSAnTW1ffi0DDNogzcBxHMfaW22UV4K6znGvwM=", "HookCategory": "Entity" } }, @@ -5475,10 +5475,10 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 131, + "InjectionIndex": 113, "ReturnBehavior": 0, "ArgumentBehavior": 4, - "ArgumentString": "this, l5, l2", + "ArgumentString": "this, l4, l2", "HookTypeName": "Simple", "Name": "OnFireBallDamage", "HookName": "OnFireBallDamage", @@ -5491,7 +5491,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "cvfJmBeRdunO8QNxjCmk7mdegONF7rshOoeIulZSrDM=", + "MSILHash": "V+yrEX3tnLFqrHB9+Y8sDnBr1bJF5wbigCeMUGVeKQ8=", "HookCategory": "Weapon" } }, @@ -6193,7 +6193,7 @@ "System.String" ] }, - "MSILHash": "mUsHzwVB37MbqThsPvNhv0Z40eN3+eRTW5edTQQfUcc=", + "MSILHash": "wySEwaLSLxy+Np+uVz1Edi8SXstVJMif0pvTInaCxjc=", "HookCategory": "Player" } }, @@ -6212,13 +6212,13 @@ "Flagged": false, "Signature": { "Exposure": 2, - "Name": "SVSwitch", + "Name": "RPC_Switch", "ReturnType": "System.Void", "Parameters": [ "BaseEntity/RPCMessage" ] }, - "MSILHash": "WY7Pk1dKaALsdA07cLtVDLnBFGwAO7jOkUpU6l3rdXE=", + "MSILHash": "aq6Hh1CFfs3Jrl93toLfVixigIqkumIHCktMiWt4S6c=", "HookCategory": "Entity" } }, @@ -7129,7 +7129,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "GgnzhBlErB70C5W/h0Mxx0vznyil/cK0JC+VRxzgVSM=", + "MSILHash": "uqknyI+NXfOn5aD0gA9w5dPGdQ6Tor0pf38fk8xVRYE=", "HookCategory": "Entity" } }, @@ -7181,7 +7181,7 @@ "BasePlayer" ] }, - "MSILHash": "MsHfoJjpH1L26CitpZRqkrJcO8G82xyOjZ1QSjL6WAg=", + "MSILHash": "avI1YtivdzEoHxIvxYhgqBCYUeLzyRq/HZSVEqHuUmU=", "HookCategory": "Weapon" } }, @@ -7260,7 +7260,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 4, + "InjectionIndex": 0, "ReturnBehavior": 1, "ArgumentBehavior": 4, "ArgumentString": "this, a0.player", @@ -7272,13 +7272,13 @@ "Flagged": false, "Signature": { "Exposure": 2, - "Name": "Press", + "Name": "RPC_Press", "ReturnType": "System.Void", "Parameters": [ "BaseEntity/RPCMessage" ] }, - "MSILHash": "6vEnhshu32xjsTF1J+MieG3lHF5rO99GTTIwluX6CMQ=", + "MSILHash": "zOWiXj4NW8SKQrm3OVjfgvLzIjMzK3vs1onDfG5JRMs=", "HookCategory": "Electronic" } }, @@ -7409,10 +7409,10 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 167, + "InjectionIndex": 192, "ReturnBehavior": 1, "ArgumentBehavior": 4, - "ArgumentString": "l0, l8, l4, l10, l6, l2", + "ArgumentString": "l0, l4, l2, l6, l3, l1.linePoints", "HookTypeName": "Simple", "Name": "OnWireConnect", "HookName": "OnWireConnect", @@ -7421,23 +7421,23 @@ "Flagged": false, "Signature": { "Exposure": 2, - "Name": "MakeConnection", + "Name": "RPC_MakeConnection", "ReturnType": "System.Void", "Parameters": [ "BaseEntity/RPCMessage" ] }, - "MSILHash": "xw2L9Gr7VSWdew+E4ax/k7b3l7EdiCRCIj8KtFpwT9M=", + "MSILHash": "u5q/vw86T2W+Se6EQk2Ufz3Lb+PnaSMzBFVcGZZ5DMA=", "HookCategory": "Player" } }, { "Type": "Simple", "Hook": { - "InjectionIndex": 66, + "InjectionIndex": 35, "ReturnBehavior": 1, "ArgumentBehavior": 4, - "ArgumentString": "a1, l0, a2, l2, a3", + "ArgumentString": "a1, l0, a2, l1, a3", "HookTypeName": "Simple", "Name": "OnWireClear", "HookName": "OnWireClear", @@ -7455,10 +7455,154 @@ "System.Boolean" ] }, - "MSILHash": "GiZ0CqS/pA8A6r2qZOgo5EWuehMvPQfex7bQsZb+DcU=", + "MSILHash": "8ZkJoWRb3RNkK7VtadwXOhN2d8ICdNVqbRzaKPS0nmc=", + "BaseHookName": "OnWireClear [patch]", "HookCategory": "Player" } }, + { + "Type": "Modify", + "Hook": { + "InjectionIndex": 9, + "RemoveCount": 0, + "Instructions": [ + { + "OpCode": "ldarg_3", + "OpType": "None" + }, + { + "OpCode": "brtrue_s", + "OpType": "Instruction", + "Operand": 1031 + }, + { + "OpCode": "ldloc_0", + "OpType": "None" + }, + { + "OpCode": "ldfld", + "OpType": "Field", + "Operand": "Assembly-CSharp|IOEntity|outputs" + }, + { + "OpCode": "ldarg_2", + "OpType": "None" + }, + { + "OpCode": "ldelem_ref", + "OpType": "None" + }, + { + "OpCode": "br_s", + "OpType": "Instruction", + "Operand": 1035 + }, + { + "OpCode": "ldloc_0", + "OpType": "None" + }, + { + "OpCode": "ldfld", + "OpType": "Field", + "Operand": "Assembly-CSharp|IOEntity|inputs" + }, + { + "OpCode": "ldarg_2", + "OpType": "None" + }, + { + "OpCode": "ldelem_ref", + "OpType": "None" + }, + { + "OpCode": "stloc_1", + "OpType": "None" + }, + { + "OpCode": "ldloc_1", + "OpType": "None" + }, + { + "OpCode": "ldfld", + "OpType": "Field", + "Operand": "Assembly-CSharp|IOEntity/IOSlot|connectedTo" + }, + { + "OpCode": "ldc_i4_1", + "OpType": "None" + }, + { + "OpCode": "callvirt", + "OpType": "Method", + "Operand": "Assembly-CSharp|IOEntity/IORef|Get" + }, + { + "OpCode": "ldnull", + "OpType": "None" + }, + { + "OpCode": "call", + "OpType": "Method", + "Operand": "UnityEngine.CoreModule|UnityEngine.Object|op_Equality" + }, + { + "OpCode": "brfalse_s", + "OpType": "Instruction", + "Operand": 1045 + }, + { + "OpCode": "ldc_i4_0", + "OpType": "None" + }, + { + "OpCode": "ret", + "OpType": "None" + }, + { + "OpCode": "ldloc_1", + "OpType": "None" + }, + { + "OpCode": "ldfld", + "OpType": "Field", + "Operand": "Assembly-CSharp|IOEntity/IOSlot|connectedTo" + }, + { + "OpCode": "ldc_i4_1", + "OpType": "None" + }, + { + "OpCode": "callvirt", + "OpType": "Method", + "Operand": "Assembly-CSharp|IOEntity/IORef|Get" + }, + { + "OpCode": "stloc_1", + "OpType": "None" + } + ], + "HookTypeName": "Modify", + "Name": "OnWireClear [patch]", + "HookName": "OnWireClear [patch]", + "HookDescription": "", + "AssemblyName": "Assembly-CSharp.dll", + "TypeName": "WireTool", + "Flagged": false, + "Signature": { + "Exposure": 2, + "Name": "AttemptClearSlot", + "ReturnType": "System.Void", + "Parameters": [ + "BaseNetworkable", + "BasePlayer", + "System.Int32", + "System.Boolean" + ] + }, + "MSILHash": "8ZkJoWRb3RNkK7VtadwXOhN2d8ICdNVqbRzaKPS0nmc=", + "HookCategory": "_Patches" + } + }, { "Type": "Simple", "Hook": { @@ -7767,14 +7911,14 @@ "System.Boolean" ] }, - "MSILHash": "7pcDCb0FfaqKjGLAeZ8hr8OYIypYGgfr64x9Vr9xwWM=", + "MSILHash": "kH/AI23u/yiUVghOgB0dfkRKdm6o277fWg0WyEcLsmk=", "HookCategory": "Structure" } }, { "Type": "Simple", "Hook": { - "InjectionIndex": 14, + "InjectionIndex": 11, "ReturnBehavior": 1, "ArgumentBehavior": 1, "HookTypeName": "Simple", @@ -7789,7 +7933,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "4rRNfh7lEVdwqayR4MPG/BTsQdVv4kwmcOYd0tetnXw=", + "MSILHash": "W0ebD0XlzLxGoFAos/GKl6zbH4/APSnwXRnsxY2SKFk=", "HookCategory": "Entity" } }, @@ -7879,7 +8023,7 @@ "HitInfo" ] }, - "MSILHash": "3RiTL6CdvOJpg8zOdMup1NUrbWyfvC31Fihxmgd16b8=", + "MSILHash": "oPttN/qHB/hjy4M/7f5ucxz6XYB2hwhOjuft8qi7UkU=", "HookCategory": "Entity" } }, @@ -9586,7 +9730,7 @@ "System.Collections.Generic.List`1" ] }, - "MSILHash": "UjXO8wg3dqL35BU0PoRXeWxQfz24PSIfCcwrsPmPoXY=", + "MSILHash": "g0A4JVfpBh8QIZakl6tEQ4bGRhmdgIga6Ar+miRUte8=", "HookCategory": "Player" } }, @@ -9614,7 +9758,7 @@ "System.Collections.Generic.List`1" ] }, - "MSILHash": "UjXO8wg3dqL35BU0PoRXeWxQfz24PSIfCcwrsPmPoXY=", + "MSILHash": "g0A4JVfpBh8QIZakl6tEQ4bGRhmdgIga6Ar+miRUte8=", "BaseHookName": "OnPlayerCorpseSpawn", "HookCategory": "Player" } @@ -10371,7 +10515,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 55, + "InjectionIndex": 58, "ReturnBehavior": 0, "ArgumentBehavior": 0, "HookTypeName": "Simple", @@ -10386,7 +10530,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "7IfxAk9ic8SUWEJUA+kQqSfuJ+4bN5oHHnrtYIxQ8ng=", + "MSILHash": "6+X1Z1eLB3S2yssKmxQHaSe7OdDpL/AGERC8P6v32bA=", "HookCategory": "Server" } }, @@ -10891,7 +11035,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 14, + "InjectionIndex": 15, "ReturnBehavior": 0, "ArgumentBehavior": 4, "ArgumentString": "this, a0.player", @@ -10903,13 +11047,13 @@ "Flagged": false, "Signature": { "Exposure": 2, - "Name": "SVSwitch", + "Name": "RPC_Switch", "ReturnType": "System.Void", "Parameters": [ "BaseEntity/RPCMessage" ] }, - "MSILHash": "WY7Pk1dKaALsdA07cLtVDLnBFGwAO7jOkUpU6l3rdXE=", + "MSILHash": "aq6Hh1CFfs3Jrl93toLfVixigIqkumIHCktMiWt4S6c=", "BaseHookName": "OnSwitchToggle [ElectricSwitch]", "HookCategory": "Entity" } @@ -12435,14 +12579,14 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "wh+R7AdTe/79XPK+obgVpmWgio9mwdYulGJHUqewzcU=", + "MSILHash": "nq58X8+rBKd+wZcYFAMg9OGo6h89hRrV3+6CrtXLW88=", "HookCategory": "TechTree" } }, { "Type": "Simple", "Hook": { - "InjectionIndex": 115, + "InjectionIndex": 121, "ReturnBehavior": 0, "ArgumentBehavior": 4, "ArgumentString": "this, l2, l0", @@ -12460,7 +12604,7 @@ "BaseEntity/RPCMessage" ] }, - "MSILHash": "wh+R7AdTe/79XPK+obgVpmWgio9mwdYulGJHUqewzcU=", + "MSILHash": "nq58X8+rBKd+wZcYFAMg9OGo6h89hRrV3+6CrtXLW88=", "BaseHookName": "OnTechTreeNodeUnlock", "HookCategory": "TechTree" } @@ -12754,11 +12898,10 @@ "Name": "ScrapForResearch", "ReturnType": "System.Int32", "Parameters": [ - "ItemDefinition", - "ResearchTable/ResearchType" + "ItemDefinition" ] }, - "MSILHash": "8cRYVMJ6asNkctH0WPG6y70dhd/F8c/GzkoftTTn3I8=", + "MSILHash": "NafofxEwKqxef+btxnbH922Phesz9Pup65uKLLdT6Yc=", "HookCategory": "Item" } }, @@ -13601,7 +13744,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "Xlsnv0brx1lqm1MC7vPnVMNU8X/CoCnY478KXJQL4PQ=", + "MSILHash": "rGRr3u+X7yZ2A5xtPrt/oCuXW14qy8hLox6wXR/sgtY=", "HookCategory": "Player" } }, @@ -15407,7 +15550,7 @@ "BaseMission" ] }, - "MSILHash": "uOv+yTC5JMXUP/VTNc/iecdP6ueDfGP/+K/1IUM3pVQ=", + "MSILHash": "o0iV4po1xIHlEf+BWtKc8NvOdMUFeHc0fu6dmmcgIiY=", "HookCategory": "Mission" } }, @@ -15434,7 +15577,7 @@ "BaseMission" ] }, - "MSILHash": "uOv+yTC5JMXUP/VTNc/iecdP6ueDfGP/+K/1IUM3pVQ=", + "MSILHash": "o0iV4po1xIHlEf+BWtKc8NvOdMUFeHc0fu6dmmcgIiY=", "BaseHookName": "CanAssignMission", "HookCategory": "Mission" } @@ -15516,7 +15659,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 82, + "InjectionIndex": 92, "ReturnBehavior": 0, "ArgumentBehavior": 4, "ArgumentString": "this, l1", @@ -15534,7 +15677,7 @@ "UnityEngine.Vector3" ] }, - "MSILHash": "xlfHMycc3Ov+dLDuHPDOm9wPq4y/1MulZPGI5xTmWzo=", + "MSILHash": "hL6/Z93Oh10PVDkRWMNETZ0lJ14/XCJU+2jvAfNPY08=", "HookCategory": "Weapon" } }, @@ -15561,7 +15704,7 @@ "System.Boolean" ] }, - "MSILHash": "fg+fULUi338wbtGSiibtmj4545KuRfOAfVG9W7cpfzI=", + "MSILHash": "q6CAAVq7gLLTlkx3Apps2zLBvtUsl2XsBHu0UsPUU5E=", "HookCategory": "Player" } }, @@ -16502,7 +16645,7 @@ { "Type": "Simple", "Hook": { - "InjectionIndex": 329, + "InjectionIndex": 319, "ReturnBehavior": 0, "ArgumentBehavior": 0, "HookTypeName": "Simple", @@ -16517,7 +16660,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "FxE646kSXc230aaN/pYGUQwKuTqX1nmi5l+NJcYsu8Y=", + "MSILHash": "IYfG34sxtE6kKs0Ah0SvWGeTSMfQrLE6qSOKp0GlqZs=", "HookCategory": "Server" } }, @@ -19693,7 +19836,7 @@ "BasePlayer" ] }, - "MSILHash": "5vISF8N6bVoQEVTjHakJZgJO+6q9V7TZ8YgkqqEuLkQ=", + "MSILHash": "CyIuR7VRaDL1zh+FvN8omD3G4hX23NnETYYmNXFc75Y=", "HookCategory": "Player" } }, @@ -20398,7 +20541,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "5wYdURq/V+5LzwLNhXLz0AHjzYxj2fcTKR+/0Ak8blY=", + "MSILHash": "zyB7KffEFWKZAGOH5gzbeJky/xSghdEpp39TC3Oin6g=", "HookCategory": "Entity" } }, @@ -20421,7 +20564,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "5wYdURq/V+5LzwLNhXLz0AHjzYxj2fcTKR+/0Ak8blY=", + "MSILHash": "zyB7KffEFWKZAGOH5gzbeJky/xSghdEpp39TC3Oin6g=", "BaseHookName": "CanSeeStash", "HookCategory": "Entity" } @@ -21003,9 +21146,9 @@ "MSILHash": "PdfRUt9Duv6IxSvlqSpfzNXmL84oPLY2sZAOKKwejME=" }, { - "Name": "BuildingBlock::StartBeingDemolishable", + "Name": "StabilityEntity::StartBeingDemolishable", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -21041,9 +21184,9 @@ "MSILHash": "yr3pxQadBNFMkO05DjjpCAgkEfLedhgxN1M15n5ht5o=" }, { - "Name": "BuildingBlock::StopBeingDemolishable", + "Name": "StabilityEntity::StopBeingDemolishable", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -22757,7 +22900,7 @@ { "Name": "BuildingBlock::CanDemolish", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -23852,25 +23995,6 @@ }, "MSILHash": "cOKaTnFjThXK5+fW6IFwuan38uzMj6t8chT/YjHvh+M=" }, - { - "Name": "BigWheelGame::LoadHitNumbers", - "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BigWheelGame", - "Type": 1, - "TargetExposure": [ - 2 - ], - "Flagged": false, - "Signature": { - "Exposure": [ - 0 - ], - "Name": "LoadHitNumbers", - "FullTypeName": "System.Void", - "Parameters": [] - }, - "MSILHash": "97/DwvDdQID4Qtgw545W9b40BBy8WSfRBS4l1dKpEbE=" - }, { "Name": "BigWheelGame::lastPaidSpinNumber", "AssemblyName": "Assembly-CSharp.dll", @@ -28683,7 +28807,7 @@ "Flagged": false, "Signature": { "Exposure": [ - 0 + 1 ], "Name": "cachedOutputsUsed", "FullTypeName": "System.Int32 IOEntity::cachedOutputsUsed", @@ -39621,7 +39745,7 @@ "MSILHash": "" }, { - "Name": "StorageMonitor::_onContainerChangedHandler", + "Name": "StorageMonitor::_onItemAddedRemoved", "AssemblyName": "Assembly-CSharp.dll", "TypeName": "StorageMonitor", "Type": 0, @@ -39633,8 +39757,8 @@ "Exposure": [ 0 ], - "Name": "_onContainerChangedHandler", - "FullTypeName": "System.Action`2 StorageMonitor::_onContainerChangedHandler", + "Name": "_onItemAddedRemoved", + "FullTypeName": "System.Action`2 StorageMonitor::_onItemAddedRemoved", "Parameters": [] }, "MSILHash": "" @@ -39654,10 +39778,7 @@ ], "Name": "OnContainerChanged", "FullTypeName": "System.Void", - "Parameters": [ - "Item", - "System.Boolean" - ] + "Parameters": [] }, "MSILHash": "RLUKJszybaEXVHh8wdYU2SPbvZLe13mf2sApeKjRPO0=" }, @@ -41691,9 +41812,9 @@ "MSILHash": "rw3CDBvF03WJOVVzwxtVNxUwF8j91ha1W7cHknY9U1w=" }, { - "Name": "BuildingBlock::DoDemolish", + "Name": "StabilityEntity::DoDemolish", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -41712,9 +41833,9 @@ "MSILHash": "AALSBZG8OX2G60Dt71nwFd0ZrQTHEjbiZFEXYbqXt4w=" }, { - "Name": "BuildingBlock::DoImmediateDemolish", + "Name": "StabilityEntity::DoImmediateDemolish", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -44905,9 +45026,9 @@ "MSILHash": "qViaiKOlscAlINJWvBZx7Y+zRCajd/gSCwxMV/kTtq4=" }, { - "Name": "BuildingBlock::HasDemolishPrivilege", + "Name": "StabilityEntity::HasDemolishPrivilege", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -44970,9 +45091,9 @@ "MSILHash": "" }, { - "Name": "BuildingBlock::IsDemolishable", + "Name": "StabilityEntity::IsDemolishable", "AssemblyName": "Assembly-CSharp.dll", - "TypeName": "BuildingBlock", + "TypeName": "StabilityEntity", "Type": 1, "TargetExposure": [ 2 @@ -50538,7 +50659,45 @@ "MSILHash": "EATOfxsynTyhbAM053PT9rSGmLRECyb8FAyVrRYxA1I=" }, { - "Name": "CargoShip::startHarborApproachNodes", + "Name": "CargoShip::harborApproachPath", + "AssemblyName": "Assembly-CSharp.dll", + "TypeName": "CargoShip", + "Type": 0, + "TargetExposure": [ + 2 + ], + "Flagged": false, + "Signature": { + "Exposure": [ + 0 + ], + "Name": "harborApproachPath", + "FullTypeName": "BasePath CargoShip::harborApproachPath", + "Parameters": [] + }, + "MSILHash": "" + }, + { + "Name": "CargoShip::HarborInfo", + "AssemblyName": "Assembly-CSharp.dll", + "TypeName": "CargoShip/HarborInfo", + "Type": 3, + "TargetExposure": [ + 2 + ], + "Flagged": false, + "Signature": { + "Exposure": [ + 0 + ], + "Name": "HarborInfo", + "FullTypeName": "CargoShip::HarborInfo", + "Parameters": [] + }, + "MSILHash": "" + }, + { + "Name": "CargoShip::hasCalculatedApproaches", "AssemblyName": "Assembly-CSharp.dll", "TypeName": "CargoShip", "Type": 0, @@ -50551,14 +50710,14 @@ "Exposure": [ 0 ], - "Name": "startHarborApproachNodes", - "FullTypeName": "System.Collections.Generic.List`1> CargoShip::startHarborApproachNodes", + "Name": "hasCalculatedApproaches", + "FullTypeName": "System.Boolean", "Parameters": [] }, "MSILHash": "" }, { - "Name": "CargoShip::harborApproachPaths", + "Name": "CargoShip::harbors", "AssemblyName": "Assembly-CSharp.dll", "TypeName": "CargoShip", "Type": 0, @@ -50571,8 +50730,8 @@ "Exposure": [ 0 ], - "Name": "harborApproachPaths", - "FullTypeName": "System.Collections.Generic.List`1 CargoShip::harborApproachPaths", + "Name": "harbors", + "FullTypeName": "System.Collections.Generic.List`1 CargoShip::harbors", "Parameters": [] }, "MSILHash": "" @@ -50592,7 +50751,9 @@ ], "Name": "StartHarborApproach", "FullTypeName": "System.Void", - "Parameters": [] + "Parameters": [ + "CargoNotifier" + ] }, "MSILHash": "MZ5D1YdPLOipwnDmtyBWXxiz2HDKXOHeAkicM0lmeH4=" } @@ -51253,7 +51414,7 @@ "Name": "OnClanDisbanded", "HookName": "OnClanDisbanded", "AssemblyName": "Rust.Clans.Local.dll", - "TypeName": "LocalClan/d__66", + "TypeName": "LocalClan/d__72", "Flagged": false, "Signature": { "Exposure": 0, @@ -51261,7 +51422,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "XDWQZOmfSzEGPgKdkPN5fYr56kYryy+BD3BBPTLNL80=", + "MSILHash": "zjQX2Z0a0Om3bpklBdmJvP5dxtlHKt0hJHirzX++Y5s=", "HookCategory": "Clan" } }, @@ -51324,7 +51485,7 @@ "Name": "OnClanMemberLeft", "HookName": "OnClanMemberLeft", "AssemblyName": "Rust.Clans.Local.dll", - "TypeName": "LocalClan/d__59", + "TypeName": "LocalClan/d__65", "Flagged": false, "Signature": { "Exposure": 0, @@ -51332,7 +51493,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "G0T80QtR5XKlRmTJirLcQIm2xgXDjwacXTecqTbDcfY=", + "MSILHash": "62/QTxOyuPZPfI+WHzTtDKG8nTkO2eUYFFmMnQlmZa0=", "HookCategory": "Clan" } }, @@ -51347,7 +51508,7 @@ "Name": "OnClanMemberKicked", "HookName": "OnClanMemberKicked", "AssemblyName": "Rust.Clans.Local.dll", - "TypeName": "LocalClan/d__59", + "TypeName": "LocalClan/d__65", "Flagged": false, "Signature": { "Exposure": 0, @@ -51355,7 +51516,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "G0T80QtR5XKlRmTJirLcQIm2xgXDjwacXTecqTbDcfY=", + "MSILHash": "62/QTxOyuPZPfI+WHzTtDKG8nTkO2eUYFFmMnQlmZa0=", "BaseHookName": "OnClanMemberLeft", "HookCategory": "Clan" } @@ -51371,7 +51532,7 @@ "Name": "OnClanColorChanged", "HookName": "OnClanColorChanged", "AssemblyName": "Rust.Clans.Local.dll", - "TypeName": "LocalClan/d__55", + "TypeName": "LocalClan/d__61", "Flagged": false, "Signature": { "Exposure": 0, @@ -51379,7 +51540,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "DDlDu5NvDPdKiJqvKJ602ZNrxU+xWygtdSm9UB4vyPg=", + "MSILHash": "OsaGFKJ7X7R584ssxupshqedyCsKoXIsQT+nrJzY8nE=", "HookCategory": "Clan" } }, @@ -51394,7 +51555,7 @@ "Name": "OnClanLogoChanged", "HookName": "OnClanLogoChanged", "AssemblyName": "Rust.Clans.Local.dll", - "TypeName": "LocalClan/d__54", + "TypeName": "LocalClan/d__60", "Flagged": false, "Signature": { "Exposure": 0, @@ -51402,7 +51563,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "W9DXwfArtk7KyC5ZmddJrqrIcsrqmVg6KRXv2z0JB5I=", + "MSILHash": "KuTX1u22EO8+4GjS+SACsxt4g298bNL2E6omZgUevf8=", "HookCategory": "Clan" } }, @@ -51416,7 +51577,7 @@ "Name": "OnClanLogoChanged [patch]", "HookName": "OnClanLogoChanged [patch]", "AssemblyName": "Rust.Clans.Local.dll", - "TypeName": "LocalClan/d__54", + "TypeName": "LocalClan/d__60", "Flagged": false, "Signature": { "Exposure": 0, @@ -51424,7 +51585,7 @@ "ReturnType": "System.Void", "Parameters": [] }, - "MSILHash": "W9DXwfArtk7KyC5ZmddJrqrIcsrqmVg6KRXv2z0JB5I=", + "MSILHash": "KuTX1u22EO8+4GjS+SACsxt4g298bNL2E6omZgUevf8=", "BaseHookName": "OnClanLogoChanged", "HookCategory": "Clan" } diff --git a/src/Oxide.Rust.csproj b/src/Oxide.Rust.csproj index 46b55719e..0fb27b827 100644 --- a/src/Oxide.Rust.csproj +++ b/src/Oxide.Rust.csproj @@ -14,7 +14,7 @@ net48 True 258550 - public + staging anonymous windows;linux RustDedicated.exe;RustDedicated