From 824a9fa0a9f4c2f9c6949f89d53dbd3761839b2e Mon Sep 17 00:00:00 2001
From: Sakamoto Shiina <68018796+ShiinaSakamoto@users.noreply.github.com>
Date: Tue, 25 Mar 2025 17:57:03 +0900
Subject: [PATCH] [Update] Plugins: Move location from index to
 plugin_info.json.

---
 src-tauri/plugins/plugin_examples/index.jsx        |  5 +----
 src-tauri/plugins/plugin_examples/plugin_info.json |  1 +
 src-ui/logics/configs/plugins/usePlugins.js        | 11 +++++------
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src-tauri/plugins/plugin_examples/index.jsx b/src-tauri/plugins/plugin_examples/index.jsx
index 64c0fe86..4ded2716 100644
--- a/src-tauri/plugins/plugin_examples/index.jsx
+++ b/src-tauri/plugins/plugin_examples/index.jsx
@@ -8,10 +8,7 @@ export const init = (plugin_context) => {
         return <MainContainer />;
     };
 
-    plugin_context.registerComponent({
-        location: "main_section",
-        component: EntryComponents,
-    });
+    plugin_context.registerComponent(EntryComponents);
 };
 
 export default init;
\ No newline at end of file
diff --git a/src-tauri/plugins/plugin_examples/plugin_info.json b/src-tauri/plugins/plugin_examples/plugin_info.json
index ffcd0a76..303f0ecb 100644
--- a/src-tauri/plugins/plugin_examples/plugin_info.json
+++ b/src-tauri/plugins/plugin_examples/plugin_info.json
@@ -2,6 +2,7 @@
     "title": "VRCT Example Plugins 1",
     "plugin_id": "vrct_plugin_example_1",
     "asset_name": "vrct_plugin_example_1.zip",
+    "location": "main_section",
     "plugin_version": "0.0.1",
     "min_supported_vrct_version": "3.0.4",
     "max_supported_vrct_version": "3.0.6"
diff --git a/src-ui/logics/configs/plugins/usePlugins.js b/src-ui/logics/configs/plugins/usePlugins.js
index f0a4073b..984ee189 100644
--- a/src-ui/logics/configs/plugins/usePlugins.js
+++ b/src-ui/logics/configs/plugins/usePlugins.js
@@ -23,7 +23,6 @@ const PLUGIN_LIST_URL = "https://raw.githubusercontent.com/ShiinaSakamoto/vrct_p
 
 export const usePlugins = () => {
     const { asyncStdoutToPython } = useStdoutToPython();
-    // const { currentLoadedPluginsList, updateLoadedPluginsList } = useStore_LoadedPluginsList();
     const { currentSavedPluginsStatus, updateSavedPluginsStatus, pendingSavedPluginsStatus } = useStore_SavedPluginsStatus();
     const { currentPluginsData, updatePluginsData, pendingPluginsData } = useStore_PluginsData();
     const { currentSoftwareVersion } = useSoftwareVersion();
@@ -32,22 +31,22 @@ export const usePlugins = () => {
 
     const generatePluginContext= (plugin_info) => {
         const plugin_context = {
-            registerComponent: ({ location, component }) => {
-                if (!plugin_info.plugin_id || !location || !component) {
-                    return console.error("An invalid plugin was detected.", plugin_info.plugin_id, location, component);
+            registerComponent: (component) => {
+                if (!plugin_info.plugin_id || !plugin_info.location || !component) {
+                    return console.error("An invalid plugin was detected.", plugin_info.plugin_id, plugin_info.location, component);
                 }
                 updatePluginsData(prev => {
                     const is_already_registered = prev.data.some(old_value => old_value.plugin_id === plugin_info.plugin_id);
 
                     const new_value = prev.data.map(old_value =>
                         old_value.plugin_id === plugin_info.plugin_id
-                            ? { ...old_value, ...plugin_info, location, component, is_downloaded: true }
+                            ? { ...old_value, ...plugin_info, location: plugin_info.location, component, is_downloaded: true }
                             : old_value
                     );
 
                     return is_already_registered
                         ? new_value
-                        : [...new_value, { plugin_id: plugin_info.plugin_id, location, component, is_downloaded: true }];
+                        : [...new_value, { plugin_id: plugin_info.plugin_id, location: plugin_info.location, component, is_downloaded: true }];
                 });
             },
             createAtomWithHook: (...args) => createAtomWithHook(...args)