Gittes-archive/new-horizons
2
0
Fork 0
mirror of https://github.com/Outer-Wilds-New-Horizons/new-horizons.git synced 2025-12-11 20:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change fifty gorillion logs to be verbose

Browse Source
This commit is contained in:
Nick 2022-07-05 19:28:38 -04:00
parent 0ec1d51211
commit 2e47d170f9
39 changed files with 144 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NewHorizons/AchievementsPlus/AchievementHandler.cs
View File

@ -20,7 +20,7 @@ namespace NewHorizons.AchievementsPlus
if (API == null)
{
Logger.Log("Achievements+ isn't installed");
Logger.LogVerbose("Achievements+ isn't installed");
Enabled = false;
return;
}

2
NewHorizons/Builder/Body/AsteroidBeltBuilder.cs
View File

@ -69,7 +69,7 @@ namespace NewHorizons.Builder.Body
}
var asteroid = new NewHorizonsBody(config, mod);
PlanetCreationHandler.NextPassBodies.Add(asteroid);
PlanetCreationHandler.GenerateBody(asteroid);
}
}
}

4
NewHorizons/Builder/Body/SingularityBuilder.cs
View File

@ -76,14 +76,14 @@ namespace NewHorizons.Builder.Body
{
if (blackHole == null || whiteHole == null) return;
Logger.Log($"Pairing singularities [{blackHoleID}], [{whiteHoleID}]");
Logger.LogVerbose($"Pairing singularities [{blackHoleID}], [{whiteHoleID}]");
var whiteHoleVolume = whiteHole.GetComponentInChildren<WhiteHoleVolume>();
var blackHoleVolume = blackHole.GetComponentInChildren<BlackHoleVolume>();
if (whiteHoleVolume == null || blackHoleVolume == null)
{
Logger.Log($"[{blackHoleID}] and [{whiteHoleID}] do not have compatible polarities");
Logger.LogWarning($"[{blackHoleID}] and [{whiteHoleID}] do not have compatible polarities");
return;
}

2
NewHorizons/Builder/General/AstroObjectBuilder.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.Components.Orbital;
using NewHorizons.Components.Orbital;
using NewHorizons.External.Configs;
using UnityEngine;
using Logger = NewHorizons.Utility.Logger;

4
NewHorizons/Builder/General/SpawnPointBuilder.cs
View File

@ -62,7 +62,7 @@ namespace NewHorizons.Builder.General
if (Main.Instance.IsWarpingFromShip)
{
Logger.Log("Overriding player spawn to be inside ship");
Logger.LogVerbose("Overriding player spawn to be inside ship");
GameObject playerSpawnGO = new GameObject("PlayerSpawnPoint");
playerSpawnGO.transform.parent = ship.transform;
playerSpawnGO.layer = 8;
@ -81,7 +81,7 @@ namespace NewHorizons.Builder.General
Main.Instance.ModHelper.Events.Unity.RunWhen(() => Main.IsSystemReady, () => SuitUp());
}
Logger.Log("Made spawnpoint on [" + planetGO.name + "]");
Logger.Log($"Made spawnpoint on [{planetGO.name}]");
return playerSpawn;
}

6
NewHorizons/Builder/Orbital/InitialMotionBuilder.cs
View File

@ -80,7 +80,7 @@ namespace NewHorizons.Builder.Orbital
}
else
{
Logger.Log($"No primary gravity or focal point for {primaryBody}");
Logger.LogError($"No primary gravity or focal point for {primaryBody}");
}
}
@ -99,7 +99,7 @@ namespace NewHorizons.Builder.Orbital
private static void SetBinaryInitialMotion(AstroObject baryCenter, NHAstroObject primaryBody, NHAstroObject secondaryBody)
{
Logger.Log($"Setting binary initial motion [{primaryBody.name}] [{secondaryBody.name}]");
Logger.LogVerbose($"Setting binary initial motion [{primaryBody.name}] [{secondaryBody.name}]");
var primaryGravity = new Gravity(primaryBody._gravityVolume);
var secondaryGravity = new Gravity(secondaryBody._gravityVolume);
@ -172,7 +172,7 @@ namespace NewHorizons.Builder.Orbital
secondaryInitialMotion._cachedInitVelocity = baryCenterVelocity + secondaryVelocity;
secondaryInitialMotion._isInitVelocityDirty = false;
Logger.Log($"Binary Initial Motion: {m1}, {m2}, {r1}, {r2}, {primaryVelocity}, {secondaryVelocity}");
Logger.LogVerbose($"Binary Initial Motion: {m1}, {m2}, {r1}, {r2}, {primaryVelocity}, {secondaryVelocity}");
}
}
}

2
NewHorizons/Builder/Props/DetailBuilder.cs
View File

