From 20a4d6e82b6fc6e344231abc1faa73fe3328f493 Mon Sep 17 00:00:00 2001 From: "Nick J. Connors" Date: Fri, 4 Feb 2022 01:24:01 -0500 Subject: [PATCH] Forgot some stuff --- NewHorizons/Builder/Body/SandBuilder.cs | 4 ++-- NewHorizons/Builder/Props/DetailBuilder.cs | 7 ++----- NewHorizons/manifest.json | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/NewHorizons/Builder/Body/SandBuilder.cs b/NewHorizons/Builder/Body/SandBuilder.cs index 18773752..958923c1 100644 --- a/NewHorizons/Builder/Body/SandBuilder.cs +++ b/NewHorizons/Builder/Body/SandBuilder.cs @@ -25,8 +25,8 @@ namespace NewHorizons.Builder.Body sandMR.CopyPropertiesFrom(oldMR); sandMR.sharedMaterials = new Material[] { - new Material(sandMaterials[0]), - new Material(sandMaterials[1]) + new Material(sandMaterials[0]), + new Material(sandMaterials[1]) }; GameObject.Destroy(oldMR); sandMR.sharedMaterials[0].color = module.Tint.ToColor32(); diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 3b0370f0..86d1dea7 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -39,10 +39,7 @@ namespace NewHorizons.Builder.Props public static GameObject MakeDetail(GameObject go, Sector sector, string propToClone, MVector3 position, MVector3 rotation, float scale, bool alignWithNormal, bool generateColliders) { - var prefab = GameObject.Find(propToClone); - - //TODO: this is super costly I think - if (prefab == null) prefab = SearchUtilities.FindObjectOfTypeAndName(propToClone.Split(new char[] { '\\', '/' }).Last()); + var prefab = SearchUtilities.Find(propToClone); if (prefab == null) Logger.LogError($"Couldn't find detail {propToClone}"); return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal, generateColliders); } @@ -66,7 +63,7 @@ namespace NewHorizons.Builder.Props foreach (var assetBundle in assetBundles) { - sector.OnOccupantEnterSector += ((SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle)); + sector.OnOccupantEnterSector += (SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle); StreamingManager.LoadStreamingAssets(assetBundle); } diff --git a/NewHorizons/manifest.json b/NewHorizons/manifest.json index 912c9ed5..636d4592 100644 --- a/NewHorizons/manifest.json +++ b/NewHorizons/manifest.json @@ -3,7 +3,7 @@ "author": "xen", "name": "New Horizons", "uniqueName": "xen.NewHorizons", - "version": "0.7.5", + "version": "0.8.0", "owmlVersion": "2.1.0", "dependencies": [ "PacificEngine.OW_CommonResources" ], "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "Vesper.OuterWildsMMO", "Vesper.AutoResume" ]