From 48f501947cb55a254449534368585b76f9b98b65 Mon Sep 17 00:00:00 2001
From: Noah Pilarski <mehmehmeh313@gmail.com>
Date: Thu, 18 Aug 2022 08:51:09 -0400
Subject: [PATCH] I don't know how I should structure this

---
 NewHorizons/Builder/Body/StarBuilder.cs       | 25 -------------------
 NewHorizons/Handlers/PlanetCreationHandler.cs | 12 +++++++++
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs
index bb50f72e..cc505a73 100644
--- a/NewHorizons/Builder/Body/StarBuilder.cs
+++ b/NewHorizons/Builder/Body/StarBuilder.cs
@@ -190,11 +190,6 @@ namespace NewHorizons.Builder.Body
             shockLayerRuleset._outerRadius = starModule.size * OuterRadiusRatio;
             if (starModule.tint != null) shockLayerRuleset._color *= starModule.tint.ToColor();
 
-            var stellarRemnant = MakeStellarRemnant(planetGO, sector, starModule);
-
-            controller.SetStellarRemnantController(stellarRemnant);
-
-
             return starController;
         }
 
@@ -228,12 +223,6 @@ namespace NewHorizons.Builder.Body
 
             planet.GetComponentInChildren<StarEvolutionController>(true).SetProxy(controller);
 
-            var stellarRemnant = MakeStellarRemnant(proxyGO, null, starModule);
-
-            planet.GetComponentInChildren<StellarRemnantController>(true).SetProxy(stellarRemnant);
-
-            controller.SetStellarRemnantController(stellarRemnant);
-
             return proxyGO;
         }
 
@@ -354,19 +343,5 @@ namespace NewHorizons.Builder.Body
 
             return supernova;
         }
-
-        public static StellarRemnantController MakeStellarRemnant(GameObject rootObject, Sector sector, StarModule starModule)
-        {
-            var stellarRemnant = new GameObject("StellarRemnant");
-            stellarRemnant.transform.SetParent(sector?.transform ?? rootObject.transform, false);
-            stellarRemnant.SetActive(false);
-
-            var controller = stellarRemnant.AddComponent<StellarRemnantController>();
-            controller.SetStarEvolutionController(rootObject.GetComponentInChildren<StarEvolutionController>());
-
-            stellarRemnant.SetActive(true);
-
-            return controller;
-        }
     }
 }
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index 820aa876..05716ee1 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -5,6 +5,7 @@ using NewHorizons.Builder.Orbital;
 using NewHorizons.Builder.Props;
 using NewHorizons.Components;
 using NewHorizons.Components.Orbital;
+using NewHorizons.Components.SizeControllers;
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
 using System;
@@ -203,6 +204,17 @@ namespace NewHorizons.Handlers
                     {
                         try
                         {
+                            var rb = existingPlanet.GetComponent<OWRigidbody>();
+
+                            var sector = SectorBuilder.Make(existingPlanet, rb, GetSphereOfInfluence(body));
+                            sector.name = $"StellarRemnant";
+
+                            var stellarRemnantController = sector.gameObject.AddComponent<StellarRemnantController>();
+                            var starEvolutionController = existingPlanet.GetComponentInChildren<StarEvolutionController>(true);
+                            stellarRemnantController.SetStarEvolutionController(starEvolutionController);
+                            starEvolutionController.SetStellarRemnantController(stellarRemnantController);
+
+                            SharedGenerateBody(body, existingPlanet, sector, rb);
                         }
                         catch (Exception ex)
                         {