diff --git a/ml_amt/Settings.cs b/ml_amt/Settings.cs index 8d91703..fdf8711 100644 --- a/ml_amt/Settings.cs +++ b/ml_amt/Settings.cs @@ -65,31 +65,31 @@ namespace ml_amt { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnSliderUpdate(string p_name, string p_value) diff --git a/ml_asl/Settings.cs b/ml_asl/Settings.cs index ed3b2cd..3da7a1e 100644 --- a/ml_asl/Settings.cs +++ b/ml_asl/Settings.cs @@ -44,30 +44,30 @@ namespace ml_asl { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnToggleUpdate(string p_name, string p_value) diff --git a/ml_bft/Settings.cs b/ml_bft/Settings.cs index 6f41d7b..84f7ee8 100644 --- a/ml_bft/Settings.cs +++ b/ml_bft/Settings.cs @@ -64,31 +64,31 @@ namespace ml_bft { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnToggleUpdate(string p_name, string p_value) diff --git a/ml_dht/Settings.cs b/ml_dht/Settings.cs index 203b898..31e7f0b 100644 --- a/ml_dht/Settings.cs +++ b/ml_dht/Settings.cs @@ -74,31 +74,31 @@ namespace ml_dht { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnSliderUpdate(string p_name, string p_value) diff --git a/ml_lme/Settings.cs b/ml_lme/Settings.cs index 172ed7d..d8dbedb 100644 --- a/ml_lme/Settings.cs +++ b/ml_lme/Settings.cs @@ -146,32 +146,32 @@ namespace ml_lme { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnToggleUpdate(string p_name, string p_value) diff --git a/ml_pam/Settings.cs b/ml_pam/Settings.cs index 337eed4..fac0dad 100644 --- a/ml_pam/Settings.cs +++ b/ml_pam/Settings.cs @@ -84,33 +84,33 @@ namespace ml_pam { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResources("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResources("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResources("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResources("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnMelonSettingSave_LeftHandKey(object p_oldValue, object p_newValue) diff --git a/ml_pin/Main.cs b/ml_pin/Main.cs index c4c0462..80e134c 100644 --- a/ml_pin/Main.cs +++ b/ml_pin/Main.cs @@ -2,6 +2,7 @@ using ABI_RC.Core.Networking.IO.Social; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; +using ABI_RC.Core.Networking.IO.Instancing; using ABI_RC.Systems.GameEventSystem; using System; using System.Collections; @@ -107,9 +108,9 @@ namespace ml_pin bool ShouldNotifyInCurrentInstance() { - bool l_isInPublic = ((MetaPort.Instance.CurrentInstancePrivacyType == MetaPort.InstancePrivacy.Public) && Settings.NotifyInPublic); - bool l_isInFriends = (((MetaPort.Instance.CurrentInstancePrivacyType == MetaPort.InstancePrivacy.Friends) || (MetaPort.Instance.CurrentInstancePrivacyType == MetaPort.InstancePrivacy.FriendsOfFriends)) && Settings.NotifyInFriends); - bool l_isInPrivate = (((MetaPort.Instance.CurrentInstancePrivacyType == MetaPort.InstancePrivacy.EveryoneCanInvite) || (MetaPort.Instance.CurrentInstancePrivacyType == MetaPort.InstancePrivacy.OwnerMustInvite)) && Settings.NotifyInPrivate); + bool l_isInPublic = ((MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.Public) && Settings.NotifyInPublic); + bool l_isInFriends = (((MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.Friends) || (MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.FriendsOfFriends)) && Settings.NotifyInFriends); + bool l_isInPrivate = (((MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.EveryoneCanInvite) || (MetaPort.Instance.CurrentInstancePrivacyType == Instances.InstancePrivacyType.OwnerMustInvite)) && Settings.NotifyInPrivate); return (l_isInPublic || l_isInFriends || l_isInPrivate); } } diff --git a/ml_pin/Settings.cs b/ml_pin/Settings.cs index c4704e1..052ec0f 100644 --- a/ml_pin/Settings.cs +++ b/ml_pin/Settings.cs @@ -81,32 +81,32 @@ namespace ml_pin { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnToggleUpdate(string p_name, string p_value) diff --git a/ml_ppu/PickUpManager.cs b/ml_ppu/PickUpManager.cs index 158632e..d5c61f8 100644 --- a/ml_ppu/PickUpManager.cs +++ b/ml_ppu/PickUpManager.cs @@ -149,7 +149,7 @@ namespace ml_ppu Vector3 l_armPos = (l_avatarMatInv * m_armLeft.GetMatrix()).GetPosition(); m_collider = new GameObject("[Collider]").AddComponent(); - m_collider.gameObject.layer = CVRLayers.PlayerLocal; + m_collider.gameObject.layer = CVRLayers.PassPlayer; m_collider.transform.parent = this.transform; m_collider.isTrigger = true; m_collider.height = Vector3.Distance(l_hipsPos, new Vector3(0f, l_armPos.y, l_armPos.z)); diff --git a/ml_prm/Main.cs b/ml_prm/Main.cs index ad9280b..361aeb0 100644 --- a/ml_prm/Main.cs +++ b/ml_prm/Main.cs @@ -1,8 +1,4 @@ -using ABI_RC.Core.Player; -using ABI_RC.Core.Util.AssetFiltering; -using System; -using System.Collections.Generic; -using System.Reflection; +using ABI_RC.Core.Util.AssetFiltering; namespace ml_prm { diff --git a/ml_prm/RagdollBodypartHandler.cs b/ml_prm/RagdollBodypartHandler.cs index bd43f99..eeda323 100644 --- a/ml_prm/RagdollBodypartHandler.cs +++ b/ml_prm/RagdollBodypartHandler.cs @@ -203,7 +203,7 @@ namespace ml_prm m_attachedPointer = p_pointer; GameObject l_attachPoint = new GameObject("[AttachPoint]"); - l_attachPoint.layer = CVRLayers.PlayerLocal; + l_attachPoint.layer = CVRLayers.PlayerNetwork; m_attachTransform = l_attachPoint.transform; m_attachTransform.parent = p_pointer.transform; diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index 3751c92..ef52f4b 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -77,7 +77,7 @@ namespace ml_prm void Start() { - this.gameObject.layer = CVRLayers.PlayerLocal; + this.gameObject.layer = CVRLayers.PlayerClone; m_physicsMaterial = new PhysicMaterial("Ragdoll"); m_physicsMaterial.dynamicFriction = c_defaultFriction; @@ -311,7 +311,7 @@ namespace ml_prm BipedRagdollReferences l_avatarReferences = BipedRagdollReferences.FromAvatar(PlayerSetup.Instance.Animator); m_puppetRoot = new GameObject("Root").transform; - m_puppetRoot.gameObject.layer = CVRLayers.PlayerLocal; + m_puppetRoot.gameObject.layer = CVRLayers.PlayerClone; m_puppetRoot.parent = m_puppet; m_puppetRoot.position = m_avatarTransform.position; m_puppetRoot.rotation = m_avatarTransform.rotation; @@ -775,7 +775,7 @@ namespace ml_prm static Transform CloneTransform(Transform p_source, Transform p_parent, string p_name) { Transform l_target = new GameObject(p_name).transform; - l_target.gameObject.layer = CVRLayers.PlayerLocal; + l_target.gameObject.layer = CVRLayers.PlayerClone; l_target.parent = p_parent; p_source.CopyGlobal(l_target); return l_target; diff --git a/ml_vei/Settings.cs b/ml_vei/Settings.cs index 55009e0..9f34729 100644 --- a/ml_vei/Settings.cs +++ b/ml_vei/Settings.cs @@ -60,31 +60,31 @@ namespace ml_vei { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action(OnDropdownUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnToggleUpdate(string p_name, string p_value) diff --git a/ml_vet/Settings.cs b/ml_vet/Settings.cs index 2fdd659..63b680a 100644 --- a/ml_vet/Settings.cs +++ b/ml_vet/Settings.cs @@ -54,31 +54,31 @@ namespace ml_vet { while(ViewManager.Instance == null) yield return null; - while(ViewManager.Instance.gameMenuView == null) + while(ViewManager.Instance.cohtmlView == null) yield return null; - while(ViewManager.Instance.gameMenuView.Listener == null) + while(ViewManager.Instance.cohtmlView.Listener == null) yield return null; - ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => + ViewManager.Instance.cohtmlView.Listener.ReadyForBindings += () => { - ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); - ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action(OnToggleUpdate)); + ViewManager.Instance.cohtmlView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action(OnSliderUpdate)); }; - ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => + ViewManager.Instance.cohtmlView.Listener.FinishLoad += (_) => { - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); - ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); + ViewManager.Instance.cohtmlView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); MelonLoader.MelonCoroutines.Start(UpdateMenuSettings()); }; } static System.Collections.IEnumerator UpdateMenuSettings() { - while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsMainMenuOpen) + while(!ViewManager.Instance.IsReady || !ViewManager.Instance.IsViewShown) yield return null; foreach(var l_entry in ms_entries) - ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); + ViewManager.Instance.cohtmlView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); } static void OnToggleUpdate(string p_name, string p_value)