sort plugins by scene controllers first

alexpineda · Nov 18, 2023 · 4319e54 · 4319e54
1 parent e3fe562
commit 4319e54
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/src/configuration-ui/plugins-configuration.tsx b/src/configuration-ui/plugins-configuration.tsx
@@ -36,10 +36,10 @@ export const PluginsConfiguration = ({
     setBanner: React.Dispatch<React.SetStateAction<string>>;
 }) => {
     const [ tabIndex, setTabIndex ] = useState( 0 );
-    const plugins = useStore( window.deps.usePluginsStore );
+    const { plugins } = useStore( window.deps.usePluginsStore );
 
     const [ plugin, setSelectedPluginPackage ] = useState<PluginMetaData | undefined>(
-        plugins.plugins[0]
+        plugins[0]
     );
 
     const oldConfig = useRef( plugin?.config );
@@ -86,8 +86,15 @@ export const PluginsConfiguration = ({
                                 display: "flex",
                                 flexDirection: "column",
                             }}>
-                            {plugins.plugins
-                                .sort()
+                            {plugins
+                                .sort((a, b) => {
+                                    if (a.isSceneController && !b.isSceneController) {
+                                        return -1;
+                                    } else if (!a.isSceneController && b.isSceneController) {
+                                        return 1;
+                                    }
+                                    return (a.description ?? a.name).localeCompare(b.description ?? b.name);
+                                })
                                 .map( ( plugin ) => localPluginButton( plugin, !plugin.config?._enabled?.value ) )}
                         </div>
                     </Tab>
@@ -104,7 +111,7 @@ export const PluginsConfiguration = ({
                     {plugin?.description ?? plugin?.name} - {plugin?.version}
                 </h2>
 
-                {plugin && plugins.plugins.includes( plugin ) && (
+                {plugin && plugins.includes( plugin ) && (
                     <>
                         {!isDeprecated( plugin ) && (
                             <DetailSheet

diff --git a/src/core/unit-entities.ts b/src/core/unit-entities.ts
@@ -3,7 +3,6 @@ import { Unit } from "@core/unit";
 import gameStore from "@stores/game-store";
 import { IterableMap } from "@utils/data-structures/iteratible-map";
 
-//TODO: Deprecate
 // The primary purpose of this class is to provide a storage for damage effects, and serialization to plugins ui
 // We can store damage effects in a map, and we can serialize the map to plugins ui via an ArrayBuffer of unitData
 export class UnitEntities {

diff --git a/src/render/vr/vr-button-react.tsx b/src/render/vr/vr-button-react.tsx
@@ -54,7 +54,7 @@ const VRButtonReact: React.FC<VRButtonProps> = ({ renderer }) => {
     }
   };
 
-  const buttonText = isSupported ? (currentSession ? "EXIT VR" : "ENTER VR") : 'VR NOT SUPPORTED';
+  const buttonText = isSupported ? (currentSession ? "Exit VR" : "Enter VR") : 'VR Not Supported';
 
   return (
     <InGameMenuButton onClick={handleClick} background={isSupported ? "var(--blue-5)" : "var(--gray-5)"}

diff --git a/src/stores/plugin-repository.ts b/src/stores/plugin-repository.ts
@@ -146,7 +146,7 @@ export class PluginsRepository {
         let isSceneController = false;
 
         const hostFile = plugin.files.includes("host.js")
-            ? await fetch(`${pluginRootUrl}/dist/host.js`)
+            ? await fetch(urlJoin(pluginRootUrl, "dist", "host.js"))
                   .then(async (r) => {
                       isSceneController = (await r.text()).includes("onEnterScene");
                       return true;
@@ -155,13 +155,13 @@ export class PluginsRepository {
             : null;
 
         const uiFile = plugin.files.includes("ui.js")
-            ? await fetch(`${pluginRootUrl}/dist/ui.js`)
+            ? await fetch(urlJoin(pluginRootUrl, "dist", "ui.js"))
                   .then(() => true)
                   .catch(() => false)
             : "";
 
         const readme = plugin.files.includes("readme.md")
-            ? await fetch(`${pluginRootUrl}/readme.md`)
+            ? await fetch(urlJoin(pluginRootUrl, "readme.md"))
                   .then((r) => r.text())
                   .catch(() => undefined)
             : undefined;

diff --git a/src/utils/data-structures/iterable-set.ts b/src/utils/data-structures/iterable-set.ts
@@ -59,6 +59,10 @@ export class IterableSet<T> {
         this.onChange( this.#copy );
     }
 
+    get(index: number) {
+        return this.#copy[index];
+    }
+
     [Symbol.iterator]() {
         return this.#copy[Symbol.iterator]();
     }