Updating main SDK repo to remove dependencies

.github/workflows/build-listing.yml

@@ -1,11 +1,6 @@
 name: Build Repo Listing
 
-env:
-  listPublishDirectory: Website
-  pathToCi: ci
-
 on: 
-  workflow_dispatch:
   workflow_run:
     workflows: [Build Release]
     types:
@@ -23,10 +18,13 @@ permissions:
 concurrency:
   group: "pages"
   cancel-in-progress: true
+
+env:
+  listPublishDirectory: Website
+  pathToCi: ci
 
 jobs:
 
-  # Build the VPM Listing Website and deploy to GitHub Pages
   build-listing:
     name: build-listing
     environment:
@@ -35,44 +33,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      # Checkout Local Repository
-      - name: Checkout Local Repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
-
-      # Checkout Automation Repository without removing prior checkouts
-      - name: Checkout Automation Repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac
+      - uses: actions/checkout@v3 # check out this repo
+      - uses: actions/checkout@v3 # check out automation repo
         with:
           repository: vrchat-community/package-list-action
-          path: ${{ env.pathToCi }}
-          clean: false
-
-      # Load cached data from previous runs
+          path: ${{env.pathToCi}}
+          clean: false # otherwise the local repo will no longer be checked out
+
       - name: Restore Cache
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
+        uses: actions/cache@v3
         with:
           path: |
-            ${{ env.pathToCi }}/.nuke/temp
+            ${{env.pathToCi}}/.nuke/temp
             ~/.nuget/packages
           key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj') }}
-
-      # Build Package Version Listing with Nuke
+
       - name: Build Package Version Listing
-        run: ${{ env.pathToCi }}/build.cmd BuildRepoListing --root ${{ env.pathToCi }} --list-publish-directory $GITHUB_WORKSPACE/${{ env.listPublishDirectory }} --current-package-name ${{ vars.PACKAGE_NAME }}
+        run: ${{env.pathToCi}}/build.cmd BuildMultiPackageListing --root ${{env.pathToCi}} --list-publish-directory $GITHUB_WORKSPACE/${{env.listPublishDirectory}}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      # Prepare for GitHub Pages deployment
+
       - name: Setup Pages
-        uses: actions/configure-pages@f156874f8191504dae5b037505266ed5dda6c382
-
-      # Upload the VPM Listing Website to GitHub Pages artifacts
-      - name: Upload Pages Artifact
-        uses: actions/upload-pages-artifact@a753861a5debcf57bf8b404356158c8e1e33150c
+        uses: actions/configure-pages@v3
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
         with:
-          path: ${{ env.listPublishDirectory }}
-
-      # Deploy the uploaded VPM Listing Website to GitHub Pages
+          path: ${{env.listPublishDirectory}}
+
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@9dbe3824824f8a1377b8e298bafde1a50ede43e5
+        uses: actions/deploy-pages@v2

.github/workflows/release.yml

@@ -2,6 +2,9 @@ name: Build Release
 
 on: 
   workflow_dispatch:
+  push:
+    branches: main
+    paths: source.json
 
 jobs:
 
@@ -84,4 +87,4 @@ jobs:
             ${{ env.zipFile }}
             ${{ env.unityPackage }}
             ${{ env.packagePath }}/package.json
-          tag_name: ${{ env.version }}
+          tag_name: ${{ env.version }}

.gitignore

@@ -65,5 +65,3 @@ ProjectSettings
 UserSettings
 .idea
 .vscode
-
-.gitconfig

Dubby.gitconfig

@@ -0,0 +1,8 @@
+[credential]
+    username = dubstepdragon
+[user]
+    name = Dubby
+    email = [email protected]
+
+[core]
+    sshCommand = ssh -i ~/.ssh/Dubby -F /dev/null

Packages/com.killers0992.awttersdk/Editor/Pages/LoginPage.cs

@@ -58,7 +58,7 @@ public void DrawGUI(Rect pos)
             GUI.enabled = true;
 
             if (GUILayout.Button("Register")) 
-                Application.OpenURL("https://awtterspace.com/accounts/register/");
+                Application.OpenURL("https://shadedoes3d.com/accounts/register/");
 
             GUILayout.EndVertical();
             GUILayout.FlexibleSpace();
@@ -73,7 +73,7 @@ public IEnumerator Login(bool first = false)
 
             if (first) yield break;
 
-            using (var www = UnityWebRequest.Post("https://awtterspace.com/api/auth", new Dictionary<string, string>()
+            using (var www = UnityWebRequest.Post("https://shadedoes3d.com/api/auth", new Dictionary<string, string>()
             {
                 { "username", Username },
                 { "password", Password }

Packages/com.killers0992.awttersdk/package.json

@@ -1,9 +1,12 @@
 {
   "name": "com.killers0992.awttersdk",
   "displayName": "Awtter SDK",
-  "version": "1.2.11",
+  "version": "1.2.9",
   "description": "Tool for managing content from AwtterSpace.",
   "vrchatVersion": "2022.1.1",
+   "vpmDependencies": {
+    "dev.dubby.awttermerger": "4.x.x"
+  },
   "author": {
     "name": "Killers0992",
     "email": "[email protected]",
@@ -14,8 +17,5 @@
     "com.unity.nuget.newtonsoft-json": "3.0.2",
     "com.unity.editorcoroutines": "1.0.0",
     "com.unity.sharp-zip-lib": "1.3.4-preview"
-  },
-  "vpmDependencies": {
-    "dev.dubby.awttermerger": "4.0.5"
   }
-}
+}

Packages/packages-lock.json

@@ -67,7 +67,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.postprocessing": {
-      "version": "3.4.0",
+      "version": "3.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -123,9 +123,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"

README.md

@@ -1,7 +1,13 @@
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/TheAwtterverse/AwtterSDK/total?label=Downloads&labelColor=2e343e&color=00FFFF&style=for-the-badge)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/dubstepdragon/AwtterSDK_dubby/total?label=Downloads&labelColor=2e343e&color=00FFFF&style=for-the-badge)
+[![Discord](https://img.shields.io/discord/1216429195232673964?label=Discord&labelColor=2e343e&color=00FFFF&style=for-the-badge)](https://discord.gg/czQCAsDMHa)
 ![License](https://img.shields.io/github/license/Ileriayo/markdown-badges?style=for-the-badge&labelColor=2e343e&color=00FFFF&)
 # Awtter SDK
 
 <p align="center">
-<b><a href="https://TheAwtterverse.github.io/AwtterSDK">Add to VCC</a></b>
-</p>
+<b><a href="https://dubstepdragon.github.io/AwtterSDK_dubby">Add to VCC</a></b>
+</p>
+
+
+Tool made for managing AwtterSpace content in one menu.
+
+Hosted under [VRChat Tools](https://github.com/dubstepdragon)

source.json

@@ -0,0 +1,20 @@
+{
+    "name":"Awtter SDK",
+    "id":"com.killers0992.awttersdk",
+    "url":"https://dubstepdragon.github.io/AwtterSDK_dubby/index.json",
+    "author":{
+        "email":"[email protected]",
+        "name":"Dubby",
+        "url":"https://dubby.dev"
+    },
+    "description":"Consent Cards and required packages",
+    "infoLink":{
+        "url":"https://github.com/dubstepdragon/AwtterSDK_dubby",
+        "text":"View on GitHub"
+    },
+    "bannerUrl":"https://github.com/dubstepdragon/AwtterSDK_dubby/blob/main/Website/banner.png",
+    "githubRepos":[
+        "dubstepdragon/AwtterSDK_dubby",
+        "dubstepdragon/AwtterMerger"
+    ]
+}