Forgot some stuff

This commit is contained in:
Nick J. Connors 2022-02-04 01:24:01 -05:00
parent c322fe15f6
commit 20a4d6e82b
3 changed files with 5 additions and 8 deletions

View File

@ -25,8 +25,8 @@ namespace NewHorizons.Builder.Body
sandMR.CopyPropertiesFrom(oldMR); sandMR.CopyPropertiesFrom(oldMR);
sandMR.sharedMaterials = new Material[] sandMR.sharedMaterials = new Material[]
{ {
new Material(sandMaterials[0]), new Material(sandMaterials[0]),
new Material(sandMaterials[1]) new Material(sandMaterials[1])
}; };
GameObject.Destroy(oldMR); GameObject.Destroy(oldMR);
sandMR.sharedMaterials[0].color = module.Tint.ToColor32(); sandMR.sharedMaterials[0].color = module.Tint.ToColor32();

View File

@ -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) 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); var prefab = SearchUtilities.Find(propToClone);
//TODO: this is super costly I think
if (prefab == null) prefab = SearchUtilities.FindObjectOfTypeAndName<GameObject>(propToClone.Split(new char[] { '\\', '/' }).Last());
if (prefab == null) Logger.LogError($"Couldn't find detail {propToClone}"); if (prefab == null) Logger.LogError($"Couldn't find detail {propToClone}");
return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal, generateColliders); return MakeDetail(go, sector, prefab, position, rotation, scale, alignWithNormal, generateColliders);
} }
@ -66,7 +63,7 @@ namespace NewHorizons.Builder.Props
foreach (var assetBundle in assetBundles) foreach (var assetBundle in assetBundles)
{ {
sector.OnOccupantEnterSector += ((SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle)); sector.OnOccupantEnterSector += (SectorDetector sd) => StreamingManager.LoadStreamingAssets(assetBundle);
StreamingManager.LoadStreamingAssets(assetBundle); StreamingManager.LoadStreamingAssets(assetBundle);
} }

View File

@ -3,7 +3,7 @@
"author": "xen", "author": "xen",
"name": "New Horizons", "name": "New Horizons",
"uniqueName": "xen.NewHorizons", "uniqueName": "xen.NewHorizons",
"version": "0.7.5", "version": "0.8.0",
"owmlVersion": "2.1.0", "owmlVersion": "2.1.0",
"dependencies": [ "PacificEngine.OW_CommonResources" ], "dependencies": [ "PacificEngine.OW_CommonResources" ],
"conflicts": [ "Raicuparta.QuantumSpaceBuddies", "Vesper.OuterWildsMMO", "Vesper.AutoResume" ] "conflicts": [ "Raicuparta.QuantumSpaceBuddies", "Vesper.OuterWildsMMO", "Vesper.AutoResume" ]