use new setMain

Author: smell-of-curry

scripts/ui/phud/phone.ts

@@ -115,12 +115,11 @@ export default defineUI("phud_phone", (ns) => {
     .anims(animRef("phud_phone", "anim__jeb_loop_show__0"))
     .variable("$condition", prefix(4, "#value", "loop"));
 
-  const [, finalNs] = ns.add(
+  return ns.setMain(
     panel("main")
       .anchor("left_middle")
       .offset(8, 0)
       .size(64, 64)
       .controls(icons, backgrounds, jebBackground)
   );
-  return finalNs;
 });

scripts/ui/phud/phud.ts

@@ -116,8 +116,5 @@ export default defineUI("phud", (ns) => {
     .bindings(...siblingBindings())
     .controls(...elementRefs());
 
-  const [, finalNs] = ns1.add(
-    panel("main").fullSize().controls(renderers, elements)
-  );
-  return finalNs;
+  return ns1.setMain(panel("main").fullSize().controls(renderers, elements));
 });

scripts/ui/phud/sidebar.ts

@@ -121,7 +121,7 @@ export default defineUI("phud_sidebar", (ns) => {
     .variable("var_index", varRef("pokemon_active_index"))
     .controls(activeIcon);
 
-  const [pokemonSlotTemplate] = ns1.add(
+  const [pokemonSlotTemplate, ns2] = ns1.add(
     panel("pokemon_sidebar_pokemon")
       .size("default", 30)
       .variableDefaults({
@@ -164,7 +164,7 @@ export default defineUI("phud_sidebar", (ns) => {
 
   pokemonHolder.controls(...controls);
 
-  const [, finalNs] = ns1.add(
+  return ns2.setMain(
     image("main", "textures/ui/sidebar/dock")
       .anchor("right_middle")
       .size("default", "80%")
@@ -175,5 +175,4 @@ export default defineUI("phud_sidebar", (ns) => {
       .controls(pokemonHolder)
       .bindings(...phudVisibility("#sidebar"))
   );
-  return finalNs;
 });

scripts/ui/pokemon/pc.ts

@@ -250,8 +250,7 @@ export default defineUI("pc", (ns) => {
     .size(71, "100%c")
     .controls(iconBox, panel("spacer").size("default", 0.5), actionButtonBox);
 
-  // Main PC layout
-  const [, finalNs] = ns.add(
+  return ns.setMain(
     stackPanel("main", "horizontal")
       .offset("25%", "25%")
       .controls(
@@ -262,5 +261,4 @@ export default defineUI("pc", (ns) => {
         rightContentNs
       )
   );
-  return finalNs;
 });