diff --git a/.editorconfig b/.editorconfig index b4300b8..deb2065 100644 --- a/.editorconfig +++ b/.editorconfig @@ -77,16 +77,6 @@ dotnet_naming_symbols.constants.required_modifiers = const dotnet_naming_style.constant_style.capitalization = pascal_case -# Static readonly fields are PascalCase -dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion -dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields -dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style - -dotnet_naming_symbols.static_fields.applicable_kinds = field -dotnet_naming_symbols.static_fields.required_modifiers = static, readonly - -dotnet_naming_style.static_field_style.capitalization = pascal_case - # Instance fields are camelCase and start with _ dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields diff --git a/AmongUs.props b/AmongUs.props index 8ae9251..ce60106 100644 --- a/AmongUs.props +++ b/AmongUs.props @@ -6,10 +6,9 @@ - - + + - diff --git a/Reactor/Coroutines.cs b/Reactor/Coroutines.cs index b21b894..22ea5c8 100644 --- a/Reactor/Coroutines.cs +++ b/Reactor/Coroutines.cs @@ -1,386 +1,112 @@ -// Adapted from https://github.com/LavaGang/MelonLoader/blob/364515defde1d781daf39c10331f883254295774/SM_Il2Cpp/Coroutines.cs#L10 -/* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2020 Lava Gang - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */ - using System; using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnhollowerBaseLib; +using System.Runtime.CompilerServices; +using UnhollowerBaseLib.Attributes; +using UnhollowerRuntimeLib; using UnityEngine; namespace Reactor { - public class Il2CppEnumeratorWrapper : IEnumerator - { - private readonly Il2CppSystem.Collections.IEnumerator _il2CPPEnumerator; - - public Il2CppEnumeratorWrapper(Il2CppSystem.Collections.IEnumerator il2CppEnumerator) => _il2CPPEnumerator = il2CppEnumerator; - public bool MoveNext() => _il2CPPEnumerator.MoveNext(); - public void Reset() => _il2CPPEnumerator.Reset(); - public object Current => _il2CPPEnumerator.Current; - } - public static class Coroutines { - private struct CoroutineTuple - { - public object WaitCondition; - public IEnumerator Coroutine; - } - [RegisterInIl2Cpp] internal class Component : MonoBehaviour { + internal static Component Instance { get; set; } + public Component(IntPtr ptr) : base(ptr) { } - private void Start() + private void Awake() { - Camera.onPostRender = Camera.onPostRender == null - ? new Action(OnPostRenderM) - : Il2CppSystem.Delegate.Combine(Camera.onPostRender, (Camera.CameraCallback) (Action) OnPostRenderM).Cast(); + Instance = this; } - private void FixedUpdate() + private void OnDestroy() { - ProcessCoroutineList(_ourWaitForFixedUpdateCoroutines); - } - - private void Update() - { - Process(); - } - - public static Camera OnPostRenderCam { get; private set; } - - private static void OnPostRenderM(Camera camera) - { - if (OnPostRenderCam == null) - { - OnPostRenderCam = camera; - } - - if (OnPostRenderCam == camera) - { - ProcessCoroutineList(_ourWaitForEndOfFrameCoroutines); - } + Instance = null; } } - private static readonly List _ourCoroutinesStore = new List(); - private static readonly List _ourNextFrameCoroutines = new List(); - private static readonly List _ourWaitForFixedUpdateCoroutines = new List(); - private static readonly List _ourWaitForEndOfFrameCoroutines = new List(); + private static readonly ConditionalWeakTable _ourCoroutineStore = new(); - private static readonly List _tempList = new List(); + /// + /// Wraps a System Coroutine with the Coroutine Wrapper to return an Il2Cpp Coroutine + /// + private static Il2CppSystem.Collections.IEnumerator Wrap(this IEnumerator routine) => new CoroutineWrapper(routine); + + /// + /// Starts a managed coroutine on a MonoBehaviour + /// + /// MonoBehaviour to start the coroutine on + /// The coroutine to be started + /// The unity coroutine being started + public static Coroutine StartCoroutine(this MonoBehaviour component, IEnumerator coroutine) + { + return component.StartCoroutine(coroutine.Wrap()); + } public static IEnumerator Start(IEnumerator routine) { - if (routine != null) ProcessNextOfCoroutine(routine); + if (routine != null) + { + _ourCoroutineStore.AddOrUpdate(routine, Component.Instance.StartCoroutine(routine)); + } + return routine; } public static void Stop(IEnumerator enumerator) { - if (_ourNextFrameCoroutines.Contains(enumerator)) // the coroutine is running itself + if (enumerator != null && _ourCoroutineStore.TryGetValue(enumerator, out var routine)) { - _ourNextFrameCoroutines.Remove(enumerator); + Component.Instance.StopCoroutine(routine); } - else - { - var coroutineTupleIndex = _ourCoroutinesStore.FindIndex(c => c.Coroutine == enumerator); - if (coroutineTupleIndex != -1) // the coroutine is waiting for a subroutine - { - var waitCondition = _ourCoroutinesStore[coroutineTupleIndex].WaitCondition; - if (waitCondition is IEnumerator waitEnumerator) - { - Stop(waitEnumerator); - } - - _ourCoroutinesStore.RemoveAt(coroutineTupleIndex); - } - } - } - - private static void ProcessCoroutineList(List target) - { - if (target.Count == 0) return; - - // use a temp list to make sure waits made during processing are not handled by same processing invocation - // additionally, a temp list reduces allocations compared to an array - _tempList.AddRange(target); - target.Clear(); - foreach (var enumerator in _tempList) ProcessNextOfCoroutine(enumerator); - _tempList.Clear(); - } - - private static void Process() - { - for (var i = _ourCoroutinesStore.Count - 1; i >= 0; i--) - { - var tuple = _ourCoroutinesStore[i]; - if (tuple.WaitCondition is WaitForSeconds waitForSeconds) - { - if ((waitForSeconds.m_Seconds -= Time.deltaTime) <= 0) - { - _ourCoroutinesStore.RemoveAt(i); - ProcessNextOfCoroutine(tuple.Coroutine); - } - } - } - - ProcessCoroutineList(_ourNextFrameCoroutines); - } - - private static void ProcessNextOfCoroutine(IEnumerator enumerator) - { - try - { - if (!enumerator.MoveNext()) // Run the next step of the coroutine. If it's done, restore the parent routine - { - var indices = _ourCoroutinesStore.Select((it, idx) => (idx, it)).Where(it => it.it.WaitCondition == enumerator).Select(it => it.idx).ToList(); - for (var i = indices.Count - 1; i >= 0; i--) - { - var index = indices[i]; - _ourNextFrameCoroutines.Add(_ourCoroutinesStore[index].Coroutine); - _ourCoroutinesStore.RemoveAt(index); - } - - return; - } - } - catch (Exception e) - { - Logger.Error($"Exception in coroutine of type {enumerator?.GetType().AssemblyQualifiedName}: {e}"); - Stop(FindOriginalCoroutine(enumerator)); // We want the entire coroutine hierarchy to stop when an error happen - return; - } - - var next = enumerator.Current; - switch (next) - { - case null: - _ourNextFrameCoroutines.Add(enumerator); - return; - case WaitForFixedUpdate _: - _ourWaitForFixedUpdateCoroutines.Add(enumerator); - return; - case WaitForEndOfFrame _: - _ourWaitForEndOfFrameCoroutines.Add(enumerator); - return; - case WaitForSeconds _: - break; // do nothing, this one is supported in Process - case Il2CppObjectBase il2CppObjectBase: - var nextAsEnumerator = il2CppObjectBase.TryCast(); - if (nextAsEnumerator != null) // il2cpp IEnumerator also handles CustomYieldInstruction - next = new Il2CppEnumeratorWrapper(nextAsEnumerator); - else - Logger.Warning($"Unknown coroutine yield object of type {il2CppObjectBase} for coroutine {enumerator}"); - break; - } - - _ourCoroutinesStore.Add(new CoroutineTuple { WaitCondition = next, Coroutine = enumerator }); - - if (next is IEnumerator nextCoroutine) - ProcessNextOfCoroutine(nextCoroutine); - } - - private static IEnumerator FindOriginalCoroutine(IEnumerator enumerator) - { - var index = _ourCoroutinesStore.FindIndex(ct => ct.WaitCondition == enumerator); - return index == -1 ? enumerator : FindOriginalCoroutine(_ourCoroutinesStore[index].Coroutine); } } + + [RegisterInIl2Cpp(typeof(Il2CppSystem.Collections.IEnumerator))] + public sealed class CoroutineWrapper : Il2CppSystem.Object + { + public CoroutineWrapper(IntPtr ptr) : base(ptr) { } + + /// + /// Creates an Il2Cpp IEnumerator with a System IEnumerator. + /// + public CoroutineWrapper(IEnumerator enumerator) : base(ClassInjector.DerivedConstructorPointer()) + { + ClassInjector.DerivedConstructorBody(this); + Enumerator = enumerator; + } + + private IEnumerator Enumerator + { + [HideFromIl2Cpp] + get; + [HideFromIl2Cpp] + set; + } + + public Il2CppSystem.Object Current + { + get + { + return Enumerator.Current switch + { + IEnumerator current => new CoroutineWrapper(current), + Il2CppSystem.Collections.IEnumerator current => current.Cast(), + Il2CppSystem.Object current => current, + null => null, + _ => throw new ArgumentException("Encountered unexpected yield value in coroutine, of type " + Enumerator.Current?.GetType().FullName, nameof(Enumerator.Current)) + }; + } + } + + public bool MoveNext() => Enumerator.MoveNext(); + + public void Reset() => Enumerator.Reset(); + + public static implicit operator Il2CppSystem.Collections.IEnumerator(CoroutineWrapper wrapper) => wrapper.Cast(); + } } diff --git a/Reactor/Reactor.csproj b/Reactor/Reactor.csproj index f598cb0..0f9832c 100644 --- a/Reactor/Reactor.csproj +++ b/Reactor/Reactor.csproj @@ -3,7 +3,8 @@ netstandard2.1 latest embedded - + true + 1.0.0 dev Core mod and API for Among Us diff --git a/Reactor/RegisterInIl2CppAttribute.cs b/Reactor/RegisterInIl2CppAttribute.cs index 1a7b5b5..cf249ce 100644 --- a/Reactor/RegisterInIl2CppAttribute.cs +++ b/Reactor/RegisterInIl2CppAttribute.cs @@ -1,7 +1,9 @@ using System; -using System.Collections.Generic; using System.Reflection; using HarmonyLib; +using UnhollowerBaseLib; +using UnhollowerBaseLib.Runtime; +using UnhollowerBaseLib.Runtime.VersionSpecific.Class; using UnhollowerRuntimeLib; namespace Reactor @@ -12,53 +14,52 @@ namespace Reactor [AttributeUsage(AttributeTargets.Class)] public class RegisterInIl2CppAttribute : Attribute { + public Type[] Interfaces { get; } + + public RegisterInIl2CppAttribute() + { + Interfaces = Type.EmptyTypes; + } + + public RegisterInIl2CppAttribute(params Type[] interfaces) + { + Interfaces = interfaces; + } + [Obsolete("You don't need to call this anymore", true)] public static void Register() { } - private static readonly AccessTools.FieldRef> _injectedTypes - = AccessTools.FieldRefAccess>(typeof(ClassInjector), "InjectedTypes"); - private static readonly Func _readClassPointerForType = AccessTools.MethodDelegate>( AccessTools.Method(typeof(ClassInjector), "ReadClassPointerForType") ); - private static bool IsInjected(Type type) + private static unsafe void Register(Type type, Type[] interfaces) { - if (_readClassPointerForType(type) != IntPtr.Zero) + var baseTypeAttribute = type.BaseType?.GetCustomAttribute(); + if (baseTypeAttribute != null) { - return true; + Register(type.BaseType, baseTypeAttribute.Interfaces); } - var injectedTypes = _injectedTypes(); - - lock (injectedTypes) - { - if (injectedTypes.Contains(type.FullName)) - { - return true; - } - } - - return false; - } - - private static void Register(Type type) - { - if (type.BaseType?.GetCustomAttribute() != null) - { - Register(type.BaseType); - } - - if (IsInjected(type)) + if (ClassInjector.IsTypeRegisteredInIl2Cpp(type)) { return; } try { - ClassInjector.RegisterTypeInIl2Cpp(type); + var nativeInterfaces = new INativeClassStruct[interfaces.Length]; + for (var index = 0; index < interfaces.Length; index++) + { + var interfaceType = interfaces[index]; + var klassPtr = _readClassPointerForType(interfaceType); + IL2CPP.il2cpp_runtime_class_init(klassPtr); + nativeInterfaces[index] = UnityVersionHandler.Wrap((Il2CppClass*) klassPtr); + } + + ClassInjector.RegisterTypeInIl2Cpp(type, nativeInterfaces); } catch (Exception e) { @@ -70,9 +71,10 @@ namespace Reactor { foreach (var type in assembly.GetTypes()) { - if (type.GetCustomAttribute() != null) + var attribute = type.GetCustomAttribute(); + if (attribute != null) { - Register(type); + Register(type, attribute.Interfaces); } } }