@ -233,7 +233,7 @@ namespace NewHorizons.Builder.Props
// If it's not a moving anglerfish make sure the anim controller is regular
else if (component is AnglerfishAnimController angler && angler.GetComponentInParent<AnglerfishController>() == null)
{
Logger.Log("Enabling anglerfish animation");
Logger.LogVerbose("Enabling anglerfish animation");
// Remove any reference to its angler
if (angler._anglerfishController)
{

5
NewHorizons/Builder/Props/NomaiTextBuilder.cs
View File

@ -30,9 +30,10 @@ namespace NewHorizons.Builder.Props
}
private static Dictionary<PropModule.NomaiTextInfo, GameObject> conversationInfoToCorrespondingSpawnedGameObject = new Dictionary<PropModule.NomaiTextInfo, GameObject>();
public static GameObject GetSpawnedGameObjectByNomaiTextInfo(PropModule.NomaiTextInfo convo)
{
Logger.Log("retrieving wall text obj for " + convo);
Logger.LogVerbose("Retrieving wall text obj for " + convo);
if (!conversationInfoToCorrespondingSpawnedGameObject.ContainsKey(convo)) return null;
return conversationInfoToCorrespondingSpawnedGameObject[convo];
}
@ -168,7 +169,7 @@ namespace NewHorizons.Builder.Props
() => Main.IsSystemReady,
() =>
{
Logger.Log("Fixing scroll!");
Logger.LogVerbose("Fixing scroll!");
scrollItem._nomaiWallText = nomaiWallText;
scrollItem.SetSector(sector);
customScroll.transform.Find("Props_NOM_Scroll/Props_NOM_Scroll_Geo").GetComponent<MeshRenderer>().enabled = true;

2
NewHorizons/Builder/Props/QuantumBuilder.cs
View File

@ -216,7 +216,7 @@ namespace NewHorizons.Builder.Props
void Update()
{
if (meshFilter == null && skinnedMeshRenderer == null) { Logger.Log("Useless BoxShapeFixer, destroying"); GameObject.DestroyImmediate(this); }
if (meshFilter == null && skinnedMeshRenderer == null) { Logger.LogVerbose("Useless BoxShapeFixer, destroying"); GameObject.DestroyImmediate(this); }
Mesh sharedMesh = null;
if (meshFilter != null) sharedMesh = meshFilter.sharedMesh;

2
NewHorizons/Builder/Props/SignalBuilder.cs
View File

@ -24,7 +24,7 @@ namespace NewHorizons.Builder.Props
public static void Init()
{
Logger.Log($"Initializing SignalBuilder");
Logger.LogVerbose($"Initializing SignalBuilder");
_customSignalNames = new Dictionary<SignalName, string>();
_availableSignalNames = new Stack<SignalName>(new SignalName[]
{

2
NewHorizons/Builder/ShipLog/MapModeBuilder.cs
View File

@ -99,7 +99,7 @@ namespace NewHorizons.Builder.ShipLog
{
const float unviewedIconOffset = 15;
Logger.Log($"Adding ship log astro object for {body.Config.name}");
Logger.LogVerbose($"Adding ship log astro object for {body.Config.name}");
GameObject unviewedReference = SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/TimberHearth/UnviewedIcon");

2
NewHorizons/Builder/StarSystem/SkyboxBuilder.cs
View File

@ -1,4 +1,4 @@
using NewHorizons.External.Configs;
using NewHorizons.External.Configs;
using NewHorizons.Utility;
using OWML.Common;
using UnityEngine;

2
NewHorizons/Components/NHMultiStateQuantumObject.cs
View File

@ -70,7 +70,7 @@ namespace NewHorizons.Components
if (previousIndex >= 0 && previousIndex < _states.Length) _states[previousIndex].SetVisible(visible: false);
_states[_stateIndex].SetVisible(visible: true);
Logger.Log("trying state " + _stateIndex);
Logger.LogVerbose($"MultiStateQuantumObject - Trying to change state {_stateIndex}");
indices.Remove(_stateIndex);
} while (!CurrentStateIsValid() && indices.Count > 0);

2
NewHorizons/Components/QuantumPlanet.cs
View File

@ -52,7 +52,7 @@ namespace NewHorizons.Components
public override bool ChangeQuantumState(bool skipInstantVisibilityCheck)
{
Logger.Log($"Trying to change quantum state");
Logger.LogVerbose($"QuantumPlanet - Trying to change quantum state");
if (states.Count <= 1) return false;

2
NewHorizons/Components/ShipLogStarChartMode.cs
View File

@ -133,7 +133,7 @@ namespace NewHorizons.Components
else
{
var path = $"planets/{uniqueID}.png";
Logger.Log($"Trying to load {path}");
Logger.LogVerbose($"ShipLogStarChartManager - Trying to load {path}");
texture = ImageUtilities.GetTexture(Main.SystemDict[uniqueID].Mod, path);
}
}

10
NewHorizons/Components/ShipWarpController.cs
View File

@ -99,7 +99,7 @@ namespace NewHorizons.Components
public void WarpIn(bool wearingSuit)
{
Logger.Log("Starting warp-in");
Logger.LogVerbose("Starting warp-in");
// Trying really hard to stop the player from dying while warping in
_impactDeathSpeed = Locator.GetDeathManager()._impactDeathSpeed;
Locator.GetDeathManager()._impactDeathSpeed = Mathf.Infinity;
@ -112,7 +112,7 @@ namespace NewHorizons.Components
public void WarpOut()
{
Logger.Log("Starting warp-out");
Logger.LogVerbose("Starting warp-out");
_oneShotSource.PlayOneShot(global::AudioType.VesselSingularityCreate, 1f);
_blackhole.Create();
}
@ -129,7 +129,7 @@ namespace NewHorizons.Components
{
if (Locator.GetPlayerTransform().TryGetComponent<PlayerResources>(out var resources) && resources._currentHealth < 100f)
{
Logger.Log("Player died in a warp drive accident, reviving them");
Logger.LogVerbose("Player died in a warp drive accident, reviving them");
// Means the player was killed meaning they weren't teleported in
resources._currentHealth = 100f;
if (!PlayerState.AtFlightConsole()) TeleportToShip();
@ -151,7 +151,7 @@ namespace NewHorizons.Components
private void StartWarpInEffect()
{
Logger.Log("Starting warp-in effect");
Logger.LogVerbose("Starting warp-in effect");
_oneShotSource.PlayOneShot(global::AudioType.VesselSingularityCollapse, 1f);
Locator.GetDeathManager()._invincible = true;
if (Main.Instance.CurrentStarSystem.Equals("SolarSystem")) TeleportToShip();
@ -171,7 +171,7 @@ namespace NewHorizons.Components
public void FinishWarpIn()
{
Logger.Log("Finishing warp");
Logger.LogVerbose("Finishing warp");
Locator.GetShipBody().GetComponentInChildren<ShipCockpitController>().OnPressInteract();
_waitingToBeSeated = false;
Main.Instance.ModHelper.Events.Unity.FireInNUpdates(() => _whitehole.Collapse(), 30);

6
NewHorizons/Components/StarLightController.cs
View File

@ -28,13 +28,13 @@ namespace NewHorizons.Components
{
if (star == null) return;
Logger.Log($"Adding new star to list: {star.gameObject.name}");
Logger.LogVerbose($"Adding new star to list: {star.gameObject.name}");
Instance._stars.Add(star);
}
public static void RemoveStar(StarController star)
{
Logger.Log($"Removing star from list: {star?.gameObject?.name}");
Logger.LogVerbose($"Removing star from list: {star?.gameObject?.name}");
if (Instance._stars.Contains(star))
{
if (Instance._activeStar != null && Instance._activeStar.Equals(star))
@ -85,7 +85,7 @@ namespace NewHorizons.Components
if (_activeStar != null) _activeStar.Disable();
Logger.Log($"Switching active star: {star.gameObject.name}");
Logger.LogVerbose($"Switching active star: {star.gameObject.name}");
_activeStar = star;

8
NewHorizons/External/NewHorizonsData.cs vendored
View File

@ -26,18 +26,18 @@ namespace NewHorizons.External
if (!_saveFile.Profiles.ContainsKey(_activeProfileName))
_saveFile.Profiles.Add(_activeProfileName, new NewHorizonsProfile());
_activeProfile = _saveFile.Profiles[_activeProfileName];
Logger.Log($"Loaded save data for {_activeProfileName}");
Logger.LogVerbose($"Loaded save data for {_activeProfileName}");
}
catch (Exception)
{
try
{
Logger.Log($"Couldn't load save data from {FileName}, creating a new file");
Logger.LogVerbose($"Couldn't load save data from {FileName}, creating a new file");
_saveFile = new NewHorizonsSaveFile();
_saveFile.Profiles.Add(_activeProfileName, new NewHorizonsProfile());
_activeProfile = _saveFile.Profiles[_activeProfileName];
Main.Instance.ModHelper.Storage.Save(_saveFile, FileName);
Logger.Log($"Loaded save data for {_activeProfileName}");
Logger.LogVerbose($"Loaded save data for {_activeProfileName}");
}
catch (Exception e)
{
@ -55,7 +55,7 @@ namespace NewHorizons.External
public static void Reset()
{
if (_saveFile == null || _activeProfile == null) Load();
Logger.Log($"Resetting save data for {_activeProfileName}");
Logger.LogVerbose($"Resetting save data for {_activeProfileName}");
_activeProfile = new NewHorizonsProfile();
_saveFile.Profiles[_activeProfileName] = _activeProfile;

10
NewHorizons/Handlers/PlanetCreationHandler.cs
View File

@ -278,8 +278,8 @@ namespace NewHorizons.Handlers
{
if (defaultPrimaryToSun)
{
Logger.Log($"Couldn't find {body.Config.Orbit.primaryBody}, defaulting to Sun");
primaryBody = AstroObjectLocator.GetAstroObject("Sun");
Logger.LogError($"Couldn't find {body.Config.Orbit.primaryBody}, defaulting to center of solar system");
primaryBody = Locator.GetCenterOfTheUniverse().GetAttachedOWRigidbody().GetComponent<AstroObject>();
}
else
{
@ -293,8 +293,6 @@ namespace NewHorizons.Handlers
primaryBody = null;
}
Logger.Log($"Begin generation sequence of [{body.Config.name}]");
var go = new GameObject(body.Config.name.Replace(" ", "").Replace("'", "") + "_Body");
go.SetActive(false);
@ -339,7 +337,7 @@ namespace NewHorizons.Handlers
// Spawning on other planets is a bit hacky so we do it last
if (body.Config.Spawn != null)
{
Logger.Log("Doing spawn point thing");
Logger.LogVerbose("Making spawn point");
Main.SystemDict[body.Config.starSystem].SpawnPoint = SpawnPointBuilder.Make(go, body.Config.Spawn, owRigidBody);
}
@ -606,7 +604,7 @@ namespace NewHorizons.Handlers
public static void UpdatePosition(GameObject go, IOrbitalParameters orbit, AstroObject primaryBody, AstroObject secondaryBody)
{
Logger.Log($"Placing [{secondaryBody?.name}] around [{primaryBody?.name}]");
Logger.LogVerbose($"Placing [{secondaryBody?.name}] around [{primaryBody?.name}]");
go.transform.parent = Locator.GetRootTransform();

12
NewHorizons/Handlers/PlanetDestructionHandler.cs
View File

@ -53,7 +53,7 @@ namespace NewHorizons.Handlers
if (ao.gameObject == null || !ao.gameObject.activeInHierarchy)
{
Logger.Log($"[{ao.name}] was already removed");
Logger.LogVerbose($"[{ao.name}] was already removed");
return;
}
@ -61,7 +61,7 @@ namespace NewHorizons.Handlers
if (toDestroy.Contains(ao))
{
Logger.LogError($"Possible infinite recursion in RemoveBody: {ao.name} might be it's own primary body?");
Logger.LogVerbose($"Possible infinite recursion in RemoveBody: {ao.name} might be it's own primary body?");
return;
}
@ -133,7 +133,7 @@ namespace NewHorizons.Handlers
foreach (var sunProxy in GameObject.FindObjectsOfType<SunProxy>())
{
Logger.Log($"Destroying SunProxy {sunProxy.gameObject.name}");
Logger.LogVerbose($"Destroying SunProxy {sunProxy.gameObject.name}");
GameObject.Destroy(sunProxy.gameObject);
}
@ -143,12 +143,12 @@ namespace NewHorizons.Handlers
}
// Always delete the children
Logger.Log($"Removing Children of [{ao._name}], [{ao._customName}]");
Logger.LogVerbose($"Removing Children of [{ao._name}], [{ao._customName}]");
foreach (var child in AstroObjectLocator.GetChildren(ao))
{
if (child == null) continue;
Logger.Log($"Removing child [{child.name}] of [{ao._name}]");
Logger.LogVerbose($"Removing child [{child.name}] of [{ao._name}]");
// Ship starts as a child of TH but obvious we want to keep that
if (child.name == "Ship_Body") continue;
@ -236,7 +236,7 @@ namespace NewHorizons.Handlers
if (distantProxyClone != null) GameObject.Destroy(distantProxyClone.gameObject);
if (distantProxy == null && distantProxyClone == null)
Logger.Log($"Couldn't find proxy for {name}");
Logger.LogVerbose($"Couldn't find proxy for {name}");
}
}
}

2
NewHorizons/Handlers/PlanetGraphHandler.cs
View File

@ -109,7 +109,7 @@ namespace NewHorizons.Handlers
foreach (var node in nodeDict.Values.ToList())
{
var childrenString = String.Join(", ", node.children.Select(x => x?.body?.Config?.name).ToList());
Logger.Log($"NODE: [{node?.body?.Config?.name}], [{node?.parent?.body?.Config?.name}], [{childrenString}]");
Logger.LogVerbose($"NODE: [{node?.body?.Config?.name}], [{node?.parent?.body?.Config?.name}], [{childrenString}]");
}
// Return all tree roots (no parents)

4
NewHorizons/Handlers/StarChartHandler.cs
View File

@ -97,7 +97,7 @@ namespace NewHorizons.Handlers
{
if (_factIDToStarSystem.TryGetValue(factID, out var systemUnlocked))
{
Logger.Log($"Just learned [{factID}] and unlocked [{systemUnlocked}]");
Logger.LogVerbose($"Just learned [{factID}] and unlocked [{systemUnlocked}]");
if (!Main.HasWarpDrive) Main.Instance.EnableWarpDrive();
ShipLogStarChartMode.AddSystemCard(systemUnlocked);
}
@ -105,7 +105,7 @@ namespace NewHorizons.Handlers
public static void RegisterFactForSystem(string factID, string system)
{
Logger.Log($"Need to know [{factID}] to unlock [{system}]");
Logger.LogVerbose($"Need to know [{factID}] to unlock [{system}]");
_starSystemToFactID.Add(system, factID);
_factIDToStarSystem.Add(factID, system);
}

4
NewHorizons/Handlers/TitleSceneHandler.cs
View File

@ -36,7 +36,7 @@ namespace NewHorizons.Handlers
var selectionCount = Mathf.Min(eligibleCount, 3);
var indices = RandomUtility.GetUniqueRandomArray(0, eligible.Count(), selectionCount);
Logger.Log($"Displaying {selectionCount} bodies on the title screen");
Logger.LogVerbose($"Displaying {selectionCount} bodies on the title screen");
GameObject body1, body2, body3;
@ -74,7 +74,7 @@ namespace NewHorizons.Handlers
private static GameObject LoadTitleScreenBody(NewHorizonsBody body)
{
Logger.Log($"Displaying {body.Config.name} on the title screen");
Logger.LogVerbose($"Displaying {body.Config.name} on the title screen");
GameObject titleScreenGO = new GameObject(body.Config.name + "_TitleScreen");
HeightMapModule heightMap = new HeightMapModule();
var minSize = 15;

6
NewHorizons/Handlers/VesselWarpHandler.cs
View File

@ -75,10 +75,10 @@ namespace NewHorizons.Handlers
{
var system = SystemDict[Instance.CurrentStarSystem];
Logger.Log("Checking for Vessel Prefab");
Logger.LogVerbose("Checking for Vessel Prefab");
if (VesselPrefab == null) return null;
Logger.Log("Creating Vessel");
Logger.LogVerbose("Creating Vessel");
var vesselObject = GameObject.Instantiate(VesselPrefab);
VesselObject = vesselObject;
vesselObject.name = VesselPrefab.name;
@ -159,7 +159,7 @@ namespace NewHorizons.Handlers
{
var system = SystemDict[Instance.CurrentStarSystem];
Logger.Log("Updating DB Vessel");
Logger.LogVerbose("Updating DB Vessel");
var vectorSector = SearchUtilities.Find("DB_VesselDimension_Body/Sector_VesselDimension");
VesselObject = vectorSector;

21
NewHorizons/Main.cs
View File

@ -76,7 +76,7 @@ namespace NewHorizons
public override void Configure(IModConfig config)
{
Logger.Log("Settings changed");
Logger.LogVerbose("Settings changed");
var currentScene = SceneManager.GetActiveScene().name;
@ -107,7 +107,7 @@ namespace NewHorizons
// Don't reload if we haven't configured yet (called on game start)
if (wasUsingCustomTitleScreen != _useCustomTitleScreen && SceneManager.GetActiveScene().name == "TitleScreen" && _wasConfigured)
{
Logger.Log("Reloading");
Logger.LogVerbose("Reloading");
SceneManager.LoadScene("TitleScreen", LoadSceneMode.Single);
}
@ -217,7 +217,7 @@ namespace NewHorizons
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
Logger.Log($"Scene Loaded: {scene.name} {mode}");
Logger.LogVerbose($"Scene Loaded: {scene.name} {mode}");
// Set time loop stuff if its enabled and if we're warping to a new place
if (IsChangingStarSystem && (SystemDict[_currentStarSystem].Config.enableTimeLoop || _currentStarSystem == "SolarSystem") && SecondsLeftInLoop > 0f)
@ -258,11 +258,6 @@ namespace NewHorizons
if (scene.name == "SolarSystem")
{
foreach (var body in GameObject.FindObjectsOfType<AstroObject>())
{
Logger.Log($"{body.name}, {body.transform.rotation}");
}
if (_ship != null)
{
_ship = SearchUtilities.Find("Ship_Body").InstantiateInactive();
@ -302,7 +297,7 @@ namespace NewHorizons
try
{
Logger.Log($"Star system loaded [{Instance.CurrentStarSystem}]");
Logger.Log($"Star system finished loading [{Instance.CurrentStarSystem}]");
Instance.OnStarSystemLoaded?.Invoke(Instance.CurrentStarSystem);
}
catch (Exception e)
@ -344,7 +339,7 @@ namespace NewHorizons
public void EnableWarpDrive()
{
Logger.Log("Setting up warp drive");
Logger.LogVerbose("Setting up warp drive");
PlanetCreationHandler.LoadBody(LoadConfig(this, "Assets/WarpDriveConfig.json"));
HasWarpDrive = true;
}
@ -368,7 +363,7 @@ namespace NewHorizons
{
var name = Path.GetFileNameWithoutExtension(file);
Logger.Log($"Loading system {name}");
Logger.LogVerbose($"Loading system {name}");
var relativePath = file.Replace(folder, "");
var starSystemConfig = mod.ModHelper.Storage.Load<StarSystemConfig>(relativePath);
@ -442,7 +437,7 @@ namespace NewHorizons
if (File.Exists($"{folder}{relativeFile}"))
{
Logger.Log($"Registering {language} translation from {mod.ModHelper.Manifest.Name} from {relativeFile}");
Logger.LogVerbose($"Registering {language} translation from {mod.ModHelper.Manifest.Name} from {relativeFile}");
var config = new TranslationConfig($"{folder}{relativeFile}");
@ -471,7 +466,7 @@ namespace NewHorizons
return null;
}
Logger.Log($"Loaded {config.name}");
Logger.LogVerbose($"Loaded {config.name}");
if (!SystemDict.ContainsKey(config.starSystem))
{

2
NewHorizons/Patches/PlayerSpawnerPatches.cs
View File

@ -9,7 +9,7 @@ namespace NewHorizons.Patches
[HarmonyPatch(typeof(PlayerSpawner), nameof(PlayerSpawner.SpawnPlayer))]
public static void PlayerSpawner_SpawnPlayer(PlayerSpawner __instance)
{
Logger.Log("Player spawning");
Logger.LogVerbose("Player spawning");
__instance.SetInitialSpawnPoint(Main.SystemDict[Main.Instance.CurrentStarSystem].SpawnPoint);
}
}

4
NewHorizons/Patches/ShipLogPatches.cs
View File

@ -21,7 +21,7 @@ namespace NewHorizons.Patches
{
RumorModeBuilder.Init();
ShipLogHandler.Init();
Logger.Log("Beginning Ship Log Generation For: " + Main.Instance.CurrentStarSystem);
Logger.Log($"Beginning Ship Log Generation For: {Main.Instance.CurrentStarSystem}");
if (Main.Instance.CurrentStarSystem != "SolarSystem")
{
__instance._shipLogXmlAssets = new TextAsset[] { };
@ -58,7 +58,7 @@ namespace NewHorizons.Patches
RumorModeBuilder.UpdateEntryCuriosity(ref logEntry);
}
Logger.Log("Ship Log Generation Complete For: " + Main.Instance.CurrentStarSystem);
Logger.Log($"Ship Log Generation Complete For: {Main.Instance.CurrentStarSystem}");
}
[HarmonyPrefix]

2
NewHorizons/Utility/AstroObjectLocator.cs
View File

@ -68,7 +68,7 @@ namespace NewHorizons.Utility
}
else
{
Logger.Log($"Registering [{ao.name}] as [{key}]");
Logger.LogVerbose($"Registering [{ao.name}] as [{key}]");
_customAstroObjectDictionary.Add(key, ao);
}
}

6
NewHorizons/Utility/AudioUtilities.cs
View File

@ -13,10 +13,10 @@ namespace NewHorizons.Utility
{
if (_loadedAudioClips.ContainsKey(path))
{
Logger.Log($"Already loaded audio at path: {path}");
Logger.LogVerbose($"Already loaded audio at path: {path}");
return _loadedAudioClips[path];
}
Logger.Log($"Loading audio at path: {path}");
Logger.LogVerbose($"Loading audio at path: {path}");
var task = Task.Run(async () => await GetAudioClip(path));
task.Wait();
_loadedAudioClips.Add(path, task.Result);
@ -25,7 +25,7 @@ namespace NewHorizons.Utility
public static void ClearCache()
{
Logger.Log("Clearing audio cache");
Logger.LogVerbose("Clearing audio cache");
foreach (var audioClip in _loadedAudioClips.Values)
{

4
NewHorizons/Utility/DebugMenu/DebugMenu.cs
View File

@ -200,7 +200,7 @@ namespace NewHorizons.Utility.DebugMenu
{
if (body.RelativePath == null)
{
Logger.Log($"Error loading config for {body.Config.name} in {body.Config.starSystem}");
Logger.LogWarning($"Error loading config for {body.Config.name} in {body.Config.starSystem}");
continue;
}
@ -219,7 +219,7 @@ namespace NewHorizons.Utility.DebugMenu
foreach (var filePath in loadedConfigFiles.Keys)
{
Logger.Log($"Possibly Saving... {loadedConfigFiles[filePath].name} @ {filePath}");
Logger.LogVerbose($"Possibly Saving... {loadedConfigFiles[filePath].name} @ {filePath}");
if (loadedConfigFiles[filePath].starSystem != Main.Instance.CurrentStarSystem) continue;

25
NewHorizons/Utility/DebugMenu/DebugMenuNomaiText.cs
View File

@ -101,7 +101,7 @@ namespace NewHorizons.Utility.DebugMenu
collapsed = true
};
Logger.Log("adding go " + conversationMetadata.conversationGo);
Logger.LogVerbose("Adding conversation Game Object " + conversationMetadata.conversationGo);
conversations.Add(conversationMetadata);
@ -128,7 +128,7 @@ namespace NewHorizons.Utility.DebugMenu
var parentID = (new Regex(regex)).Matches(metadata.spiralGo.name)[0].Groups[1].Value;
metadata.parentID = parentID == "" ? -1 : int.Parse(parentID);
Logger.Log("Parent id for '" + metadata.spiralGo.name + "' : " + parentID);
Logger.LogVerbose("Parent id for '" + metadata.spiralGo.name + "' : " + parentID);
}
conversationMetadata.spirals.Add(metadata);
@ -190,7 +190,7 @@ namespace NewHorizons.Utility.DebugMenu
if (GUILayout.Button(arrow + conversationMeta.planetConfig.name + " - " + i, menu._submenuStyle))
{
conversationMeta.collapsed = !conversationMeta.collapsed;
Logger.Log("BUTTON " + i);
Logger.LogVerbose("BUTTON " + i);
}
if (!conversationMeta.collapsed)
@ -204,7 +204,7 @@ namespace NewHorizons.Utility.DebugMenu
//conversationMeta.conversation.type == PropModule.NomaiTextInfo.NomaiTextType.Wall &&
GUILayout.Button("Place conversation with G")
) {
Logger.Log(conversationMeta.conversationGo+" 0");
Logger.LogVerbose(conversationMeta.conversationGo+" 0");
DebugNomaiTextPlacer.active = true;
_dnp.onRaycast = (DebugRaycastData data) =>
{
@ -423,7 +423,7 @@ namespace NewHorizons.Utility.DebugMenu
SpiralMetadata parentSpiralMeta = GetParent(spiralMetadata);
var parentPoints = parentSpiralMeta.spiralGo.GetComponent<NomaiTextLine>()._points;
Logger.Log("got parent and parent points");
Logger.Log("Got parent and parent points");
var prevPointOnParent = parentPoints[Mathf.Max(0, spiralMetadata.pointOnParent-1)];
var nextPointOnParent = parentPoints[Mathf.Min(parentPoints.Count()-1, spiralMetadata.pointOnParent+1)];
@ -432,14 +432,14 @@ namespace NewHorizons.Utility.DebugMenu
var newRotationRelativeToParent = parentTangent + 90;
spiralMetadata.spiral.zRotation = parentSpiralMeta.spiral.zRotation + newRotationRelativeToParent;
Logger.Log("got zRotation: " + newRotationRelativeToParent + " -=- " + spiralMetadata.spiral.zRotation);
Logger.Log("Got zRotation: " + newRotationRelativeToParent + " -=- " + spiralMetadata.spiral.zRotation);
var pointOnParent = parentPoints[spiralMetadata.pointOnParent];
var selfBasePoint = spiralMetadata.spiralGo.GetComponent<NomaiTextLine>()._points[0];
var newPointRelativeToParent = -selfBasePoint + pointOnParent;
spiralMetadata.spiral.position = parentSpiralMeta.spiral.position + new Vector2(newPointRelativeToParent.x, newPointRelativeToParent.y);
Logger.Log("got position " + newPointRelativeToParent + " -=- " + spiralMetadata.spiral.position);
Logger.Log("Got position " + newPointRelativeToParent + " -=- " + spiralMetadata.spiral.position);
spiralMetadata.spiralGo.transform.localPosition = new Vector3(spiralMetadata.spiral.position.x, spiralMetadata.spiral.position.y, 0);
spiralMetadata.spiralGo.transform.localEulerAngles = new Vector3(0, 0, spiralMetadata.spiral.zRotation);
@ -450,9 +450,9 @@ namespace NewHorizons.Utility.DebugMenu
private void UpdateChildrenLocations(SpiralMetadata parentSprialMetadata)
{
Logger.Log("updating children");
Logger.Log("Updating children");
ConversationMetadata convoMeta = conversations.Where(m => m.conversation == parentSprialMetadata.conversation).First();
Logger.Log("got convo meta");
Logger.Log("Got conversation metadata");
convoMeta.spirals
.Where(spiralMeta => spiralMeta.parentID == parentSprialMetadata.id && spiralMeta.id != parentSprialMetadata.id)
@ -482,15 +482,10 @@ namespace NewHorizons.Utility.DebugMenu
{
var nomaiWallTextObj = conversationMetadata.conversationGo;
if (nomaiWallTextObj == null) return;
var planetGO = sectorParent;
var info = conversationMetadata.conversation;
Logger.Log(nomaiWallTextObj + " 1");
Logger.Log(nomaiWallTextObj?.transform + " 2");
Logger.Log(planetGO + " 3");
Logger.Log(planetGO?.transform + " 4");
Logger.Log(info + " 5");
Logger.Log(info?.position + " 6");
nomaiWallTextObj.transform.position = planetGO.transform.TransformPoint(info.position);
if (info.normal != null)
{

8
NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs
View File

@ -311,14 +311,14 @@ namespace NewHorizons.Utility.DebugMenu
// Get all configs
foreach (var filePath in menu.loadedConfigFiles.Keys)
{
Logger.Log($"Potentially updating copy of config at {filePath}");
Logger.Log($"{menu.loadedConfigFiles[filePath].name} {AstroObjectLocator.GetAstroObject(menu.loadedConfigFiles[filePath].name)?.name}");
Logger.Log($"{menu.loadedConfigFiles[filePath].name}");
Logger.LogVerbose($"Potentially updating copy of config at {filePath}");
Logger.LogVerbose($"{menu.loadedConfigFiles[filePath].name} {AstroObjectLocator.GetAstroObject(menu.loadedConfigFiles[filePath].name)?.name}");
Logger.LogVerbose($"{menu.loadedConfigFiles[filePath].name}");
if (menu.loadedConfigFiles[filePath].starSystem != Main.Instance.CurrentStarSystem) return;
if (menu.loadedConfigFiles[filePath].name == null || AstroObjectLocator.GetAstroObject(menu.loadedConfigFiles[filePath].name) == null)
{
Logger.Log("Failed to update copy of config at " + filePath);
Logger.LogWarning("Failed to update copy of config at " + filePath);
continue;
}

8
NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs
View File

@ -98,7 +98,7 @@ namespace NewHorizons.Utility.DebugUtilities
if (!data.hitBodyGameObject.name.EndsWith("_Body"))
{
Logger.Log("Cannot place object on non-body object: " + data.hitBodyGameObject.name);
Logger.LogWarning("Cannot place object on non-body object: " + data.hitBodyGameObject.name);
}
try
@ -115,7 +115,7 @@ namespace NewHorizons.Utility.DebugUtilities
}
catch
{
Logger.Log($"Failed to place object {currentObject} on body ${data.hitBodyGameObject} at location ${data.pos}.");
Logger.LogError($"Failed to place object {currentObject} on body ${data.hitBodyGameObject} at location ${data.pos}.");
}
}
@ -198,7 +198,7 @@ namespace NewHorizons.Utility.DebugUtilities
//var body = AstroObjectLocator.GetAstroObject(bodyGameObjectName);
Logger.Log($"Adding prop to {Main.Instance.CurrentStarSystem}::{body.name}");
Logger.LogVerbose($"Adding prop to {Main.Instance.CurrentStarSystem}::{body.name}");
detailInfo = detailInfo == null ? new DetailInfo() : detailInfo;
@ -230,7 +230,7 @@ namespace NewHorizons.Utility.DebugUtilities
if (bodyProps == null || bodyProps.Count == 0) continue;
if (bodyProps[0].body == null) continue;
var body = bodyProps[0].body;
Logger.Log("getting prop group for body " + body.name);
Logger.LogVerbose("getting prop group for body " + body.name);
//string bodyName = GetAstroObjectName(bodyProps[0].body);
DetailInfo[] infoArray = new DetailInfo[bodyProps.Count];

4
NewHorizons/Utility/DebugUtilities/DebugRaycaster.cs
View File

@ -43,7 +43,7 @@ namespace NewHorizons.Utility.DebugUtilities
if (!data.hit)
{
Logger.Log("Debug Raycast Didn't Hit Anything! (Try moving closer)");
Logger.LogWarning("Debug Raycast Didn't Hit Anything! (Try moving closer)");
return;
}
@ -120,7 +120,7 @@ namespace NewHorizons.Utility.DebugUtilities
if (Vector3.Cross(U, N) == Vector3.zero) U = new Vector3(0, 0, 1);
if (Vector3.Cross(U, N) == Vector3.zero) U = new Vector3(0, 1, 0); // if 0,0,1 was actually the same vector U already was (lol), try (0,1,0) instead
Logger.Log("Up vector is " + U.ToString());
Logger.LogVerbose("Up vector is " + U.ToString());
// stackoverflow.com/a/9605695
// I don't know exactly how this works, but I'm projecting a point that is located above the plane's origin, relative to the planet, onto the plane. this gets us our v vector

10
NewHorizons/Utility/ImageUtilities.cs
View File

@ -31,11 +31,11 @@ namespace NewHorizons.Utility
var path = mod.ModHelper.Manifest.ModFolderPath + filename;
if (_loadedTextures.ContainsKey(path))
{
Logger.Log($"Already loaded image at path: {path}");
Logger.LogVerbose($"Already loaded image at path: {path}");
return _loadedTextures[path];
}
Logger.Log($"Loading image at path: {path}");
Logger.LogVerbose($"Loading image at path: {path}");
try
{
var data = File.ReadAllBytes(path);
@ -70,7 +70,7 @@ namespace NewHorizons.Utility
public static void ClearCache()
{
Logger.Log("Clearing image cache");
Logger.LogVerbose("Clearing image cache");
foreach (var texture in _loadedTextures.Values)
{
@ -368,7 +368,7 @@ namespace NewHorizons.Utility
{
if (_loadedTextures.ContainsKey(url))
{
Logger.Log($"Already loaded image at path: {url}");
Logger.LogVerbose($"Already loaded image at path: {url}");
var texture = _loadedTextures[url];
imageLoadedEvent.Invoke(texture, index);
yield break;
@ -390,7 +390,7 @@ namespace NewHorizons.Utility
if (_loadedTextures.ContainsKey(url))
{
Logger.Log($"Already loaded image at path: {url}");
Logger.LogVerbose($"Already loaded image at path: {url}");
Destroy(texture);
texture = _loadedTextures[url];
}

129
NewHorizons/Utility/Logger.cs
View File

@ -1,85 +1,50 @@
using OWML.Common;
using System;
using System.ComponentModel;
using UnityEngine;
namespace NewHorizons.Utility
{
public static class Logger
{
private static LogType _logLevel = LogType.Error;
public static void UpdateLogLevel(LogType newLevel)
{
_logLevel = newLevel;
}
public static void LogProperties(UnityEngine.Object obj)
{
foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(obj))
{
string name = descriptor?.Name;
object value;
try
{
value = descriptor.GetValue(obj);
}
catch (Exception)
{
value = null;
}
Log($"{obj.name} {name}={value}");
}
}
public static void LogPath(GameObject go)
{
if (go == null) Log("Can't print path: GameObject is null");
else Log($"{go.transform.GetPath()}");
}
public static void Log(string text, LogType type)
{
if ((int)type < (int)_logLevel) return;
Main.Instance.ModHelper.Console.WriteLine(Enum.GetName(typeof(LogType), type) + " : " + text, LogTypeToMessageType(type));
}
using OWML.Common;
using System;
using System.ComponentModel;
using UnityEngine;
namespace NewHorizons.Utility
{
public static class Logger
{
public static void LogVerbose(string text)
private static LogType _logLevel = LogType.Error;
public static void UpdateLogLevel(LogType newLevel)
{
_logLevel = newLevel;
}
public static void Log(string text, LogType type)
{
if ((int)type < (int)_logLevel) return;
Main.Instance.ModHelper.Console.WriteLine($"{Enum.GetName(typeof(LogType), type)} : {text}", LogTypeToMessageType(type));
}
public static void Log(string text) => Log(text, LogType.Log);
public static void LogVerbose(string text) => Log(text, LogType.Verbose);
public static void LogError(string text) => Log(text, LogType.Error);
public static void LogWarning(string text) => Log(text, LogType.Warning);
public enum LogType
{
Log(text, LogType.Verbose);
}
public static void Log(string text)
{
Log(text, LogType.Log);
}
public static void LogError(string text)
{
Log(text, LogType.Error);
}
public static void LogWarning(string text)
{
Log(text, LogType.Warning);
}
public enum LogType
{
Todo,
Verbose,
Log,
Warning,
Error,
}
private static MessageType LogTypeToMessageType(LogType t)
{
switch (t)
{
case LogType.Error:
return MessageType.Error;
case LogType.Warning:
return MessageType.Warning;
default:
return MessageType.Info;
}
}
}
}
Verbose,
Log,
Warning,
Error,
}
private static MessageType LogTypeToMessageType(LogType t)
{
switch (t)
{
case LogType.Error:
return MessageType.Error;
case LogType.Warning:
return MessageType.Warning;
default:
return MessageType.Info;
}
}
}
}

2
NewHorizons/Utility/NewHorizonExtensions.cs
View File

@ -146,7 +146,7 @@ namespace NewHorizons.Utility
bool xCorrect = nomaiCoordinateInterface._nodeControllers[0].CheckCoordinate(coordinates.x);
bool yCorrect = nomaiCoordinateInterface._nodeControllers[1].CheckCoordinate(coordinates.y);
bool zCorrect = nomaiCoordinateInterface._nodeControllers[2].CheckCoordinate(coordinates.z);
Utility.Logger.Log($"Coordinate Check for {system}: {xCorrect}, {yCorrect}, {zCorrect} [{string.Join("-", coordinates.x)}, {string.Join("-", coordinates.y)}, {string.Join("-", coordinates.z)}]");
Utility.Logger.LogVerbose($"Coordinate Check for {system}: {xCorrect}, {yCorrect}, {zCorrect} [{string.Join("-", coordinates.x)}, {string.Join("-", coordinates.y)}, {string.Join("-", coordinates.z)}]");
return xCorrect && yCorrect && zCorrect;
}
}

2
NewHorizons/Utility/SearchUtilities.cs
View File

@ -13,7 +13,7 @@ namespace NewHorizons.Utility
public static void ClearCache()
{
Logger.Log("Clearing search cache");
Logger.LogVerbose("Clearing search cache");
CachedGameObjects.Clear();
}

4
NewHorizons/VoiceActing/VoiceHandler.cs
View File

@ -16,7 +16,7 @@ namespace NewHorizons.VoiceActing
if (API == null)
{
Logger.Log("VoiceMod isn't installed");
Logger.LogVerbose("VoiceMod isn't installed");
Enabled = false;
return;
}
@ -33,7 +33,7 @@ namespace NewHorizons.VoiceActing
}
else
{
Logger.Log($"Didn't find VoiceMod audio for {mod.ModHelper.Manifest.Name} at {folder}");
Logger.LogVerbose($"Didn't find VoiceMod audio for {mod.ModHelper.Manifest.Name} at {folder}");
}
}
}