From 4b80456b31cf358ab22295d840075f97e6acd743 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Sat, 6 Mar 2021 13:00:28 +0000 Subject: [PATCH] cleanup warnings --- QSB/Animation/AnimationSync.cs | 12 ++++++------ QSB/Instruments/InstrumentsManager.cs | 24 ++++++++++++------------ QSB/QSB.csproj | 2 +- QSB/QSBInputManager.cs | 4 ++-- QSB/QSBNetworkManager.cs | 2 +- QSB/Utility/Popcron.Gizmos/Gizmos.cs | 3 --- QSB/manifest.json | 2 +- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/QSB/Animation/AnimationSync.cs b/QSB/Animation/AnimationSync.cs index 8dc98673..a5b6a036 100644 --- a/QSB/Animation/AnimationSync.cs +++ b/QSB/Animation/AnimationSync.cs @@ -23,9 +23,9 @@ namespace QSB.Animation private CrouchSync _crouchSync; private RuntimeAnimatorController _chertController; - private readonly RuntimeAnimatorController _eskerController; - private readonly RuntimeAnimatorController _feldsparController; - private readonly RuntimeAnimatorController _gabbroController; + //private readonly RuntimeAnimatorController _eskerController; + //private readonly RuntimeAnimatorController _feldsparController; + //private readonly RuntimeAnimatorController _gabbroController; private RuntimeAnimatorController _riebeckController; public AnimatorMirror Mirror { get; private set; } @@ -210,15 +210,15 @@ namespace QSB.Animation break; case AnimationType.Esker: - controller = _eskerController; + //controller = _eskerController; break; case AnimationType.Feldspar: - controller = _feldsparController; + //controller = _feldsparController; break; case AnimationType.Gabbro: - controller = _gabbroController; + //controller = _gabbroController; break; case AnimationType.Riebeck: diff --git a/QSB/Instruments/InstrumentsManager.cs b/QSB/Instruments/InstrumentsManager.cs index 0d8a2dd4..ea5d73d1 100644 --- a/QSB/Instruments/InstrumentsManager.cs +++ b/QSB/Instruments/InstrumentsManager.cs @@ -19,12 +19,12 @@ namespace QSB.Instruments _rootObj = root; gameObject.AddComponent(); - QSBInputManager.ChertTaunt += OnChertTaunt; - QSBInputManager.EskerTaunt += OnEskerTaunt; - QSBInputManager.FeldsparTaunt += OnFeldsparTaunt; - QSBInputManager.GabbroTaunt += OnGabbroTaunt; - QSBInputManager.RiebeckTaunt += OnRiebeckTaunt; - QSBInputManager.ExitTaunt += ReturnToPlayer; + //QSBInputManager.ChertTaunt += OnChertTaunt; + //QSBInputManager.EskerTaunt += OnEskerTaunt; + //QSBInputManager.FeldsparTaunt += OnFeldsparTaunt; + //QSBInputManager.GabbroTaunt += OnGabbroTaunt; + //QSBInputManager.RiebeckTaunt += OnRiebeckTaunt; + //QSBInputManager.ExitTaunt += ReturnToPlayer; QSBCore.Helper.Events.Unity.RunWhen(() => Locator.GetPlayerBody() != null, SetupInstruments); } @@ -42,12 +42,12 @@ namespace QSB.Instruments { return; } - QSBInputManager.ChertTaunt -= OnChertTaunt; - QSBInputManager.EskerTaunt -= OnEskerTaunt; - QSBInputManager.FeldsparTaunt -= OnFeldsparTaunt; - QSBInputManager.GabbroTaunt -= OnGabbroTaunt; - QSBInputManager.RiebeckTaunt -= OnRiebeckTaunt; - QSBInputManager.ExitTaunt -= ReturnToPlayer; + //QSBInputManager.ChertTaunt -= OnChertTaunt; + //QSBInputManager.EskerTaunt -= OnEskerTaunt; + //QSBInputManager.FeldsparTaunt -= OnFeldsparTaunt; + //QSBInputManager.GabbroTaunt -= OnGabbroTaunt; + //QSBInputManager.RiebeckTaunt -= OnRiebeckTaunt; + //QSBInputManager.ExitTaunt -= ReturnToPlayer; } private void OnChertTaunt() => StartInstrument(AnimationType.Chert); diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj index 44ec5e24..6061abf1 100644 --- a/QSB/QSB.csproj +++ b/QSB/QSB.csproj @@ -313,7 +313,7 @@ - 1.1.7 + 1.1.8 diff --git a/QSB/QSBInputManager.cs b/QSB/QSBInputManager.cs index 49ead4ce..88770ded 100644 --- a/QSB/QSBInputManager.cs +++ b/QSB/QSBInputManager.cs @@ -5,6 +5,8 @@ namespace QSB { public class QSBInputManager : MonoBehaviour { + // TODO : finish instruments - disabled for 0.7.0 release + /* public static event Action ChertTaunt; public static event Action EskerTaunt; public static event Action RiebeckTaunt; @@ -12,8 +14,6 @@ namespace QSB public static event Action FeldsparTaunt; public static event Action ExitTaunt; - // TODO : finish instruments - disabled for 0.7.0 release - /* public void Update() { if (Input.GetKey(KeyCode.T)) diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index 4f5326d2..69851e2b 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -45,7 +45,7 @@ namespace QSB private GameObject _probePrefab; private bool _everConnected; - public void Awake() + public new void Awake() { base.Awake(); Instance = this; diff --git a/QSB/Utility/Popcron.Gizmos/Gizmos.cs b/QSB/Utility/Popcron.Gizmos/Gizmos.cs index 33563fb4..7d3024cb 100644 --- a/QSB/Utility/Popcron.Gizmos/Gizmos.cs +++ b/QSB/Utility/Popcron.Gizmos/Gizmos.cs @@ -7,10 +7,7 @@ namespace Popcron { private static string _prefsKey = null; private static int? _bufferSize = null; - private static bool? _enabled = null; private static float? _dashGap = null; - private static bool? _cull = null; - private static int? _pass = null; private static Vector3? _offset = null; private static Vector3[] buffer = new Vector3[BufferSize]; diff --git a/QSB/manifest.json b/QSB/manifest.json index e83f374d..addb0571 100644 --- a/QSB/manifest.json +++ b/QSB/manifest.json @@ -5,5 +5,5 @@ "description": "Adds online multiplayer to the game.", "uniqueName": "Raicuparta.QuantumSpaceBuddies", "version": "0.9.0", - "owmlVersion": "1.1.7" + "owmlVersion": "1.1.8" } \ No newline at end of file