From 14f3c2e7c2ff960a48f76e83082bbd0c961a8621 Mon Sep 17 00:00:00 2001 From: Ben Thomas Date: Wed, 22 May 2024 19:16:41 -0500 Subject: [PATCH] feat: Add tools and shaders tab --- .../{TestDataSource.cs => LocalDataSource.cs} | 33 +++++++++---------- ...Source.cs.meta => LocalDataSource.cs.meta} | 0 .../Editor/Pages/DownloadsPage.cs | 3 +- 3 files changed, 18 insertions(+), 18 deletions(-) rename com.furality.sdk/Editor/{TestDataSource.cs => LocalDataSource.cs} (91%) mode change 100755 => 100644 rename com.furality.sdk/Editor/{TestDataSource.cs.meta => LocalDataSource.cs.meta} (100%) mode change 100755 => 100644 diff --git a/com.furality.sdk/Editor/TestDataSource.cs b/com.furality.sdk/Editor/LocalDataSource.cs old mode 100755 new mode 100644 similarity index 91% rename from com.furality.sdk/Editor/TestDataSource.cs rename to com.furality.sdk/Editor/LocalDataSource.cs index 0182e3e..41f865b --- a/com.furality.sdk/Editor/TestDataSource.cs +++ b/com.furality.sdk/Editor/LocalDataSource.cs @@ -3,49 +3,48 @@ using Furality.SDK.Editor.External.AssetHandling; using Furality.SDK.Editor.External.FoxApi; using JetBrains.Annotations; -using UnityEditor; using UnityEngine; namespace Furality.SDK.Editor { - [Obsolete] - public class TestDataSource : IPackageDataSource + public class LocalDataSource : IPackageDataSource { private readonly List _packages = new List() { // Shaders + new FuralityPackage() { - Id = "com.furality.sylvashader", - Name = "Sylva Shader", - Description = "Our main shader for Furality Sylva!", - ImageUrl = "https://media.furality.online/image/f6/Furality_Sylva_Shader_thumb.jpg", + Id = "com.furality.umbrashader", + Name = "Umbra Shader", + Description = "Furality Umbra Avatar Shader for VRChat. Created by Naito @ Furality, Inc.", + ImageUrl = "https://media.cdn.furality.online/files/web/logo/furality-umbra-logo-md.png", Category = "Shaders", - ConventionId = "Furality Sylva", - Version = new Version(1, 3, 3), + ConventionId = "Furality Umbra", + Version = new Version(1, 6, 0), AttendanceLevel = AttendanceLevel.none, IsPublic = true, Dependencies = new List() { new Package() {Id = "com.llealloo.audiolink", Version = new Version(0, 3, 2)} }, - FallbackUrl = "https://github.com/furality/vcc-furality-sylva-shader/releases/download/1.3.3/com.furality.sylvashader-1.3.3.unitypackage" + FallbackUrl = "https://github.com/furality/vcc-furality-umbra-shader/releases/download/1.6.0/com.furality.umbrashader-1.6.0.unitypackage" }, new FuralityPackage() { - Id = "com.furality.umbrashader", - Name = "Umbra Shader", - Description = "Furality Umbra Avatar Shader for VRChat. Created by Naito @ Furality, Inc.", + Id = "com.furality.sylvashader", + Name = "Sylva Shader", + Description = "Our main shader for Furality Sylva!", ImageUrl = "https://media.furality.online/image/f6/Furality_Sylva_Shader_thumb.jpg", Category = "Shaders", - ConventionId = "Furality Umbra", - Version = new Version(1, 6, 0), + ConventionId = "Furality Sylva", + Version = new Version(1, 3, 3), AttendanceLevel = AttendanceLevel.none, IsPublic = true, Dependencies = new List() { new Package() {Id = "com.llealloo.audiolink", Version = new Version(0, 3, 2)} }, - FallbackUrl = "https://github.com/furality/vcc-furality-umbra-shader/releases/download/1.6.0/com.furality.umbrashader-1.6.0.unitypackage" + FallbackUrl = "https://github.com/furality/vcc-furality-sylva-shader/releases/download/1.3.3/com.furality.sylvashader-1.3.3.unitypackage" }, // Badges @@ -54,7 +53,7 @@ public class TestDataSource : IPackageDataSource Id = "com.furality.badgemaker", Name = "Badge Maker", Description = "Allows you to customise the text displayed on badges!", - ImageUrl = "https://media.furality.online/image/f6/Furality_Sylva_First_Class_Asset_Pack.jpg", + ImageUrl = "https://media.furality.online/files/web/merch/all-badges.png", Category = "Tools", ConventionId = "Furality Sylva", Dependencies = new List(), diff --git a/com.furality.sdk/Editor/TestDataSource.cs.meta b/com.furality.sdk/Editor/LocalDataSource.cs.meta old mode 100755 new mode 100644 similarity index 100% rename from com.furality.sdk/Editor/TestDataSource.cs.meta rename to com.furality.sdk/Editor/LocalDataSource.cs.meta diff --git a/com.furality.sdk/Editor/Pages/DownloadsPage.cs b/com.furality.sdk/Editor/Pages/DownloadsPage.cs index a525ed7..528eb38 100755 --- a/com.furality.sdk/Editor/Pages/DownloadsPage.cs +++ b/com.furality.sdk/Editor/Pages/DownloadsPage.cs @@ -19,7 +19,8 @@ public DownloadsPage(MainWindow mainWindow) : base(mainWindow) Debug.Log("Construct DownloadsPage"); _packageDataSources = new List { - MainWindow.Api.FilesApi + MainWindow.Api.FilesApi, + new LocalDataSource() }; MainWindow.Api.FilesApi.OnLoggedIn += RefreshPage;