diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..030cdb8 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*] +charset = utf-8 +end_of_line = crlf +indent_size = 4 +indent_style = space +trim_trailing_whitespace = true + +[*.csproj] +indent_size = 2 +indent_style = space + +[*.props] +indent_size = 2 +indent_style = space diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..c541767 --- /dev/null +++ b/.gitconfig @@ -0,0 +1 @@ +*.{cs,csproj,sln} text=auto eol=crlf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db11af8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.user +.idea +bin +obj diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..bc9616b --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,31 @@ + + + + false + false + false + latest + + $(CVRPATH)/Mods/ + x64 + netstandard2.1 + + + + false + true + embedded + TRACE + x64 + 4 + + + + + + + + + + + diff --git a/README.md b/README.md index 6d23a4f..47e08bc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ Merged set of MelonLoader mods for ChilloutVR. |[Avatar Motion Tweaker](/ml_amt/README.md)|1.5.1 [:arrow_down:](../../releases/latest/download/AvatarMotionTweaker.dll)| |[Avatar Synced Look](/ml_asl/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/AvatarSyncedLook.dll)| |[Better Fingers Tracking](/ml_bft/README.md)|1.1.2 [:arrow_down:](../../releases/latest/download/BetterFingersTracking.dll)| -|[Desktop Head Tracking](/ml_dht/README.md)|1.3.2 [:arrow_down:](../../releases/latest/download/DesktopHeadTracking.dll)| |[Leap Motion Extension](/ml_lme/README.md)| 1.6.1 [:arrow_down:](../../releases/latest/download/LeapMotionExtension.dll)| |[Pickup Arm Movement](/ml_pam/README.md)|1.2.2 [:arrow_down:](../../releases/latest/download/PickupArmMovement.dll)| |[Players Instance Notifier](/ml_pin/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/PlayersInstanceNotifier.dll)| @@ -14,5 +13,4 @@ Merged set of MelonLoader mods for ChilloutVR. |[Player Pick Up](/ml_ppu/README.md)|1.0.0 [:arrow_down:](../../releases/latest/download/PlayerPickUp.dll)| |[Player Ragdoll Mod](/ml_prm/README.md)|1.2.3 [:arrow_down:](../../releases/latest/download/PlayerRagdollMod.dll)| |[Video Player Cookies](/ml_vpc/README.md)|1.0.1 [:arrow_down:](../../releases/latest/download/VideoPlayerCookies.dll)| -|[Vive Eye Tracking](/ml_vet/README.md)|1.0.0 [:arrow_down:](../../releases/latest/download/ViveEyeTracking.dll)| |[Vive Extended Input](/ml_vei/README.md)|1.1.1 [:arrow_down:](../../releases/latest/download/ViveExtendedInput.dll)| diff --git a/References.Items.props b/References.Items.props new file mode 100644 index 0000000..2e1fc9e --- /dev/null +++ b/References.Items.props @@ -0,0 +1,112 @@ + + + + $(CVRPATH)/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Assembly-CSharp.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Cohtml.Runtime.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/ECM2.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Newtonsoft.Json.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/SteamVR.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Unity.Postprocessing.Runtime.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Unity.XR.Hands.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Unity.XR.OpenVR.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/Unity.XR.OpenXR.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.AssetBundleModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.AudioModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.ClothModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.InputLegacyModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.JSONSerializeModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.ParticleSystemModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.PhysicsModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.UnityWebRequestModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.XRModule.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/UnityEngine.dll + False + + + $(CVRPATH)/ChilloutVR_Data/Managed/cohtml.Net.dll + False + + + $(CVRPATH)/MelonLoader/net35/0Harmony.dll + False + + + $(CVRPATH)/MelonLoader/net35/MelonLoader.dll + False + + + $(CVRPATH)/Mods/BTKUILib.dll + False + + + diff --git a/archived/ml_aci/Main.cs b/archived/ml_aci/Main.cs index cc8711a..4415a38 100644 --- a/archived/ml_aci/Main.cs +++ b/archived/ml_aci/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.EventSystem; +using ABI_RC.Core.EventSystem; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Networking; using ABI_RC.Core.Util; diff --git a/archived/ml_aci/Properties/AssemblyInfo.cs b/archived/ml_aci/Properties/AssemblyInfo.cs index fbd14c8..99952f4 100644 --- a/archived/ml_aci/Properties/AssemblyInfo.cs +++ b/archived/ml_aci/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; [assembly: AssemblyTitle("AvatarChangeInfo")] [assembly: AssemblyVersion("1.0.3")] diff --git a/archived/ml_aci/ml_aci.csproj b/archived/ml_aci/ml_aci.csproj index 25e1641..76758a4 100644 --- a/archived/ml_aci/ml_aci.csproj +++ b/archived/ml_aci/ml_aci.csproj @@ -1,6 +1,6 @@ - + - + Debug AnyCPU @@ -15,7 +15,7 @@ true - bin\x64\Debug\ + bin/x64/Debug/ DEBUG;TRACE full x64 @@ -23,7 +23,7 @@ MinimumRecommendedRules.ruleset - bin\x64\Release\ + bin/x64/Release/ TRACE true pdbonly @@ -34,12 +34,12 @@ False - F:\games\Steam\common\ChilloutVR\MelonLoader\0Harmony.dll + F:/games/Steam/common/ChilloutVR/MelonLoader/0Harmony.dll False False - F:\games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + F:/games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp.dll False @@ -47,7 +47,7 @@ False - F:\games\Steam\common\ChilloutVR\MelonLoader\MelonLoader.dll + F:/games/Steam/common/ChilloutVR/MelonLoader/MelonLoader.dll False @@ -64,14 +64,14 @@ - + - + - copy /y "$(TargetPath)" "C:\Games\Steam\common\ChilloutVR\Mods\" + copy /y "$(TargetPath)" "C:/Games/Steam/common/ChilloutVR/Mods/" - \ No newline at end of file + diff --git a/archived/ml_aci/ml_aci.csproj.user b/archived/ml_aci/ml_aci.csproj.user index 2539084..4e07504 100644 --- a/archived/ml_aci/ml_aci.csproj.user +++ b/archived/ml_aci/ml_aci.csproj.user @@ -1,4 +1,4 @@ - + C:\Games\Steam\common\ChilloutVR\MelonLoader\;C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\ diff --git a/ml_dht/.github/img_01.png b/archived/ml_dht/.github/img_01.png similarity index 100% rename from ml_dht/.github/img_01.png rename to archived/ml_dht/.github/img_01.png diff --git a/ml_dht/DataParser.cs b/archived/ml_dht/DataParser.cs similarity index 93% rename from ml_dht/DataParser.cs rename to archived/ml_dht/DataParser.cs index a1844ed..0796212 100644 --- a/ml_dht/DataParser.cs +++ b/archived/ml_dht/DataParser.cs @@ -1,4 +1,4 @@ -namespace ml_dht +namespace ml_dht { class DataParser { diff --git a/ml_dht/GameEvents.cs b/archived/ml_dht/GameEvents.cs similarity index 99% rename from ml_dht/GameEvents.cs rename to archived/ml_dht/GameEvents.cs index 03f2d3d..14465f4 100644 --- a/ml_dht/GameEvents.cs +++ b/archived/ml_dht/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Core.Player.EyeMovement; using ABI_RC.Systems.IK; diff --git a/ml_dht/HeadTracked.cs b/archived/ml_dht/HeadTracked.cs similarity index 97% rename from ml_dht/HeadTracked.cs rename to archived/ml_dht/HeadTracked.cs index 858241d..4ab78fb 100644 --- a/ml_dht/HeadTracked.cs +++ b/archived/ml_dht/HeadTracked.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Core.Player.EyeMovement; using ABI_RC.Systems.FaceTracking; diff --git a/ml_dht/Main.cs b/archived/ml_dht/Main.cs similarity index 100% rename from ml_dht/Main.cs rename to archived/ml_dht/Main.cs diff --git a/ml_dht/MemoryMapReader.cs b/archived/ml_dht/MemoryMapReader.cs similarity index 98% rename from ml_dht/MemoryMapReader.cs rename to archived/ml_dht/MemoryMapReader.cs index 7949072..f009def 100644 --- a/ml_dht/MemoryMapReader.cs +++ b/archived/ml_dht/MemoryMapReader.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using System.IO.MemoryMappedFiles; namespace ml_dht diff --git a/archived/ml_dht/Properties/AssemblyInfo.cs b/archived/ml_dht/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..07cc9e9 --- /dev/null +++ b/archived/ml_dht/Properties/AssemblyInfo.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using ml_dht.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_dht.DesktopHeadTracking))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_dht.DesktopHeadTracking))] + +[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] +[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] +[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_dht.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.3.4"; + public const string Author = "SDraw"; +} diff --git a/ml_dht/README.md b/archived/ml_dht/README.md similarity index 100% rename from ml_dht/README.md rename to archived/ml_dht/README.md diff --git a/ml_dht/ResourcesHandler.cs b/archived/ml_dht/ResourcesHandler.cs similarity index 97% rename from ml_dht/ResourcesHandler.cs rename to archived/ml_dht/ResourcesHandler.cs index 3c9b578..3275109 100644 --- a/ml_dht/ResourcesHandler.cs +++ b/archived/ml_dht/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_dht/Settings.cs b/archived/ml_dht/Settings.cs similarity index 100% rename from ml_dht/Settings.cs rename to archived/ml_dht/Settings.cs diff --git a/ml_dht/TrackingData.cs b/archived/ml_dht/TrackingData.cs similarity index 98% rename from ml_dht/TrackingData.cs rename to archived/ml_dht/TrackingData.cs index 45a881c..2a4dd5d 100644 --- a/ml_dht/TrackingData.cs +++ b/archived/ml_dht/TrackingData.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Runtime.InteropServices; struct TrackingData diff --git a/ml_dht/Utils.cs b/archived/ml_dht/Utils.cs similarity index 95% rename from ml_dht/Utils.cs rename to archived/ml_dht/Utils.cs index 1b5331b..902614a 100644 --- a/ml_dht/Utils.cs +++ b/archived/ml_dht/Utils.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Savior; using ABI_RC.Core.UI; using System.Reflection; diff --git a/archived/ml_dht/ml_dht.csproj b/archived/ml_dht/ml_dht.csproj new file mode 100644 index 0000000..e148b1d --- /dev/null +++ b/archived/ml_dht/ml_dht.csproj @@ -0,0 +1,22 @@ + + + + DesktopHeadTracking + DesktopHeadTracking + DesktopHeadTracking + + + + + + + + + + + + + + + + diff --git a/ml_dht/resources/mod_menu.js b/archived/ml_dht/resources/mod_menu.js similarity index 99% rename from ml_dht/resources/mod_menu.js rename to archived/ml_dht/resources/mod_menu.js index e52b0ff..d72aeeb 100644 --- a/ml_dht/resources/mod_menu.js +++ b/archived/ml_dht/resources/mod_menu.js @@ -1,4 +1,4 @@ -// Add own menu +// Add own menu { let l_block = document.createElement('div'); l_block.innerHTML = ` diff --git a/archived/ml_drs/Main.cs b/archived/ml_drs/Main.cs index 8af1eb9..9345985 100644 --- a/archived/ml_drs/Main.cs +++ b/archived/ml_drs/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.UI; +using ABI_RC.Core.UI; using UnityEngine; namespace ml_drs diff --git a/archived/ml_drs/Properties/AssemblyInfo.cs b/archived/ml_drs/Properties/AssemblyInfo.cs index 627e372..5125c6e 100644 --- a/archived/ml_drs/Properties/AssemblyInfo.cs +++ b/archived/ml_drs/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_drs.DesktopReticleSwitch), "DesktopReticleSwitch", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_drs.DesktopReticleSwitch), "DesktopReticleSwitch", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/archived/ml_drs/ml_drs.csproj b/archived/ml_drs/ml_drs.csproj index c03bfc6..5b8b988 100644 --- a/archived/ml_drs/ml_drs.csproj +++ b/archived/ml_drs/ml_drs.csproj @@ -21,29 +21,29 @@ - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/cohtml.Net.dll false - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll + D:/Games/Steam/steamapps/common/ChilloutVR/MelonLoader/net35/MelonLoader.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/UnityEngine.InputLegacyModule.dll false - + diff --git a/archived/ml_egn/Main.cs b/archived/ml_egn/Main.cs index 90d54a2..99a27c0 100644 --- a/archived/ml_egn/Main.cs +++ b/archived/ml_egn/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.EventSystem; +using ABI_RC.Core.EventSystem; using ABI_RC.Core.IO; using ABI_RC.Core.Networking; using ABI_RC.Core.Util; diff --git a/archived/ml_egn/Properties/AssemblyInfo.cs b/archived/ml_egn/Properties/AssemblyInfo.cs index 5b1b103..7f999b6 100644 --- a/archived/ml_egn/Properties/AssemblyInfo.cs +++ b/archived/ml_egn/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_egn.ExtendedGameNotifications), "ExtendedGameNotifications", "1.0.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_egn.ExtendedGameNotifications), "ExtendedGameNotifications", "1.0.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/archived/ml_egn/Utils.cs b/archived/ml_egn/Utils.cs index 319e7ac..cc9ed57 100644 --- a/archived/ml_egn/Utils.cs +++ b/archived/ml_egn/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Networking; using ABI_RC.Core.Savior; using ABI_RC.Core.UI; diff --git a/archived/ml_egn/ml_egn.csproj b/archived/ml_egn/ml_egn.csproj index f819e1d..c009309 100644 --- a/archived/ml_egn/ml_egn.csproj +++ b/archived/ml_egn/ml_egn.csproj @@ -21,35 +21,35 @@ - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll + D:/Games/Steam/steamapps/common/ChilloutVR/MelonLoader/net35/0Harmony.dll - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/cohtml.Net.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\DarkRift.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/DarkRift.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\DarkRift.Client.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/DarkRift.Client.dll false - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll + D:/Games/Steam/steamapps/common/ChilloutVR/MelonLoader/net35/MelonLoader.dll - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll false - + diff --git a/archived/ml_fpt/Main.cs b/archived/ml_fpt/Main.cs index f748e3a..84e8bed 100644 --- a/archived/ml_fpt/Main.cs +++ b/archived/ml_fpt/Main.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Scripts; +using ABI.CCK.Scripts; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; diff --git a/archived/ml_fpt/Properties/AssemblyInfo.cs b/archived/ml_fpt/Properties/AssemblyInfo.cs index 388da0e..9602b02 100644 --- a/archived/ml_fpt/Properties/AssemblyInfo.cs +++ b/archived/ml_fpt/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; [assembly: AssemblyTitle("FourPointTracking")] [assembly: AssemblyVersion("1.0.9")] diff --git a/archived/ml_fpt/Scripts.cs b/archived/ml_fpt/Scripts.cs index a0b5f81..6bf556c 100644 --- a/archived/ml_fpt/Scripts.cs +++ b/archived/ml_fpt/Scripts.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/archived/ml_fpt/ml_fpt.csproj b/archived/ml_fpt/ml_fpt.csproj index 77ebda4..484cee5 100644 --- a/archived/ml_fpt/ml_fpt.csproj +++ b/archived/ml_fpt/ml_fpt.csproj @@ -1,6 +1,6 @@ - + - + Debug AnyCPU @@ -18,7 +18,7 @@ true - bin\x64\Debug\ + bin/x64/Debug/ DEBUG;TRACE full x64 @@ -26,7 +26,7 @@ MinimumRecommendedRules.ruleset - bin\x64\Release\ + bin/x64/Release/ TRACE true pdbonly @@ -39,24 +39,24 @@ False - C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + C:/Games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp.dll False False - C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll + C:/Games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp-firstpass.dll False - C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll + C:/Games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/cohtml.Net.dll False - C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll + C:/Games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/Cohtml.Runtime.dll False - C:\Games\Steam\common\ChilloutVR\MelonLoader\MelonLoader.dll + C:/Games/Steam/common/ChilloutVR/MelonLoader/MelonLoader.dll False @@ -75,14 +75,14 @@ - + - + - + - copy /y "$(TargetPath)" "C:\Games\Steam\common\ChilloutVR\Mods\ + copy /y "$(TargetPath)" "C:/Games/Steam/common/ChilloutVR/Mods/ - \ No newline at end of file + diff --git a/archived/ml_fpt/ml_fpt.csproj.user b/archived/ml_fpt/ml_fpt.csproj.user index 2539084..4e07504 100644 --- a/archived/ml_fpt/ml_fpt.csproj.user +++ b/archived/ml_fpt/ml_fpt.csproj.user @@ -1,4 +1,4 @@ - + C:\Games\Steam\common\ChilloutVR\MelonLoader\;C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\ diff --git a/archived/ml_fpt/resources/menu.js b/archived/ml_fpt/resources/menu.js index ee02114..e460691 100644 --- a/archived/ml_fpt/resources/menu.js +++ b/archived/ml_fpt/resources/menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/archived/ml_gmf/Fixes/AnimationOverrides.cs b/archived/ml_gmf/Fixes/AnimationOverrides.cs index 925ff4d..3e65f9b 100644 --- a/archived/ml_gmf/Fixes/AnimationOverrides.cs +++ b/archived/ml_gmf/Fixes/AnimationOverrides.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core; +using ABI_RC.Core; using System; using System.Reflection; diff --git a/archived/ml_gmf/Fixes/AvatarOverrides.cs b/archived/ml_gmf/Fixes/AvatarOverrides.cs index cadb73b..04daa0e 100644 --- a/archived/ml_gmf/Fixes/AvatarOverrides.cs +++ b/archived/ml_gmf/Fixes/AvatarOverrides.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using System; using System.Reflection; diff --git a/archived/ml_gmf/Fixes/PostProccesVolumes.cs b/archived/ml_gmf/Fixes/PostProccesVolumes.cs index 93fa38e..1f4c102 100644 --- a/archived/ml_gmf/Fixes/PostProccesVolumes.cs +++ b/archived/ml_gmf/Fixes/PostProccesVolumes.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using System.Collections; namespace ml_gmf.Fixes diff --git a/archived/ml_gmf/Fixes/ViveControls.cs b/archived/ml_gmf/Fixes/ViveControls.cs index f4b229c..1ec1b39 100644 --- a/archived/ml_gmf/Fixes/ViveControls.cs +++ b/archived/ml_gmf/Fixes/ViveControls.cs @@ -1,4 +1,4 @@ -using ABI_RC.Systems.InputManagement; +using ABI_RC.Systems.InputManagement; using ABI_RC.Systems.InputManagement.XR; using System; using System.Reflection; diff --git a/archived/ml_gmf/Main.cs b/archived/ml_gmf/Main.cs index 4826a2c..a89b1c2 100644 --- a/archived/ml_gmf/Main.cs +++ b/archived/ml_gmf/Main.cs @@ -1,4 +1,4 @@ -namespace ml_gmf +namespace ml_gmf { public class GameMainFixes : MelonLoader.MelonMod { diff --git a/archived/ml_gmf/Properties/AssemblyInfo.cs b/archived/ml_gmf/Properties/AssemblyInfo.cs index 9fa7d85..c999bc2 100644 --- a/archived/ml_gmf/Properties/AssemblyInfo.cs +++ b/archived/ml_gmf/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_gmf.GameMainFixes), "GameMainFixes", "1.0.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_gmf.GameMainFixes), "GameMainFixes", "1.0.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/archived/ml_gmf/ml_gmf.csproj b/archived/ml_gmf/ml_gmf.csproj index e073452..61520fe 100644 --- a/archived/ml_gmf/ml_gmf.csproj +++ b/archived/ml_gmf/ml_gmf.csproj @@ -16,37 +16,37 @@ - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll + D:/games/Steam/steamapps/common/ChilloutVR/MelonLoader/net35/0Harmony.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp.dll false - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll + D:/games/Steam/steamapps/common/ChilloutVR/MelonLoader/net35/MelonLoader.dll false - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.Postprocessing.Runtime.dll + D:/Games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/Unity.Postprocessing.Runtime.dll false - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll + D:/games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/UnityEngine.dll false - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll + D:/Games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/UnityEngine.AnimationModule.dll false - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll + D:/Games/Steam/steamapps/common/ChilloutVR/ChilloutVR_Data/Managed/UnityEngine.CoreModule.dll false - + diff --git a/archived/ml_sci/Main.cs b/archived/ml_sci/Main.cs index 7aa4468..d213ef8 100644 --- a/archived/ml_sci/Main.cs +++ b/archived/ml_sci/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.UI; +using ABI_RC.Core.UI; using DarkRift.Client; using System.Reflection; diff --git a/archived/ml_sci/Properties/AssemblyInfo.cs b/archived/ml_sci/Properties/AssemblyInfo.cs index c15c663..86401e4 100644 --- a/archived/ml_sci/Properties/AssemblyInfo.cs +++ b/archived/ml_sci/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; [assembly: AssemblyTitle("ServerConnectionInfo")] [assembly: AssemblyVersion("1.0.2")] diff --git a/archived/ml_sci/ml_sci.csproj b/archived/ml_sci/ml_sci.csproj index 1e71c50..8ac0cad 100644 --- a/archived/ml_sci/ml_sci.csproj +++ b/archived/ml_sci/ml_sci.csproj @@ -1,6 +1,6 @@ - + - + Debug AnyCPU @@ -15,7 +15,7 @@ true - bin\x64\Debug\ + bin/x64/Debug/ DEBUG;TRACE full x64 @@ -23,7 +23,7 @@ MinimumRecommendedRules.ruleset - bin\x64\Release\ + bin/x64/Release/ TRACE true pdbonly @@ -34,22 +34,22 @@ False - F:\games\Steam\common\ChilloutVR\MelonLoader\0Harmony.dll + F:/games/Steam/common/ChilloutVR/MelonLoader/0Harmony.dll False False - F:\games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll + F:/games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/Assembly-CSharp.dll False False - C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\DarkRift.Client.dll + C:/Games/Steam/common/ChilloutVR/ChilloutVR_Data/Managed/DarkRift.Client.dll False False - F:\games\Steam\common\ChilloutVR\MelonLoader\MelonLoader.dll + F:/games/Steam/common/ChilloutVR/MelonLoader/MelonLoader.dll False @@ -66,14 +66,14 @@ - + - + - copy /y "$(TargetPath)" "C:\Games\Steam\common\ChilloutVR\Mods\" + copy /y "$(TargetPath)" "C:/Games/Steam/common/ChilloutVR/Mods/" - \ No newline at end of file + diff --git a/archived/ml_sci/ml_sci.csproj.user b/archived/ml_sci/ml_sci.csproj.user index 2539084..4e07504 100644 --- a/archived/ml_sci/ml_sci.csproj.user +++ b/archived/ml_sci/ml_sci.csproj.user @@ -1,4 +1,4 @@ - + C:\Games\Steam\common\ChilloutVR\MelonLoader\;C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\ diff --git a/ml_vet/Main.cs b/archived/ml_vet/Main.cs similarity index 99% rename from ml_vet/Main.cs rename to archived/ml_vet/Main.cs index 6ba63aa..742cc49 100644 --- a/ml_vet/Main.cs +++ b/archived/ml_vet/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core; +using ABI_RC.Core; using ABI_RC.Core.Player; using ABI_RC.Core.Player.EyeMovement; using ABI_RC.Core.Savior; diff --git a/archived/ml_vet/Properties/AssemblyInfo.cs b/archived/ml_vet/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..5441d1e --- /dev/null +++ b/archived/ml_vet/Properties/AssemblyInfo.cs @@ -0,0 +1,26 @@ +using System.Reflection; +using ml_vet.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_vet.ViveEyeTracking))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_vet.ViveEyeTracking))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_vet.ViveEyeTracking), + nameof(ml_vet.ViveEyeTracking), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] +[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] +[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] +[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_vet.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.0.2"; + public const string Author = "SDraw"; +} diff --git a/ml_vet/README.md b/archived/ml_vet/README.md similarity index 100% rename from ml_vet/README.md rename to archived/ml_vet/README.md diff --git a/ml_vet/ResourcesHandler.cs b/archived/ml_vet/ResourcesHandler.cs similarity index 97% rename from ml_vet/ResourcesHandler.cs rename to archived/ml_vet/ResourcesHandler.cs index 9651d2e..d7bc951 100644 --- a/ml_vet/ResourcesHandler.cs +++ b/archived/ml_vet/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_vet/Settings.cs b/archived/ml_vet/Settings.cs similarity index 99% rename from ml_vet/Settings.cs rename to archived/ml_vet/Settings.cs index 63b680a..21140b2 100644 --- a/ml_vet/Settings.cs +++ b/archived/ml_vet/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; diff --git a/ml_vet/Utils.cs b/archived/ml_vet/Utils.cs similarity index 94% rename from ml_vet/Utils.cs rename to archived/ml_vet/Utils.cs index 63e658c..7c6cc29 100644 --- a/ml_vet/Utils.cs +++ b/archived/ml_vet/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Savior; +using ABI_RC.Core.Savior; using ABI_RC.Core.UI; using System.Reflection; diff --git a/archived/ml_vet/ml_vet.csproj b/archived/ml_vet/ml_vet.csproj new file mode 100644 index 0000000..1839253 --- /dev/null +++ b/archived/ml_vet/ml_vet.csproj @@ -0,0 +1,18 @@ + + + + ViveEyeTracking + ViveEyeTracking + ViveEyeTracking + + + + + + + + + + + + diff --git a/ml_vet/resources/mod_menu.js b/archived/ml_vet/resources/mod_menu.js similarity index 99% rename from ml_vet/resources/mod_menu.js rename to archived/ml_vet/resources/mod_menu.js index b845796..156ef3b 100644 --- a/ml_vet/resources/mod_menu.js +++ b/archived/ml_vet/resources/mod_menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/js/mods_extension.js b/js/mods_extension.js index 20323d9..62b0c04 100644 --- a/js/mods_extension.js +++ b/js/mods_extension.js @@ -1,4 +1,4 @@ -if (typeof modsExtension === 'undefined') { +if (typeof modsExtension === 'undefined') { window.modsExtension = [] // UI elements, modified from original `inp` types, because I have no js knowledge to hook stuff diff --git a/ml_amt/AvatarParameter.cs b/ml_amt/AvatarParameter.cs index 10c83a3..9f02c35 100644 --- a/ml_amt/AvatarParameter.cs +++ b/ml_amt/AvatarParameter.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Util.AnimatorManager; +using ABI_RC.Core.Util.AnimatorManager; using System.Text.RegularExpressions; using UnityEngine; diff --git a/ml_amt/GameEvents.cs b/ml_amt/GameEvents.cs index 8400096..d849466 100644 --- a/ml_amt/GameEvents.cs +++ b/ml_amt/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using ABI_RC.Systems.IK; using System; using System.Reflection; diff --git a/ml_amt/Main.cs b/ml_amt/Main.cs index 050d5a0..8398db4 100644 --- a/ml_amt/Main.cs +++ b/ml_amt/Main.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using UnityEngine; namespace ml_amt diff --git a/ml_amt/MotionTweaker.cs b/ml_amt/MotionTweaker.cs index e81097f..032ec86 100644 --- a/ml_amt/MotionTweaker.cs +++ b/ml_amt/MotionTweaker.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Core.Util.AnimatorManager; using ABI_RC.Systems.GameEventSystem; diff --git a/ml_amt/Properties/AssemblyInfo.cs b/ml_amt/Properties/AssemblyInfo.cs index 003591e..d6e5be4 100644 --- a/ml_amt/Properties/AssemblyInfo.cs +++ b/ml_amt/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.5.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_amt.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_amt.AvatarMotionTweaker))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_amt.AvatarMotionTweaker))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_amt.AvatarMotionTweaker), + nameof(ml_amt.AvatarMotionTweaker), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_amt.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.5.2"; + public const string Author = "SDraw"; +} diff --git a/ml_amt/ResourcesHandler.cs b/ml_amt/ResourcesHandler.cs index 214cead..09e1720 100644 --- a/ml_amt/ResourcesHandler.cs +++ b/ml_amt/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_amt/Settings.cs b/ml_amt/Settings.cs index fdf8711..94bfd61 100644 --- a/ml_amt/Settings.cs +++ b/ml_amt/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; diff --git a/ml_amt/Utils.cs b/ml_amt/Utils.cs index 6cd79d3..66f162f 100644 --- a/ml_amt/Utils.cs +++ b/ml_amt/Utils.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Core.UI; diff --git a/ml_amt/ml_amt.csproj b/ml_amt/ml_amt.csproj index 3620a45..0d3933b 100644 --- a/ml_amt/ml_amt.csproj +++ b/ml_amt/ml_amt.csproj @@ -1,23 +1,9 @@ - + - netstandard2.1 - SDraw - SDraw - AvatarMotionTweaker - AvatarMotionTweaker - 1.5.2 - x64 AvatarMotionTweaker - - - - x64 - 4 - embedded - true - false - TRACE + AvatarMotionTweaker + AvatarMotionTweaker @@ -26,77 +12,15 @@ - + - + - + - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll - false - false - - - - - - - diff --git a/ml_amt/resources/mod_menu.js b/ml_amt/resources/mod_menu.js index 4bc73ed..1776185 100644 --- a/ml_amt/resources/mod_menu.js +++ b/ml_amt/resources/mod_menu.js @@ -1,4 +1,4 @@ -// Add own menu +// Add own menu { let l_block = document.createElement('div'); l_block.innerHTML = ` diff --git a/ml_asl/Main.cs b/ml_asl/Main.cs index 4ff6362..75f5c06 100644 --- a/ml_asl/Main.cs +++ b/ml_asl/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using System.Reflection; using UnityEngine; diff --git a/ml_asl/Properties/AssemblyInfo.cs b/ml_asl/Properties/AssemblyInfo.cs index 578b743..84c7960 100644 --- a/ml_asl/Properties/AssemblyInfo.cs +++ b/ml_asl/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_asl.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_asl.AvatarSyncedLook))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_asl.AvatarSyncedLook))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_asl.AvatarSyncedLook), + nameof(ml_asl.AvatarSyncedLook), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_asl.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.1.2"; + public const string Author = "SDraw"; +} diff --git a/ml_asl/ResourcesHandler.cs b/ml_asl/ResourcesHandler.cs index e73c290..fc75294 100644 --- a/ml_asl/ResourcesHandler.cs +++ b/ml_asl/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_asl/Settings.cs b/ml_asl/Settings.cs index 3da7a1e..36424e4 100644 --- a/ml_asl/Settings.cs +++ b/ml_asl/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; diff --git a/ml_asl/Utils.cs b/ml_asl/Utils.cs index f858218..526c89c 100644 --- a/ml_asl/Utils.cs +++ b/ml_asl/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.UI; +using ABI_RC.Core.UI; using System.Reflection; using UnityEngine; diff --git a/ml_asl/ml_asl.csproj b/ml_asl/ml_asl.csproj index 60a81eb..e0cc6fe 100644 --- a/ml_asl/ml_asl.csproj +++ b/ml_asl/ml_asl.csproj @@ -1,75 +1,18 @@ - netstandard2.1 - x64 - AvatarSyncedLook - SDraw - SDraw - AvatarSyncedLook - 1.1.2 AvatarSyncedLook - - - - embedded - true + AvatarSyncedLook + AvatarSyncedLook - + - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - + + - - - - - - - - - diff --git a/ml_asl/resources/mod_menu.js b/ml_asl/resources/mod_menu.js index edcb0c3..2634537 100644 --- a/ml_asl/resources/mod_menu.js +++ b/ml_asl/resources/mod_menu.js @@ -1,4 +1,4 @@ -// Add own menu +// Add own menu { let l_block = document.createElement('div'); l_block.innerHTML = ` diff --git a/ml_bft/AssetsHandler.cs b/ml_bft/AssetsHandler.cs index 3473fd1..17c457e 100644 --- a/ml_bft/AssetsHandler.cs +++ b/ml_bft/AssetsHandler.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Reflection; using UnityEngine; diff --git a/ml_bft/FingerSystem.cs b/ml_bft/FingerSystem.cs index f7286d9..cb7067d 100644 --- a/ml_bft/FingerSystem.cs +++ b/ml_bft/FingerSystem.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Systems.GameEventSystem; diff --git a/ml_bft/GameEvents.cs b/ml_bft/GameEvents.cs index 0b3d7a6..018e5de 100644 --- a/ml_bft/GameEvents.cs +++ b/ml_bft/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using ABI_RC.Systems.IK; using ABI_RC.Systems.InputManagement; using System; diff --git a/ml_bft/HandHandlerVR.cs b/ml_bft/HandHandlerVR.cs index ec01650..7dfc21c 100644 --- a/ml_bft/HandHandlerVR.cs +++ b/ml_bft/HandHandlerVR.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; using Valve.VR; diff --git a/ml_bft/InputHandler.cs b/ml_bft/InputHandler.cs index c0910d4..4ff35b0 100644 --- a/ml_bft/InputHandler.cs +++ b/ml_bft/InputHandler.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Savior; +using ABI_RC.Core.Savior; using ABI_RC.Systems.InputManagement; using ABI_RC.Systems.VRModeSwitch; using UnityEngine; diff --git a/ml_bft/Main.cs b/ml_bft/Main.cs index 8d64294..4c51e49 100644 --- a/ml_bft/Main.cs +++ b/ml_bft/Main.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; namespace ml_bft { diff --git a/ml_bft/Properties/AssemblyInfo.cs b/ml_bft/Properties/AssemblyInfo.cs index 3a8006f..b209c0c 100644 --- a/ml_bft/Properties/AssemblyInfo.cs +++ b/ml_bft/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.1.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_bft.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_bft.BetterFingersTracking))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_bft.BetterFingersTracking))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_bft.BetterFingersTracking), + nameof(ml_bft.BetterFingersTracking), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_bft.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.1.3"; + public const string Author = "SDraw"; +} diff --git a/ml_bft/ResourcesHandler.cs b/ml_bft/ResourcesHandler.cs index 82c08c2..c623ee8 100644 --- a/ml_bft/ResourcesHandler.cs +++ b/ml_bft/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_bft/Settings.cs b/ml_bft/Settings.cs index 84f7ee8..a29df5e 100644 --- a/ml_bft/Settings.cs +++ b/ml_bft/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; diff --git a/ml_bft/Utils.cs b/ml_bft/Utils.cs index cfdbfd7..7e900b2 100644 --- a/ml_bft/Utils.cs +++ b/ml_bft/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Core.UI; using ABI_RC.Systems.IK; diff --git a/ml_bft/ml_bft.csproj b/ml_bft/ml_bft.csproj index d18e2e3..3cb7a8c 100644 --- a/ml_bft/ml_bft.csproj +++ b/ml_bft/ml_bft.csproj @@ -1,100 +1,18 @@ - netstandard2.1 - x64 - BetterFingersTracking - SDraw - SDraw - BetterFingersTracking - 1.1.3 BetterFingersTracking - - - - embedded - true + BetterFingersTracking + BetterFingersTracking - - + + - + - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\SteamVR.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.XR.Hands.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.XR.OpenVR.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.XR.OpenXR.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll - false - false - - - - - - - diff --git a/ml_bft/resources/mod_menu.js b/ml_bft/resources/mod_menu.js index e682f83..f022e28 100644 --- a/ml_bft/resources/mod_menu.js +++ b/ml_bft/resources/mod_menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/ml_dht/Properties/AssemblyInfo.cs b/ml_dht/Properties/AssemblyInfo.cs deleted file mode 100644 index 9013c5f..0000000 --- a/ml_dht/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.3.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] -[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] -[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] -[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] \ No newline at end of file diff --git a/ml_dht/ml_dht.csproj b/ml_dht/ml_dht.csproj deleted file mode 100644 index 14161da..0000000 --- a/ml_dht/ml_dht.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - netstandard2.1 - DesktopHeadTracking - SDraw - SDraw - DesktopHeadTracking - 1.3.4 - x64 - DesktopHeadTracking - - - - x64 - embedded - true - - - - - - - - - - - - - - - - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - - - - - - diff --git a/ml_lme/AssetsHandler.cs b/ml_lme/AssetsHandler.cs index 36c3ebf..7e19946 100644 --- a/ml_lme/AssetsHandler.cs +++ b/ml_lme/AssetsHandler.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; using System.Reflection; using UnityEngine; diff --git a/ml_lme/DependenciesHandler.cs b/ml_lme/DependenciesHandler.cs index 3dbc8da..798e33b 100644 --- a/ml_lme/DependenciesHandler.cs +++ b/ml_lme/DependenciesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Reflection; diff --git a/ml_lme/GameEvents.cs b/ml_lme/GameEvents.cs index 281b9eb..a4292fa 100644 --- a/ml_lme/GameEvents.cs +++ b/ml_lme/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Systems.IK; using System; diff --git a/ml_lme/LeapHand.cs b/ml_lme/LeapHand.cs index e6d6f65..737cde6 100644 --- a/ml_lme/LeapHand.cs +++ b/ml_lme/LeapHand.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; namespace ml_lme { diff --git a/ml_lme/LeapInput.cs b/ml_lme/LeapInput.cs index 2273bb2..d760245 100644 --- a/ml_lme/LeapInput.cs +++ b/ml_lme/LeapInput.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; diff --git a/ml_lme/LeapManager.cs b/ml_lme/LeapManager.cs index 9512396..11c674b 100644 --- a/ml_lme/LeapManager.cs +++ b/ml_lme/LeapManager.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using ABI_RC.Systems.InputManagement; using System.Collections; using UnityEngine; diff --git a/ml_lme/LeapParser.cs b/ml_lme/LeapParser.cs index 847ee64..41497e1 100644 --- a/ml_lme/LeapParser.cs +++ b/ml_lme/LeapParser.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; namespace ml_lme { diff --git a/ml_lme/LeapTracked.cs b/ml_lme/LeapTracked.cs index 211fc4c..22062d2 100644 --- a/ml_lme/LeapTracked.cs +++ b/ml_lme/LeapTracked.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Systems.GameEventSystem; using ABI_RC.Systems.IK; diff --git a/ml_lme/LeapTracking.cs b/ml_lme/LeapTracking.cs index 8b4aba6..9c62dc1 100644 --- a/ml_lme/LeapTracking.cs +++ b/ml_lme/LeapTracking.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using UnityEngine; namespace ml_lme diff --git a/ml_lme/Main.cs b/ml_lme/Main.cs index 44ad503..cf391f9 100644 --- a/ml_lme/Main.cs +++ b/ml_lme/Main.cs @@ -1,4 +1,4 @@ -using System.Collections; +using System.Collections; using UnityEngine; namespace ml_lme diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs index de7fe58..5eda24e 100644 --- a/ml_lme/Properties/AssemblyInfo.cs +++ b/ml_lme/Properties/AssemblyInfo.cs @@ -1,5 +1,27 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_lme.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_lme.LeapMotionExtension))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_lme.LeapMotionExtension))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_lme.LeapMotionExtension), + nameof(ml_lme.LeapMotionExtension), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] [assembly: MelonLoader.MelonAdditionalCredits("NotAKidOnSteam")] + +namespace ml_lme.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.6.2"; + public const string Author = "SDraw"; +} diff --git a/ml_lme/ResourcesHandler.cs b/ml_lme/ResourcesHandler.cs index ad24e11..cc11b2f 100644 --- a/ml_lme/ResourcesHandler.cs +++ b/ml_lme/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_lme/Settings.cs b/ml_lme/Settings.cs index d8dbedb..2d9666a 100644 --- a/ml_lme/Settings.cs +++ b/ml_lme/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; using UnityEngine; diff --git a/ml_lme/Utils.cs b/ml_lme/Utils.cs index e653fde..689ac7e 100644 --- a/ml_lme/Utils.cs +++ b/ml_lme/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Core.UI; diff --git a/ml_lme/ml_lme.csproj b/ml_lme/ml_lme.csproj index e59b929..c9dd7b5 100644 --- a/ml_lme/ml_lme.csproj +++ b/ml_lme/ml_lme.csproj @@ -1,116 +1,39 @@ - netstandard2.1 - x64 - LeapMotionExtension - 1.6.2 - SDraw - SDraw - LeapMotionExtension LeapMotionExtension - - - - embedded - true + LeapMotionExtension + LeapMotionExtension - - - + + + - - - + + + - + - - - - + + + + resources/LeapC.dll - + - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.JSONSerializeModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll - false - false - - - - - - - - - + - - - + + + diff --git a/ml_lme/resources/mod_menu.js b/ml_lme/resources/mod_menu.js index 96a11f0..0a8f040 100644 --- a/ml_lme/resources/mod_menu.js +++ b/ml_lme/resources/mod_menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/ml_mods_cvr.sln b/ml_mods_cvr.sln index df44b4a..6e8eb6f 100644 --- a/ml_mods_cvr.sln +++ b/ml_mods_cvr.sln @@ -1,38 +1,31 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.33214.272 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_amt", "ml_amt\ml_amt.csproj", "{714806A3-E6FC-46F6-9D1D-89C77FEBAF06}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_amt", "ml_amt/ml_amt.csproj", "{714806A3-E6FC-46F6-9D1D-89C77FEBAF06}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_lme", "ml_lme\ml_lme.csproj", "{77EA76B1-3709-4FC5-BDBD-8F77160E6DA3}" - ProjectSection(ProjectDependencies) = postProject - {118675AA-9AC7-4B0C-BFB1-FA1691619502} = {118675AA-9AC7-4B0C-BFB1-FA1691619502} - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_lme", "ml_lme/ml_lme.csproj", "{77EA76B1-3709-4FC5-BDBD-8F77160E6DA3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pam", "ml_pam\ml_pam.csproj", "{5B614459-234A-443D-B06D-34FF81ADA67E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pam", "ml_pam/ml_pam.csproj", "{5B614459-234A-443D-B06D-34FF81ADA67E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pmc", "ml_pmc\ml_pmc.csproj", "{118675AA-9AC7-4B0C-BFB1-FA1691619502}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pmc", "ml_pmc/ml_pmc.csproj", "{118675AA-9AC7-4B0C-BFB1-FA1691619502}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vei", "ml_vei\ml_vei.csproj", "{608CDBD6-8E29-43B7-BCBF-7E3967430A24}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vei", "ml_vei/ml_vei.csproj", "{608CDBD6-8E29-43B7-BCBF-7E3967430A24}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_prm", "ml_prm\ml_prm.csproj", "{C4C3F080-379F-49DB-ADC6-6328BE884AE3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_prm", "ml_prm/ml_prm.csproj", "{C4C3F080-379F-49DB-ADC6-6328BE884AE3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_asl", "ml_asl\ml_asl.csproj", "{5B4EC6EF-541A-47D2-B602-915205590553}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_asl", "ml_asl/ml_asl.csproj", "{5B4EC6EF-541A-47D2-B602-915205590553}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pin", "ml_pin\ml_pin.csproj", "{7E493C28-7202-46F8-9789-D6C6FF7E5241}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_pin", "ml_pin/ml_pin.csproj", "{7E493C28-7202-46F8-9789-D6C6FF7E5241}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_dht", "ml_dht\ml_dht.csproj", "{31987392-989C-40C1-A48B-7F6099816EBE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_bft", "ml_bft/ml_bft.csproj", "{331C995D-9648-44AD-8B02-D5F3A89FDC1F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_bft", "ml_bft\ml_bft.csproj", "{331C995D-9648-44AD-8B02-D5F3A89FDC1F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vpc", "ml_vpc/ml_vpc.csproj", "{7CF37B93-9341-422D-845C-9AB96DB4D0A1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vpc", "ml_vpc\ml_vpc.csproj", "{7CF37B93-9341-422D-845C-9AB96DB4D0A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_ppu", "ml_ppu/ml_ppu.csproj", "{F16DF16B-D127-4A2A-81FF-2FD80F320E64}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_ppu", "ml_ppu\ml_ppu.csproj", "{F16DF16B-D127-4A2A-81FF-2FD80F320E64}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ml_vet", "ml_vet\ml_vet.csproj", "{8DB32590-FC5B-46A8-9747-344E86B18ACF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ml_pah", "ml_pah\ml_pah.csproj", "{C4659F60-3FED-4F43-88E4-969907D4C7A6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ml_pah", "ml_pah/ml_pah.csproj", "{C4659F60-3FED-4F43-88E4-969907D4C7A6}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -66,10 +59,6 @@ Global {7E493C28-7202-46F8-9789-D6C6FF7E5241}.Debug|x64.ActiveCfg = Debug|x64 {7E493C28-7202-46F8-9789-D6C6FF7E5241}.Release|x64.ActiveCfg = Release|x64 {7E493C28-7202-46F8-9789-D6C6FF7E5241}.Release|x64.Build.0 = Release|x64 - {31987392-989C-40C1-A48B-7F6099816EBE}.Debug|x64.ActiveCfg = Debug|x64 - {31987392-989C-40C1-A48B-7F6099816EBE}.Debug|x64.Build.0 = Debug|x64 - {31987392-989C-40C1-A48B-7F6099816EBE}.Release|x64.ActiveCfg = Release|x64 - {31987392-989C-40C1-A48B-7F6099816EBE}.Release|x64.Build.0 = Release|x64 {331C995D-9648-44AD-8B02-D5F3A89FDC1F}.Debug|x64.ActiveCfg = Debug|x64 {331C995D-9648-44AD-8B02-D5F3A89FDC1F}.Release|x64.ActiveCfg = Release|x64 {331C995D-9648-44AD-8B02-D5F3A89FDC1F}.Release|x64.Build.0 = Release|x64 @@ -81,10 +70,6 @@ Global {F16DF16B-D127-4A2A-81FF-2FD80F320E64}.Debug|x64.Build.0 = Debug|x64 {F16DF16B-D127-4A2A-81FF-2FD80F320E64}.Release|x64.ActiveCfg = Release|x64 {F16DF16B-D127-4A2A-81FF-2FD80F320E64}.Release|x64.Build.0 = Release|x64 - {8DB32590-FC5B-46A8-9747-344E86B18ACF}.Debug|x64.ActiveCfg = Debug|x64 - {8DB32590-FC5B-46A8-9747-344E86B18ACF}.Debug|x64.Build.0 = Debug|x64 - {8DB32590-FC5B-46A8-9747-344E86B18ACF}.Release|x64.ActiveCfg = Release|x64 - {8DB32590-FC5B-46A8-9747-344E86B18ACF}.Release|x64.Build.0 = Release|x64 {C4659F60-3FED-4F43-88E4-969907D4C7A6}.Debug|x64.ActiveCfg = Debug|x64 {C4659F60-3FED-4F43-88E4-969907D4C7A6}.Release|x64.ActiveCfg = Release|x64 {C4659F60-3FED-4F43-88E4-969907D4C7A6}.Release|x64.Build.0 = Release|x64 diff --git a/ml_pah/AvatarEntry.cs b/ml_pah/AvatarEntry.cs index ee940ff..96bdfab 100644 --- a/ml_pah/AvatarEntry.cs +++ b/ml_pah/AvatarEntry.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace ml_pah { diff --git a/ml_pah/HistoryManager.cs b/ml_pah/HistoryManager.cs index cd3d68c..235dbe5 100644 --- a/ml_pah/HistoryManager.cs +++ b/ml_pah/HistoryManager.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Networking.API; +using ABI_RC.Core.Networking.API; using ABI_RC.Core.Networking.API.Responses; using Newtonsoft.Json; using System; diff --git a/ml_pah/Main.cs b/ml_pah/Main.cs index 528c1f8..1035265 100644 --- a/ml_pah/Main.cs +++ b/ml_pah/Main.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core; using System; using System.Collections; diff --git a/ml_pah/ModUi.cs b/ml_pah/ModUi.cs index a7aa3b9..e64d8cf 100644 --- a/ml_pah/ModUi.cs +++ b/ml_pah/ModUi.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.EventSystem; +using ABI_RC.Core.EventSystem; using ABI_RC.Core.InteractionSystem; using BTKUILib.UIObjects; using BTKUILib.UIObjects.Components; diff --git a/ml_pah/Properties/AssemblyInfo.cs b/ml_pah/Properties/AssemblyInfo.cs index f311837..55be6e6 100644 --- a/ml_pah/Properties/AssemblyInfo.cs +++ b/ml_pah/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pah.PlayerAvatarHistory), "PlayerAvatarHistory", "1.0.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_pah.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_pah.PlayerAvatarHistory))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_pah.PlayerAvatarHistory))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_pah.PlayerAvatarHistory), + nameof(ml_pah.PlayerAvatarHistory), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_pah.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.0.0"; + public const string Author = "SDraw"; +} diff --git a/ml_pah/Settings.cs b/ml_pah/Settings.cs index b6be86d..c05e22a 100644 --- a/ml_pah/Settings.cs +++ b/ml_pah/Settings.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using UnityEngine; diff --git a/ml_pah/ml_pah.csproj b/ml_pah/ml_pah.csproj index 8bc5494..f6706b5 100644 --- a/ml_pah/ml_pah.csproj +++ b/ml_pah/ml_pah.csproj @@ -1,60 +1,21 @@ - netstandard2.1 - x64 - PlayerAvatarHistory PlayerAvatarHistory - SDraw - - - - embedded - true + PlayerAvatarHistory + PlayerAvatarHistory - - - + + + - - - + + + - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Newtonsoft.Json.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - - - - - diff --git a/ml_pam/ArmMover.cs b/ml_pam/ArmMover.cs index 7b2d567..e24b6c0 100644 --- a/ml_pam/ArmMover.cs +++ b/ml_pam/ArmMover.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; using ABI_RC.Systems.GameEventSystem; diff --git a/ml_pam/AvatarBoolParameter.cs b/ml_pam/AvatarBoolParameter.cs index 0cbbac0..6118ccb 100644 --- a/ml_pam/AvatarBoolParameter.cs +++ b/ml_pam/AvatarBoolParameter.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Util.AnimatorManager; +using ABI_RC.Core.Util.AnimatorManager; using System.Text.RegularExpressions; using UnityEngine; diff --git a/ml_pam/GameEvents.cs b/ml_pam/GameEvents.cs index 64c2f63..678fd78 100644 --- a/ml_pam/GameEvents.cs +++ b/ml_pam/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Systems.IK; using System; diff --git a/ml_pam/Main.cs b/ml_pam/Main.cs index efd426c..45aff1b 100644 --- a/ml_pam/Main.cs +++ b/ml_pam/Main.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; namespace ml_pam { diff --git a/ml_pam/Properties/AssemblyInfo.cs b/ml_pam/Properties/AssemblyInfo.cs index 07543c2..3be7056 100644 --- a/ml_pam/Properties/AssemblyInfo.cs +++ b/ml_pam/Properties/AssemblyInfo.cs @@ -1,5 +1,27 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.2.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_pam.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_pam.PickupArmMovement))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_pam.PickupArmMovement))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_pam.PickupArmMovement), + nameof(ml_pam.PickupArmMovement), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(1)] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_pam.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.2.3"; + public const string Author = "SDraw"; +} diff --git a/ml_pam/ResourcesHandler.cs b/ml_pam/ResourcesHandler.cs index 874c49f..8cb1e62 100644 --- a/ml_pam/ResourcesHandler.cs +++ b/ml_pam/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_pam/Settings.cs b/ml_pam/Settings.cs index fac0dad..121aa6d 100644 --- a/ml_pam/Settings.cs +++ b/ml_pam/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; using UnityEngine; diff --git a/ml_pam/Utils.cs b/ml_pam/Utils.cs index 6f5faf1..0c45f45 100644 --- a/ml_pam/Utils.cs +++ b/ml_pam/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Core.UI; using ABI_RC.Systems.IK; diff --git a/ml_pam/ml_pam.csproj b/ml_pam/ml_pam.csproj index 5f19c2d..7041705 100644 --- a/ml_pam/ml_pam.csproj +++ b/ml_pam/ml_pam.csproj @@ -1,89 +1,22 @@ - netstandard2.1 - x64 - PickupArmMovement - 1.2.3 - SDraw - SDraw - PickupArmMovement PickupArmMovement - - - - embedded - true + PickupArmMovement + PickupArmMovement - + - + - + - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll - false - false - - - - - - - diff --git a/ml_pam/resources/mod_menu.js b/ml_pam/resources/mod_menu.js index ba0e754..ffd4046 100644 --- a/ml_pam/resources/mod_menu.js +++ b/ml_pam/resources/mod_menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/ml_pin/Main.cs b/ml_pin/Main.cs index 80e134c..68b0f44 100644 --- a/ml_pin/Main.cs +++ b/ml_pin/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.AudioEffects; +using ABI_RC.Core.AudioEffects; using ABI_RC.Core.Networking.IO.Social; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; diff --git a/ml_pin/Properties/AssemblyInfo.cs b/ml_pin/Properties/AssemblyInfo.cs index 3447171..5679c24 100644 --- a/ml_pin/Properties/AssemblyInfo.cs +++ b/ml_pin/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_pin.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_pin.PlayersInstanceNotifier))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_pin.PlayersInstanceNotifier))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_pin.PlayersInstanceNotifier), + nameof(ml_pin.PlayersInstanceNotifier), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_pin.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.1.2"; + public const string Author = "SDraw"; +} diff --git a/ml_pin/ResourcesHandler.cs b/ml_pin/ResourcesHandler.cs index f095e80..c9ee353 100644 --- a/ml_pin/ResourcesHandler.cs +++ b/ml_pin/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Reflection; diff --git a/ml_pin/Settings.cs b/ml_pin/Settings.cs index 052ec0f..d7c5e6d 100644 --- a/ml_pin/Settings.cs +++ b/ml_pin/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; diff --git a/ml_pin/SoundManager.cs b/ml_pin/SoundManager.cs index 3b53971..0cf014b 100644 --- a/ml_pin/SoundManager.cs +++ b/ml_pin/SoundManager.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.AudioEffects; +using ABI_RC.Core.AudioEffects; using System; using System.Collections; using System.IO; diff --git a/ml_pin/Utils.cs b/ml_pin/Utils.cs index de1f4f7..df46c70 100644 --- a/ml_pin/Utils.cs +++ b/ml_pin/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.UI; +using ABI_RC.Core.UI; using System.Reflection; namespace ml_pin diff --git a/ml_pin/ml_pin.csproj b/ml_pin/ml_pin.csproj index 251d1c5..2aeca96 100644 --- a/ml_pin/ml_pin.csproj +++ b/ml_pin/ml_pin.csproj @@ -1,92 +1,25 @@ - netstandard2.1 - x64 - PlayersInstanceNotifier - SDraw - SDraw - PlayersInstanceNotifier - 1.1.2 PlayersInstanceNotifier - - - - embedded - true + PlayersInstanceNotifier + PlayersInstanceNotifier - - - + + + - - + + - - + + - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AudioModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.UnityWebRequestModule.dll - false - false - - - - - - - diff --git a/ml_pin/resources/mod_menu.js b/ml_pin/resources/mod_menu.js index 61aa058..c8a9d6b 100644 --- a/ml_pin/resources/mod_menu.js +++ b/ml_pin/resources/mod_menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/ml_pmc/GameEvents.cs b/ml_pmc/GameEvents.cs index 3f61aaf..6b531ea 100644 --- a/ml_pmc/GameEvents.cs +++ b/ml_pmc/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using ABI_RC.Systems.IK; using System; using System.Reflection; diff --git a/ml_pmc/Main.cs b/ml_pmc/Main.cs index bdf5faa..8ab10dc 100644 --- a/ml_pmc/Main.cs +++ b/ml_pmc/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using UnityEngine; namespace ml_pmc diff --git a/ml_pmc/ModUi.cs b/ml_pmc/ModUi.cs index 861ccd8..a75c3d3 100644 --- a/ml_pmc/ModUi.cs +++ b/ml_pmc/ModUi.cs @@ -1,4 +1,4 @@ -using BTKUILib.UIObjects; +using BTKUILib.UIObjects; using BTKUILib.UIObjects.Components; using System; using System.Collections.Generic; diff --git a/ml_pmc/PoseCopycat.cs b/ml_pmc/PoseCopycat.cs index 1a27aba..21ae1db 100644 --- a/ml_pmc/PoseCopycat.cs +++ b/ml_pmc/PoseCopycat.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Networking.IO.Social; using ABI_RC.Core.Player; using ABI_RC.Systems.GameEventSystem; diff --git a/ml_pmc/Properties/AssemblyInfo.cs b/ml_pmc/Properties/AssemblyInfo.cs index ff06217..22b36be 100644 --- a/ml_pmc/Properties/AssemblyInfo.cs +++ b/ml_pmc/Properties/AssemblyInfo.cs @@ -1,6 +1,28 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_pmc.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_pmc.PlayerMovementCopycat))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_pmc.PlayerMovementCopycat))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_pmc.PlayerMovementCopycat), + nameof(ml_pmc.PlayerMovementCopycat), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(3)] [assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_pmc.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.1.2"; + public const string Author = "SDraw"; +} diff --git a/ml_pmc/PuppetParser.cs b/ml_pmc/PuppetParser.cs index 9e71cea..83cc883 100644 --- a/ml_pmc/PuppetParser.cs +++ b/ml_pmc/PuppetParser.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Player; +using ABI_RC.Core.Player; using UnityEngine; namespace ml_pmc diff --git a/ml_pmc/Settings.cs b/ml_pmc/Settings.cs index 534227e..ca4c4c7 100644 --- a/ml_pmc/Settings.cs +++ b/ml_pmc/Settings.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; namespace ml_pmc diff --git a/ml_pmc/Utils.cs b/ml_pmc/Utils.cs index 855142b..b9e87bf 100644 --- a/ml_pmc/Utils.cs +++ b/ml_pmc/Utils.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core; using ABI_RC.Core.Savior; using ABI_RC.Systems.InputManagement; diff --git a/ml_pmc/ml_pmc.csproj b/ml_pmc/ml_pmc.csproj index 15edaac..75fa0c9 100644 --- a/ml_pmc/ml_pmc.csproj +++ b/ml_pmc/ml_pmc.csproj @@ -1,87 +1,20 @@ - netstandard2.1 - x64 - PlayerMovementCopycat - SDraw - SDraw - PlayerMovementCopycat - 1.1.2 PlayerMovementCopycat + PlayerMovementCopycat + PlayerMovementCopycat - - embedded - true - - - - - - - - + + - - - - - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll - false - false - + + diff --git a/ml_ppu/GameEvents.cs b/ml_ppu/GameEvents.cs index b8b70dd..db417bd 100644 --- a/ml_ppu/GameEvents.cs +++ b/ml_ppu/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core; +using ABI_RC.Core; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; using System; diff --git a/ml_ppu/GrabDetector.cs b/ml_ppu/GrabDetector.cs index 2af8e3c..0c543e3 100644 --- a/ml_ppu/GrabDetector.cs +++ b/ml_ppu/GrabDetector.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Networking.IO.Social; using ABI_RC.Core.Player; using UnityEngine; diff --git a/ml_ppu/Main.cs b/ml_ppu/Main.cs index 1a98d3d..60c2f7b 100644 --- a/ml_ppu/Main.cs +++ b/ml_ppu/Main.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using UnityEngine; diff --git a/ml_ppu/ModSupport.cs b/ml_ppu/ModSupport.cs index c815210..eb43c06 100644 --- a/ml_ppu/ModSupport.cs +++ b/ml_ppu/ModSupport.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; namespace ml_ppu { diff --git a/ml_ppu/ModUi.cs b/ml_ppu/ModUi.cs index 600b2e7..b518114 100644 --- a/ml_ppu/ModUi.cs +++ b/ml_ppu/ModUi.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; using BTKUILib.UIObjects; diff --git a/ml_ppu/PickUpManager.cs b/ml_ppu/PickUpManager.cs index d5c61f8..68a1432 100644 --- a/ml_ppu/PickUpManager.cs +++ b/ml_ppu/PickUpManager.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; diff --git a/ml_ppu/Properties/AssemblyInfo.cs b/ml_ppu/Properties/AssemblyInfo.cs index d5a3c9b..a95e59e 100644 --- a/ml_ppu/Properties/AssemblyInfo.cs +++ b/ml_ppu/Properties/AssemblyInfo.cs @@ -1,5 +1,27 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_ppu.PlayerPickUp), "PlayerPickUp", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_ppu.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_ppu.PlayerPickUp))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_ppu.PlayerPickUp))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_ppu.PlayerPickUp), + nameof(ml_ppu.PlayerPickUp), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonOptionalDependencies("PlayerRagdollMod")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_ppu.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.0.1"; + public const string Author = "SDraw"; +} diff --git a/ml_ppu/Settings.cs b/ml_ppu/Settings.cs index 24b9215..c39557c 100644 --- a/ml_ppu/Settings.cs +++ b/ml_ppu/Settings.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using UnityEngine; diff --git a/ml_ppu/Utils.cs b/ml_ppu/Utils.cs index 4629730..a3f3b84 100644 --- a/ml_ppu/Utils.cs +++ b/ml_ppu/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core; +using ABI_RC.Core; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Systems.Movement; diff --git a/ml_ppu/ml_ppu.csproj b/ml_ppu/ml_ppu.csproj index ae3b32f..9bb2119 100644 --- a/ml_ppu/ml_ppu.csproj +++ b/ml_ppu/ml_ppu.csproj @@ -1,81 +1,21 @@ - netstandard2.1 - x64 PlayerPickUp - SDraw - 1.0.1 - - - - embedded - true + PlayerPickUp + PlayerPickUp - + - + - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\Mods\PlayerRagdollMod.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll - false - false - + - - - - diff --git a/ml_prm/AvatarParameter.cs b/ml_prm/AvatarParameter.cs index 1c736b2..5f11c09 100644 --- a/ml_prm/AvatarParameter.cs +++ b/ml_prm/AvatarParameter.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Util.AnimatorManager; +using ABI_RC.Core.Util.AnimatorManager; using System.Text.RegularExpressions; using UnityEngine; diff --git a/ml_prm/GameEvents.cs b/ml_prm/GameEvents.cs index a2b5222..880c0aa 100644 --- a/ml_prm/GameEvents.cs +++ b/ml_prm/GameEvents.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; diff --git a/ml_prm/Main.cs b/ml_prm/Main.cs index 361aeb0..4d1c684 100644 --- a/ml_prm/Main.cs +++ b/ml_prm/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.Util.AssetFiltering; +using ABI_RC.Core.Util.AssetFiltering; namespace ml_prm { diff --git a/ml_prm/ModUi.cs b/ml_prm/ModUi.cs index fc5aadc..557a63e 100644 --- a/ml_prm/ModUi.cs +++ b/ml_prm/ModUi.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; using BTKUILib.UIObjects; diff --git a/ml_prm/Properties/AssemblyInfo.cs b/ml_prm/Properties/AssemblyInfo.cs index a692c71..adc15b8 100644 --- a/ml_prm/Properties/AssemblyInfo.cs +++ b/ml_prm/Properties/AssemblyInfo.cs @@ -1,7 +1,29 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.2.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_prm.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_prm.PlayerRagdollMod))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_prm.PlayerRagdollMod))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_prm.PlayerRagdollMod), + nameof(ml_prm.PlayerRagdollMod), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPriority(2)] [assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] [assembly: MelonLoader.MelonAdditionalCredits("kafeijao, NotAKidOnSteam")] + +namespace ml_prm.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.2.4"; + public const string Author = "SDraw"; +} diff --git a/ml_prm/RagdollBodypartHandler.cs b/ml_prm/RagdollBodypartHandler.cs index eeda323..ac2aa93 100644 --- a/ml_prm/RagdollBodypartHandler.cs +++ b/ml_prm/RagdollBodypartHandler.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core; using ABI_RC.Core.Networking.IO.Social; using ABI_RC.Core.Player; diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs index ef52f4b..a3c4da9 100644 --- a/ml_prm/RagdollController.cs +++ b/ml_prm/RagdollController.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core; using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.Player; diff --git a/ml_prm/RagdollToggle.cs b/ml_prm/RagdollToggle.cs index 77925f0..4b1599f 100644 --- a/ml_prm/RagdollToggle.cs +++ b/ml_prm/RagdollToggle.cs @@ -1,4 +1,4 @@ -using UnityEngine; +using UnityEngine; namespace ml_prm { diff --git a/ml_prm/Settings.cs b/ml_prm/Settings.cs index 412b48a..74869a4 100644 --- a/ml_prm/Settings.cs +++ b/ml_prm/Settings.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using UnityEngine; diff --git a/ml_prm/Utils.cs b/ml_prm/Utils.cs index ad5f7db..809b910 100644 --- a/ml_prm/Utils.cs +++ b/ml_prm/Utils.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Core.Player; using ABI_RC.Core.Savior; using ABI_RC.Systems.IK; diff --git a/ml_prm/WorldManager.cs b/ml_prm/WorldManager.cs index 87ce672..ea13f93 100644 --- a/ml_prm/WorldManager.cs +++ b/ml_prm/WorldManager.cs @@ -1,4 +1,4 @@ -using ABI.CCK.Components; +using ABI.CCK.Components; using ABI_RC.Systems.GameEventSystem; using System; using UnityEngine; diff --git a/ml_prm/ml_prm.csproj b/ml_prm/ml_prm.csproj index 0424cc3..40c9627 100644 --- a/ml_prm/ml_prm.csproj +++ b/ml_prm/ml_prm.csproj @@ -1,101 +1,19 @@ - - - - netstandard2.1 - x64 - PlayerRagdollMod - 1.2.4 - SDraw - SDraw - PlayerRagdollMod - PlayerRagdollMod - - - - embedded - true - - - - - - - - - - - - - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\Mods\BTKUILib.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ECM2.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.ClothModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.InputLegacyModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.ParticleSystemModule.dll - false - false - - - - - - - - + + + + PlayerRagdollMod + PlayerRagdollMod + PlayerRagdollMod + + + + + + + + + + + + + diff --git a/ml_prm/vendor/RootMotion/.gitignore b/ml_prm/vendor/RootMotion/.gitignore new file mode 100644 index 0000000..bbf2440 --- /dev/null +++ b/ml_prm/vendor/RootMotion/.gitignore @@ -0,0 +1,2 @@ +PuppetMaster +RagdollManager diff --git a/ml_vei/Main.cs b/ml_vei/Main.cs index fdce8f1..a8db9da 100644 --- a/ml_vei/Main.cs +++ b/ml_vei/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.Systems.InputManagement; +using ABI_RC.Systems.InputManagement; using ABI_RC.Systems.InputManagement.XR; using System; using System.Reflection; diff --git a/ml_vei/Properties/AssemblyInfo.cs b/ml_vei/Properties/AssemblyInfo.cs index 6c140ba..390bcc5 100644 --- a/ml_vei/Properties/AssemblyInfo.cs +++ b/ml_vei/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.1.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_vei.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_vei.ViveExtendedInput))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_vei.ViveExtendedInput))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_vei.ViveExtendedInput), + nameof(ml_vei.ViveExtendedInput), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_vei.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.1.2"; + public const string Author = "SDraw"; +} diff --git a/ml_vei/ResourcesHandler.cs b/ml_vei/ResourcesHandler.cs index 59cfbc2..98eb1cd 100644 --- a/ml_vei/ResourcesHandler.cs +++ b/ml_vei/ResourcesHandler.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Reflection; diff --git a/ml_vei/Settings.cs b/ml_vei/Settings.cs index 9f34729..6ba6580 100644 --- a/ml_vei/Settings.cs +++ b/ml_vei/Settings.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.InteractionSystem; +using ABI_RC.Core.InteractionSystem; using System; using System.Collections.Generic; diff --git a/ml_vei/Utils.cs b/ml_vei/Utils.cs index 8e32f9b..4691980 100644 --- a/ml_vei/Utils.cs +++ b/ml_vei/Utils.cs @@ -1,4 +1,4 @@ -using ABI_RC.Core.UI; +using ABI_RC.Core.UI; using System.Reflection; namespace ml_vei diff --git a/ml_vei/ml_vei.csproj b/ml_vei/ml_vei.csproj index 0ab4197..359eb4c 100644 --- a/ml_vei/ml_vei.csproj +++ b/ml_vei/ml_vei.csproj @@ -1,84 +1,22 @@ - netstandard2.1 - x64 - ViveExtendedInput - 1.1.2 - SDraw - SDraw - ViveExtendedInput ViveExtendedInput - - - - embedded - true + ViveExtendedInput + ViveExtendedInput - + - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Unity.Postprocessing.Runtime.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - + - + - - - - - - - - diff --git a/ml_vei/resources/mod_menu.js b/ml_vei/resources/mod_menu.js index d514896..a76faff 100644 --- a/ml_vei/resources/mod_menu.js +++ b/ml_vei/resources/mod_menu.js @@ -1,4 +1,4 @@ -{ +{ let l_block = document.createElement('div'); l_block.innerHTML = `
diff --git a/ml_vet/Properties/AssemblyInfo.cs b/ml_vet/Properties/AssemblyInfo.cs deleted file mode 100644 index 9918aec..0000000 --- a/ml_vet/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_vet.ViveEyeTracking), "ViveEyeTracking", "1.0.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] -[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] -[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] -[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_vet/ml_vet.csproj b/ml_vet/ml_vet.csproj deleted file mode 100644 index 2b9cbb9..0000000 --- a/ml_vet/ml_vet.csproj +++ /dev/null @@ -1,71 +0,0 @@ - - - - netstandard2.1 - x64 - ViveEyeTracking - 1.0.2 - SDraw - SDraw - ViveEyeTracking - ViveEyeTracking - - - - embedded - true - TRACE;NIGHTLY_BUILD - - - - - - - - - - - - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - - - - - - - diff --git a/ml_vpc/Main.cs b/ml_vpc/Main.cs index 547f1f2..548e53d 100644 --- a/ml_vpc/Main.cs +++ b/ml_vpc/Main.cs @@ -1,4 +1,4 @@ -using ABI_RC.VideoPlayer; +using ABI_RC.VideoPlayer; using System.Reflection; using System.IO; diff --git a/ml_vpc/Properties/AssemblyInfo.cs b/ml_vpc/Properties/AssemblyInfo.cs index eeac241..95efab7 100644 --- a/ml_vpc/Properties/AssemblyInfo.cs +++ b/ml_vpc/Properties/AssemblyInfo.cs @@ -1,4 +1,26 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_vpc.VideoPlayerCookies), "VideoPlayerCookies", "1.0.2", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +using System.Reflection; +using ml_vpc.Properties; + +[assembly: AssemblyVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] +[assembly: AssemblyTitle(nameof(ml_vpc.VideoPlayerCookies))] +[assembly: AssemblyCompany(AssemblyInfoParams.Author)] +[assembly: AssemblyProduct(nameof(ml_vpc.VideoPlayerCookies))] + +[assembly: MelonLoader.MelonInfo( + typeof(ml_vpc.VideoPlayerCookies), + nameof(ml_vpc.VideoPlayerCookies), + AssemblyInfoParams.Version, + AssemblyInfoParams.Author, + "https://github.com/SDraw/ml_mods_cvr" +)] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] + +namespace ml_vpc.Properties; +internal static class AssemblyInfoParams { + public const string Version = "1.0.2"; + public const string Author = "SDraw"; +} diff --git a/ml_vpc/ml_vpc.csproj b/ml_vpc/ml_vpc.csproj index 8329c95..3ac5054 100644 --- a/ml_vpc/ml_vpc.csproj +++ b/ml_vpc/ml_vpc.csproj @@ -1,44 +1,10 @@ - netstandard2.1 - x64 VideoPlayerCookies - SDraw - SDraw + VideoPlayerCookies + VideoPlayerCookies 1.0.2 - - embedded - true - - - - - - - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll - false - false - - - D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll - false - false - - -