Load both bundles in main

This commit is contained in:
TerrificTrifid 2022-11-25 16:24:19 -06:00
parent 9f8fecacb5
commit f939c224a5
2 changed files with 3 additions and 3 deletions

View File

@ -12,7 +12,6 @@ namespace NewHorizons.Handlers
{ {
public static class VesselWarpHandler public static class VesselWarpHandler
{ {
public static AssetBundle VesselBundle { get; private set; }
public static GameObject VesselPrefab { get; private set; } public static GameObject VesselPrefab { get; private set; }
public static GameObject VesselObject { get; private set; } public static GameObject VesselObject { get; private set; }
public static VesselWarpController WarpController { get; private set; } public static VesselWarpController WarpController { get; private set; }
@ -22,8 +21,7 @@ namespace NewHorizons.Handlers
public static void Initialize() public static void Initialize()
{ {
VesselBundle = Instance.ModHelper.Assets.LoadBundle("Assets/newhorizons_private"); VesselPrefab = Main.NHPrivateAssetBundle.LoadAsset<GameObject>("Vessel_Body");
VesselPrefab = VesselBundle.LoadAsset<GameObject>("Vessel_Body");
} }
public static void LoadVessel() public static void LoadVessel()

View File

@ -37,6 +37,7 @@ namespace NewHorizons
public class Main : ModBehaviour public class Main : ModBehaviour
{ {
public static AssetBundle NHAssetBundle { get; private set; } public static AssetBundle NHAssetBundle { get; private set; }
public static AssetBundle NHPrivateAssetBundle { get; private set; }
public static Main Instance { get; private set; } public static Main Instance { get; private set; }
// Settings // Settings
@ -196,6 +197,7 @@ namespace NewHorizons
GlobalMessenger.AddListener("WakeUp", OnWakeUp); GlobalMessenger.AddListener("WakeUp", OnWakeUp);
NHAssetBundle = ModHelper.Assets.LoadBundle("Assets/newhorizons_public"); NHAssetBundle = ModHelper.Assets.LoadBundle("Assets/newhorizons_public");
NHPrivateAssetBundle = ModHelper.Assets.LoadBundle("Assets/newhorizons_private");
VesselWarpHandler.Initialize(); VesselWarpHandler.Initialize();
ResetConfigs(resetTranslation: false); ResetConfigs(resetTranslation: false);