fix: correct order of package removal in VRChat CI workflow #minor

fix: correct package removal command in VRChat CI workflow #minor

fix: comment out unused authentication cookies in VRChat CI workflow #minor

Update vrchat-world-ci.yml

Author: BenjiThatFoxGuy

.github/workflows/vrchat-world-ci.yml

@@ -94,11 +94,11 @@ jobs:
           vrc-get remove dev.foxscore.easy-login au.benjithatfoxguy.templates.world.2022.3.22f1.updater com.nidonocu.vrcunitytoolbar au.benjithatfoxguy.batchimportunitypackage au.benjithatfoxguy.restartunity dev.hai-vr.resilience.let-me-see dev.hai-vr.resilience.toolkit unity-editor-dark-mode -y
           vrc-get remove numeira.auto-certify-copyright-agreement -y
 
-      - name: Add AutoBuild Packages to Workspace
-        if: runner.os == 'Linux'
-        working-directory: ${{ env.workspace-path }}
-        # run: vrc-get install com.yuxiaviation.vrchat.autobuild.world 0.3.0 -y
-        run: vrc-get install com.yuxiaviation.vrchat.autobuild.world -y || true
+      # - name: Add AutoBuild Packages to Workspace
+      #   if: runner.os == 'Linux'
+      #   working-directory: ${{ env.workspace-path }}
+      #   # run: vrc-get install com.yuxiaviation.vrchat.autobuild.world 0.3.0 -y
+      #   run: vrc-get install com.yuxiaviation.vrchat.autobuild.world -y || true
 
       - name: Add AutoBuild Packages to Workspace
         if: runner.os == 'Windows'

Packages/com.yuxiaviation.vrchat.autobuild.world/Editor.meta

@@ -0,0 +1,127 @@
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using UnityEditor;
+using UnityEngine;
+using VRC.SDK3.Editor;
+using VRC.SDKBase.Editor.Api;
+
+namespace VRChatAerospaceUniversity.VRChatAutoBuild.Worlds {
+    internal static class AutoBuildVRChatWorld {
+        [PublicAPI]
+        private static async void BuildWorld() {
+            try {
+                await AutoBuildBase.InitAutoBuildAsync();
+            }
+            catch (Exception e) {
+                AutoBuildBase.ExitWithException(e);
+                return;
+            }
+
+            AutoBuildLogger.BeginLogGroup("Build world");
+            AutoBuildLogger.Log("Building world");
+            try {
+                await BuildAsync();
+            }
+            catch (Exception e) {
+                AutoBuildBase.ExitWithException(e);
+                return;
+            }
+
+            AutoBuildLogger.Log("World build complete");
+            AutoBuildLogger.EndLogGroup();
+            EditorApplication.Exit(0);
+        }
+
+        [PublicAPI]
+        private static async void BuildAndUploadWorld() {
+            AutoBuildArguments args;
+            try {
+                args = await AutoBuildBase.InitAutoBuildAsync();
+            }
+            catch (Exception e) {
+                AutoBuildBase.ExitWithException(e);
+                return;
+            }
+
+            var worldId = args.ContentId;
+
+            AutoBuildLogger.BeginLogGroup("Build and upload world");
+            AutoBuildLogger.Log("Building world");
+
+            try {
+                await BuildAsync();
+            }
+            catch (Exception e) {
+                AutoBuildBase.ExitWithException(e);
+                return;
+            }
+
+            AutoBuildLogger.Log("World build complete");
+
+            AutoBuildLogger.Log($"Fetching world: {worldId}");
+            var world = await FetchWorldAsync(worldId);
+            AutoBuildLogger.Log(
+                $"Fetched world: [{world.ID}] {world.Name} by {world.AuthorName}\nDescription: {world.Description}");
+
+            AutoBuildLogger.Log(
+                $"Uploading world: [{world.ID}] {world.Name} by {world.AuthorName}\nDescription: {world.Description}");
+            try
+            {
+                await UploadAsync(world);
+            } catch (Exception e)
+            {
+                AutoBuildBase.ExitWithException(e);
+                return;
+            }
+
+            AutoBuildLogger.Log("Upload complete");
+            AutoBuildLogger.EndLogGroup();
+
+            EditorApplication.Exit(0);
+        }
+
+        private static async Task BuildAsync() {
+            if (!VRCSdkControlPanel.TryGetBuilder<IVRCSdkWorldBuilderApi>(out var builder)) {
+                throw new Exception("Failed to get world builder");
+            }
+
+            var hasIsCompilingNoticed = false;
+            while (EditorApplication.isCompiling)
+            {
+                if (hasIsCompilingNoticed) continue;
+
+                AutoBuildLogger.Log("Waiting for scripts to compile");
+                hasIsCompilingNoticed = true;
+            }
+
+            await builder.Build();
+        }
+
+        private static async Task UploadAsync(VRCWorld world) {
+            if (!VRCSdkControlPanel.TryGetBuilder<IVRCSdkWorldBuilderApi>(out var builder)) {
+                throw new Exception("Failed to get world builder");
+            }
+
+            try {
+                await builder.UploadLastBuild(world);
+            }
+            catch (Exception e) {
+                throw new Exception("Failed to upload world", e);
+            }
+        }
+
+        private static async Task<VRCWorld> FetchWorldAsync(string worldId) {
+            try {
+                return await VRCApi.GetWorld(worldId, true);
+            }
+            catch (Exception e)
+            {
+                var ex = new Exception("Failed to fetch world", e);
+                AutoBuildBase.ExitWithException(ex);
+
+                throw ex;
+            }
+        }
+    }
+}

Packages/com.yuxiaviation.vrchat.autobuild.world/Editor/AutoBuildVRChatWorld.cs

@@ -0,0 +1,20 @@
+{
+    "name": "VRChatAerospaceUniversity.VRChatAutoBuild.Worlds",
+    "rootNamespace": "VRChatAerospaceUniversity.VRChatAutoBuild.Worlds",
+    "references": [
+        "VRC.SDKBase.Editor",
+        "VRC.SDK3.Editor",
+        "VRChatAerospaceUniversity.VRChatAutoBuild"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

Packages/com.yuxiaviation.vrchat.autobuild.world/Editor/AutoBuildVRChatWorld.cs.meta

@@ -0,0 +1,19 @@
+{
+  "name": "com.yuxiaviation.vrchat.autobuild.world",
+  "displayName": "VRChat Content Auto Build - Worlds",
+  "version": "0.3.1",
+  "description": "Auto login and build and upload VRChat content.",
+  "hideInEditor": false,
+  "license": "MIT",
+  "vpmDependencies": {
+    "com.vrchat.worlds": "^3.7.1",
+    "com.yuxiaviation.vrchat.autobuild": "0.3.1"
+  },
+  "author": {
+    "name": "VRChat Aerospace University",
+    "email": "lipww1234@foxmail.com",
+    "url": "https://yuxiaviation.com/"
+  },
+  "unity": "2022.3",
+  "unityRelease": "22f1"
+}

Packages/com.yuxiaviation.vrchat.autobuild.world/Editor/com.yuxiaviation.vrchat.autobuild.world.asmdef

@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+
+namespace VRChatAerospaceUniversity.VRChatAutoBuild {
+    [PublicAPI]
+    public class AutoBuildArguments {
+        [CanBeNull] public string ContentId;
+        public string Username;
+        public string Password;
+        public string TotpKey;
+        public string ScenePath;
+        public string AuthCookie;
+        public string TwoFactorAuthCookie;
+    }
+}