diff --git a/Catalyss/SMI.cs b/Catalyss/SMI.cs index 8b6d4eb..10ddff7 100644 --- a/Catalyss/SMI.cs +++ b/Catalyss/SMI.cs @@ -15,6 +15,7 @@ internal class SMI //CatalyssMod //Entry //Load + private static nint Cnint = 0; public static void Inject(Injector injector) { byte[] Assem = File.ReadAllBytes($"{Directory.GetCurrentDirectory()}\\CatalyssMod.dll"); //Path @@ -42,16 +43,17 @@ public static void Inject(Injector injector) (injector.Is64Bit ? $"0x{remoteAssembly.ToInt64():X16}" : $"0x{remoteAssembly.ToInt32():X8}")); + + Cnint = remoteAssembly; } } - //Need to change this before release public static void Eject(Injector injector) { - //IntPtr Assem = + IntPtr Assem = nint.Parse($"0x{Cnint.ToInt64():X16}"); using (injector) { - /*try + try { injector.Eject(Assem, "CatalyssMod", "Entry", "Unload"); MessageBox.Show("Ejection successful"); @@ -63,7 +65,7 @@ public static void Eject(Injector injector) catch (Exception exc) { MessageBox.Show("Ejection failed (unknown error): " + exc); - }*/ + } } } } diff --git a/CatalyssMod/CatalyssMod.csproj b/CatalyssMod/CatalyssMod.csproj index 1d8d90d..7bfc998 100644 --- a/CatalyssMod/CatalyssMod.csproj +++ b/CatalyssMod/CatalyssMod.csproj @@ -26,280 +26,241 @@ - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Assembly-CSharp.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\Assembly-CSharp.dll + + + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\com.rlabrecque.steamworks.net.dll + + + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\FizzySteamworks.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\kcp2k.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\kcp2k.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Mirror.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\Mirror.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Mirror.Authenticators.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\Mirror.Authenticators.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Mirror.Components.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\Mirror.Components.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Mirror.Transports.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Animation.Rigging.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Burst.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Burst.Cecil.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Burst.Cecil.Mdb.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Burst.Cecil.Pdb.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Burst.Cecil.Rocks.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Burst.Unsafe.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Mathematics.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Polybrush.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.ProBuilder.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.ProBuilder.Csg.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.ProBuilder.KdTree.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.ProBuilder.Poly2Tri.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.ProBuilder.Stl.dll - - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.TextMeshPro.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\Mirror.Transports.dll - - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\Unity.Timeline.dll + + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\Mono.Security.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.AccessibilityModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.AccessibilityModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.AIModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.AIModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.AndroidJNIModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.AndroidJNIModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.AnimationModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.AnimationModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ARModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ARModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.AssetBundleModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.AssetBundleModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.AudioModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.AudioModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ClothModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ClothModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ClusterInputModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ClusterInputModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ClusterRendererModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ClusterRendererModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.CoreModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.CoreModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.CrashReportingModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.CrashReportingModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.DirectorModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.DirectorModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.DSPGraphModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.DSPGraphModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.GameCenterModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.GameCenterModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.GIModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.GIModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.GridModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.GridModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.HotReloadModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.HotReloadModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ImageConversionModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ImageConversionModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.IMGUIModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.IMGUIModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.InputLegacyModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.InputLegacyModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.InputModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.InputModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.JSONSerializeModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.JSONSerializeModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.LocalizationModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.LocalizationModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.NVIDIAModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.NVIDIAModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ParticleSystemModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ParticleSystemModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.PerformanceReportingModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.PerformanceReportingModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.Physics2DModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.Physics2DModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.PhysicsModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.PhysicsModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ProfilerModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ProfilerModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.ScreenCaptureModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.ScreenCaptureModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.SharedInternalsModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.SharedInternalsModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.SpriteMaskModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.SpriteMaskModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.SpriteShapeModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.SpriteShapeModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.StreamingModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.StreamingModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.SubstanceModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.SubstanceModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.SubsystemsModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.SubsystemsModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TerrainModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TerrainModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TerrainPhysicsModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TerrainPhysicsModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TextCoreFontEngineModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TextCoreFontEngineModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TextCoreModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TextCoreModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TextCoreTextEngineModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TextCoreTextEngineModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TextRenderingModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TextRenderingModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TilemapModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TilemapModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.TLSModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.TLSModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UI.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UI.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UIElementsModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UIElementsModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UIElementsNativeModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UIElementsNativeModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UIModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UIModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UmbraModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UmbraModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UNETModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UNETModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityAnalyticsCommonModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityAnalyticsCommonModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityAnalyticsModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityAnalyticsModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityConnectModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityConnectModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityCurlModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityCurlModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityTestProtocolModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityTestProtocolModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestAssetBundleModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestAudioModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestTextureModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestTextureModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.VehiclesModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.VehiclesModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.VFXModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.VFXModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.VideoModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.VideoModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.VirtualTexturingModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.VirtualTexturingModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.VRModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.VRModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.WindModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.WindModule.dll - D:\SteamLibrary\steamapps\common\ATLYSSModded\ATLYSS_Data\Managed\UnityEngine.XRModule.dll + D:\SteamLibrary\steamapps\common\ATLYSS\ATLYSS_Data\Managed\UnityEngine.XRModule.dll diff --git a/CatalyssMod/Entry.cs b/CatalyssMod/Entry.cs index 671904e..02cf87c 100644 --- a/CatalyssMod/Entry.cs +++ b/CatalyssMod/Entry.cs @@ -7,7 +7,7 @@ namespace CatalyssMod public class Entry { public static GameObject? ModObj; - public const string ModVersion = "1.0"; + public const string ModVersion = "1.1"; public static Rect GuiRect = new(15, 15, 700, 500); public static bool GuiTog { get; set; } = false; diff --git a/CatalyssMod/cMod.cs b/CatalyssMod/cMod.cs index 15c5e70..fd2d7df 100644 --- a/CatalyssMod/cMod.cs +++ b/CatalyssMod/cMod.cs @@ -1,6 +1,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using UnityEngine; +using UnityEngine.Networking.Types; using UnityEngine.SceneManagement; namespace CatalyssMod @@ -9,27 +10,67 @@ internal class cMod : MonoBehaviour { public GameObject GetPlayer() { - try + //Should fix multiplayer + if (Player._mainPlayer.Network_isHostPlayer) { - return GameObject.Find($"[connID: 0] _player({Player._mainPlayer._nickname})"); + try + { + return GameObject.Find($"[connID: 0] _player({Player._mainPlayer._nickname})"); + } + catch { return Player._mainPlayer.gameObject; } } - catch + else { - return Player._mainPlayer.gameObject; + try + { + return GameObject.Find($"_player({Player._mainPlayer._nickname})"); + } + catch { return Player._mainPlayer.gameObject; } } } + //private readonly float FlightSpeed = 5f; private void Update() { if (Input.GetKeyDown(KeyCode.F)) { Entry.GuiTog = !Entry.GuiTog; } + + if (IsFlightActive) + { + //Will fix later + /*Vector3 movementDirection = Vector3.zero; + + if (GetPlayer() != null) + { + //Up down + movementDirection -= GetPlayer().transform.up * (Input.GetKey(KeyCode.Q) ? 1 : 0); + movementDirection += GetPlayer().transform.up * (Input.GetKey(KeyCode.E) ? 1 : 0); + + //Movement + movementDirection += GetPlayer().transform.forward * (Input.GetKey(KeyCode.W) ? 1 : 0); + movementDirection -= GetPlayer().transform.right * (Input.GetKey(KeyCode.A) ? 1 : 0); + movementDirection -= GetPlayer().transform.forward * (Input.GetKey(KeyCode.S) ? 1 : 0); + movementDirection += GetPlayer().transform.right * (Input.GetKey(KeyCode.D) ? 1 : 0); + } + + if (Input.GetKey(KeyCode.LeftShift)) + { + GetPlayer().transform.position += movementDirection * FlightSpeed * 2.5f * Time.deltaTime; + } + else + { + GetPlayer().transform.position += movementDirection * FlightSpeed * Time.deltaTime; + }*/ + } } private void OnGUI() { - GUI.Label(new Rect(5f, 15f, 160f, 90f), $" Catalyss is Loaded!"); + GUI.Label(new Rect(15f, 25f, 160f, 90f), $"Catalyss is Loaded!"); + GUI.Label(new Rect(15f, 40f, 160f, 90f), $"{DateTime.Now:hh:mm:ss}"); + if (Entry.GuiTog) { var GuiName = $"Catalyss v{Entry.ModVersion}"; @@ -58,7 +99,11 @@ private void OnGUI() private bool IsAOEActive = false; private string AOEText = "OFF"; + private bool IsFlightActive = false; + private string FlightText = "OFF"; + private int ExpPointAmount { get; set; } = 20; + void ModGUI(int WindowId) { GUI.backgroundColor = Color.black; @@ -107,7 +152,7 @@ void ModGUI(int WindowId) if (GetPlayer() != null) { - GetPlayer().GetComponentInChildren()._standardJumpForce = 20; + GetPlayer().GetComponentInChildren()._standardJumpForce = 33; } } } @@ -284,7 +329,23 @@ void ModGUI(int WindowId) } } - if (GUI.Button(new Rect(340, 270, 300, 30), "Quit Game")) + if (GUI.Button(new Rect(340, 270, 300, 30), $"Player Flight (Bugged) [{FlightText}]")) + { + if (GetPlayer() != null) + { + IsFlightActive = !IsFlightActive; + if (IsFlightActive) + { + FlightText = "ON"; + } + else + { + FlightText = "OFF"; + } + } + } + + if (GUI.Button(new Rect(340, 310, 300, 30), "Quit Game")) { Application.Quit(); }