diff --git a/Runtime/CHANGELOG.md b/Runtime/CHANGELOG.md index 5d4fae1..cd0638e 100644 --- a/Runtime/CHANGELOG.md +++ b/Runtime/CHANGELOG.md @@ -1,3 +1,7 @@ +# '2.3.1' - AC Update + +* Updated to game version 1.4.1 + # '2.3.0' - Memory Optimization * Updated to game version 1.3.9 diff --git a/Runtime/Code/Loaders/VAPIContent.cs b/Runtime/Code/Loaders/VAPIContent.cs index 8d084c9..7bf8ffd 100644 --- a/Runtime/Code/Loaders/VAPIContent.cs +++ b/Runtime/Code/Loaders/VAPIContent.cs @@ -11,6 +11,8 @@ using UnityEngine; using UnityEngine.AddressableAssets; using VAPI.Modules; +using RoR2BepInExPack.GameAssetPaths.Version_1_39_0; + namespace VAPI { public class VAPIContent : IContentPackProvider @@ -21,11 +23,11 @@ public class VAPIContent : IContentPackProvider internal static ContentPack contentPack { get; } = new ContentPack(); - internal static ParallelCoroutine _parallelPreLoadDispatchers = new ParallelCoroutine(); + internal static HG.Coroutines.ParallelCoroutine _parallelPreLoadDispatchers = new(); private static Func[] _loadDispatchers; - internal static ParallelCoroutine _parallelPostLoadDispatchers = new ParallelCoroutine(); + internal static HG.Coroutines.ParallelCoroutine _parallelPostLoadDispatchers = new(); private static Action[] _fieldAssignDispatchers; @@ -37,7 +39,7 @@ public IEnumerator LoadStaticContentAsync(LoadStaticContentAsyncArgs args) yield return null; } - while (!_parallelPreLoadDispatchers.isDone) + while (!_parallelPreLoadDispatchers.IsDone()) yield return null; for (int i = 0; i < _loadDispatchers.Length; i++) @@ -48,7 +50,7 @@ public IEnumerator LoadStaticContentAsync(LoadStaticContentAsyncArgs args) while (enumerator?.MoveNext() ?? false) yield return null; //await } - while (!_parallelPostLoadDispatchers.isDone) + while (!_parallelPostLoadDispatchers.IsDone()) yield return null; for(int i = 0; i < _fieldAssignDispatchers.Length; i++) @@ -100,11 +102,10 @@ IEnumerator LoadEmptySkillDef() IEnumerator LoadLockedIconAndAssignToExpansionDef() { - ParallelCoroutine coroutine = new ParallelCoroutine(); - var request = VAPIAssets.LoadAssetAsync("VarianceExpansion"); - var iconRequest = Addressables.LoadAssetAsync("RoR2/Base/Common/MiscIcons/texUnlockIcon.png"); + var iconRequest = Addressables.LoadAssetAsync(RoR2_Base_Common_MiscIcons.texUnlockIcon_png); + var coroutine = new HG.Coroutines.ParallelCoroutine(); coroutine.Add(request); coroutine.Add(iconRequest); diff --git a/Runtime/Code/Modules/InfiniteTower.cs b/Runtime/Code/Modules/InfiniteTower.cs index c830d5b..4a83653 100644 --- a/Runtime/Code/Modules/InfiniteTower.cs +++ b/Runtime/Code/Modules/InfiniteTower.cs @@ -10,6 +10,7 @@ using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.UI; +using RoR2BepInExPack.GameAssetPaths.Version_1_39_0; namespace VAPI.Modules { @@ -55,13 +56,13 @@ internal static IEnumerator Init() { VAPILog.Info($"Initializing infinite tower support"); _init = true; - - var commonWaveCategoryRequest = Addressables.LoadAssetAsync("RoR2/DLC1/GameModes/InfiniteTowerRun/InfiniteTowerAssets/InfiniteTowerWaveCategories/CommonWaveCategory.asset"); - var overlayEntryRequest = Addressables.LoadAssetAsync("RoR2/DLC1/GameModes/InfiniteTowerRun/InfiniteTowerAssets/InfiniteTowerCurrentArtifactWispOnDeathUI.prefab"); + + var commonWaveCategoryRequest = Addressables.LoadAssetAsync(RoR2_DLC1_GameModes_InfiniteTowerRun_ITAssets_ITWaveCategories.CommonWaveCategory_asset); + var overlayEntryRequest = Addressables.LoadAssetAsync(RoR2_DLC1_GameModes_InfiniteTowerRun_ITAssets.InfiniteTowerCurrentArtifactWispOnDeathUI_prefab); var assetCollectionRequest = VAPIAssets.LoadAssetAsync("acInfiniteTower"); - var wispWave = Addressables.LoadAssetAsync("RoR2/DLC1/GameModes/InfiniteTowerRun/InfiniteTowerAssets/InfiniteTowerWaveArtifactWispOnDeath.prefab"); + var wispWave = Addressables.LoadAssetAsync(RoR2_DLC1_GameModes_InfiniteTowerRun_ITAssets.InfiniteTowerWaveArtifactWispOnDeath_prefab); - ParallelCoroutine coroutine = new ParallelCoroutine(); + var coroutine = new HG.Coroutines.ParallelCoroutine(); coroutine.Add(commonWaveCategoryRequest); coroutine.Add(overlayEntryRequest); coroutine.Add(assetCollectionRequest); diff --git a/Runtime/Code/VAPIMain.cs b/Runtime/Code/VAPIMain.cs index d38a8cc..06381a5 100644 --- a/Runtime/Code/VAPIMain.cs +++ b/Runtime/Code/VAPIMain.cs @@ -31,7 +31,7 @@ public class VAPIMain : BaseUnityPlugin /// /// VAPI's Version /// - public const string VERSION = "2.3.0"; + public const string VERSION = "2.3.1"; /// /// The instancee class of the Main class diff --git a/Runtime/Code/VarianceAPI.asmdef b/Runtime/Code/VarianceAPI.asmdef index 440f931..ecf81df 100644 --- a/Runtime/Code/VarianceAPI.asmdef +++ b/Runtime/Code/VarianceAPI.asmdef @@ -42,7 +42,8 @@ "UnityEngine.UI.dll", "Unity.TextMeshPro.dll", "R2API.Prefab.dll", - "R2API.Addressables.dll" + "R2API.Addressables.dll", + "RoR2BepInExPack.dll" ], "autoReferenced": true, "defineConstraints": [ diff --git a/Runtime/VAPI-Manifest.asset b/Runtime/VAPI-Manifest.asset index 39210af..1a6b30f 100644 --- a/Runtime/VAPI-Manifest.asset +++ b/Runtime/VAPI-Manifest.asset @@ -93,7 +93,7 @@ MonoBehaviour: Name: VarianceAPI Description: VarianceAPI allows you to create Variants for CharacterBodies, Variants can have different textures, lights, skills, and more. - Version: 2.3.0 + Version: 2.3.1 Dependencies: - {fileID: 11400000, guid: 5ceb1d8ed3af40d4d806e9756b403649, type: 2} - {fileID: 11400000, guid: 613d4ca030e90a832defdb35afe5393b, type: 2}