From 97ecb0a5d63e57729a8afbe1683afa3017a482fd Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Tue, 20 Dec 2022 13:47:41 -0700
Subject: [PATCH] Shaderpack support (#798)

* Shader support PR

* Make search page work

* Fix env showing

* Make moderation look reasonable

* Fix search for shaders
---
 assets/styles/global.scss       |  2 +-
 components/ui/ModalCreation.vue |  4 ++++
 components/ui/ProjectCard.vue   |  2 +-
 layouts/default.vue             | 17 ++++++++++++++---
 nuxt.config.js                  |  5 +++++
 pages/_type/_id.vue             |  6 ++++--
 pages/_type/_id/edit.vue        |  8 +++++++-
 pages/moderation.vue            |  2 +-
 pages/search.vue                | 14 +++++++++++++-
 pages/search/shaders.vue        | 11 +++++++++++
 pages/settings/index.vue        |  1 +
 plugins/shorthands.js           |  5 +++++
 store/cosmetics.js              |  1 +
 store/tag.js                    |  5 +++++
 14 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 pages/search/shaders.vue

diff --git a/assets/styles/global.scss b/assets/styles/global.scss
index ea55a9b39..687e11a6d 100644
--- a/assets/styles/global.scss
+++ b/assets/styles/global.scss
@@ -249,7 +249,7 @@ body {
     --size-mobile-navbar-height-expanded: 9.25rem;
   }
 
-  @media screen and (min-width: 517px) {
+  @media screen and (min-width: 625px) {
     --size-mobile-navbar-height-expanded: 7rem;
   }
 }
diff --git a/components/ui/ModalCreation.vue b/components/ui/ModalCreation.vue
index 8531ae7c5..88e744db4 100644
--- a/components/ui/ModalCreation.vue
+++ b/components/ui/ModalCreation.vue
@@ -121,6 +121,8 @@ export default {
           return 'unsupported'
         case 'resourcepack':
           return 'required'
+        case 'shader':
+          return 'required'
         default:
           return 'unknown'
       }
@@ -131,6 +133,8 @@ export default {
           return 'required'
         case 'resourcepack':
           return 'unsupported'
+        case 'shader':
+          return 'unsupported'
         default:
           return 'unknown'
       }
diff --git a/components/ui/ProjectCard.vue b/components/ui/ProjectCard.vue
index b69f62371..79d40ebf6 100644
--- a/components/ui/ProjectCard.vue
+++ b/components/ui/ProjectCard.vue
@@ -57,7 +57,7 @@
       </span>
       <span
         v-else-if="
-          type !== 'resourcepack' &&
+          !['resourcepack', 'shader'].includes(type) &&
           !(projectTypeDisplay === 'plugin' && search)
         "
         class="environment"
diff --git a/layouts/default.vue b/layouts/default.vue
index 1b53bc5f1..9fa887eb5 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -33,7 +33,11 @@
                   href: '/plugins',
                 },
                 {
-                  label: 'Resource Packs',
+                  label: 'Shaders',
+                  href: '/shaders',
+                },
+                {
+                  label: 'Resourcepacks',
                   href: '/resourcepacks',
                 },
                 {
@@ -197,14 +201,21 @@
           >
             <span>Plugins</span>
           </NuxtLink>
-
+          <NuxtLink
+            :tabindex="isBrowseMenuOpen ? 0 : -1"
+            to="/shaders"
+            class="tab iconified-button"
+            @click.native="isBrowseMenuOpen = false"
+          >
+            <span>Shaders</span>
+          </NuxtLink>
           <NuxtLink
             :tabindex="isBrowseMenuOpen ? 0 : -1"
             to="/resourcepacks"
             class="tab iconified-button"
             @click.native="isBrowseMenuOpen = false"
           >
-            <span>Resource Packs</span>
+            <span>Resourcepacks</span>
           </NuxtLink>
           <NuxtLink
             :tabindex="isBrowseMenuOpen ? 0 : -1"
diff --git a/nuxt.config.js b/nuxt.config.js
index 6fb4ad13f..1e2f2cb71 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -165,6 +165,11 @@ export default {
             component: resolve(__dirname, 'pages/search/resourcepacks.vue'),
             name: 'resourcepacks',
           },
+          {
+            path: '/shaders',
+            component: resolve(__dirname, 'pages/search/shaders.vue'),
+            name: 'shaders',
+          },
         ],
       })
 
diff --git a/pages/_type/_id.vue b/pages/_type/_id.vue
index 67b963125..191219e91 100644
--- a/pages/_type/_id.vue
+++ b/pages/_type/_id.vue
@@ -501,7 +501,8 @@
           <div
             v-if="
               project.project_type !== 'resourcepack' &&
-              project.project_type !== 'plugin'
+              project.project_type !== 'plugin' &&
+              project.project_type !== 'shader'
             "
             class="info"
           >
@@ -513,7 +514,8 @@
           <div
             v-if="
               project.project_type !== 'resourcepack' &&
-              project.project_type !== 'plugin'
+              project.project_type !== 'plugin' &&
+              project.project_type !== 'shader'
             "
             class="info"
           >
diff --git a/pages/_type/_id/edit.vue b/pages/_type/_id/edit.vue
index d0d526bfa..220d803d2 100644
--- a/pages/_type/_id/edit.vue
+++ b/pages/_type/_id/edit.vue
@@ -224,7 +224,10 @@
       </button>
     </section>
     <section
-      v-if="project.project_type !== 'resourcepack'"
+      v-if="
+        project.project_type !== 'resourcepack' &&
+        project.project_type !== 'shader'
+      "
       class="card game-sides"
     >
       <div class="columns">
@@ -864,6 +867,9 @@ export default {
         this.newProject.client_side = this.clientSideType.toLowerCase()
         this.newProject.server_side = this.serverSideType.toLowerCase()
 
+        this.newProject.client_side = this.clientSideType.toLowerCase()
+        this.newProject.server_side = this.serverSideType.toLowerCase()
+
         this.$emit('update:project', this.newProject)
 
         this.isEditing = false
diff --git a/pages/moderation.vue b/pages/moderation.vue
index 211444c6e..22ba8bea4 100644
--- a/pages/moderation.vue
+++ b/pages/moderation.vue
@@ -70,7 +70,7 @@
         </aside>
       </div>
       <div class="normal-page__content">
-        <div class="project-list display-mode--gallery">
+        <div class="project-list display-mode--list">
           <ProjectCard
             v-for="project in $route.query.type !== undefined
               ? projects.filter((x) => x.project_type === $route.query.type)
diff --git a/pages/search.vue b/pages/search.vue
index b4a219416..add9be268 100644
--- a/pages/search.vue
+++ b/pages/search.vue
@@ -53,6 +53,16 @@
                       return (
                         a.name.replace(/\D/g, '') - b.name.replace(/\D/g, '')
                       )
+                    } else if (header === 'performance impact') {
+                      const x = [
+                        'potato',
+                        'low',
+                        'medium',
+                        'high',
+                        'screenshot',
+                      ]
+
+                      return x.indexOf(a.name) - x.indexOf(b.name)
                     }
                     return 0
                   })"
@@ -147,7 +157,9 @@
             />
           </section>
           <section
-            v-if="!['resourcepack', 'plugin'].includes(projectType.id)"
+            v-if="
+              !['resourcepack', 'plugin', 'shader'].includes(projectType.id)
+            "
             aria-label="Environment filters"
           >
             <h3 class="sidebar-menu-heading">Environments</h3>
diff --git a/pages/search/shaders.vue b/pages/search/shaders.vue
new file mode 100644
index 000000000..98bbf6075
--- /dev/null
+++ b/pages/search/shaders.vue
@@ -0,0 +1,11 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+  name: 'Shaders',
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/pages/settings/index.vue b/pages/settings/index.vue
index 18cf2ec8b..e5c83a2c7 100644
--- a/pages/settings/index.vue
+++ b/pages/settings/index.vue
@@ -160,6 +160,7 @@ export default {
         plugin: 'list',
         resourcepack: 'gallery',
         modpack: 'list',
+        shader: 'gallery',
         user: 'list',
       },
     }
diff --git a/plugins/shorthands.js b/plugins/shorthands.js
index 0ff5164f1..9b0ab9f8a 100644
--- a/plugins/shorthands.js
+++ b/plugins/shorthands.js
@@ -240,7 +240,12 @@ export const formatCategory = (name) => {
     return '512x or higher'
   } else if (name === 'kitchen-sink') {
     return 'Kitchen Sink'
+  } else if (name === 'path-tracing') {
+    return 'Path Tracing'
+  } else if (name === 'pbr') {
+    return 'PBR'
   }
+
   return capitalizeString(name)
 }
 
diff --git a/store/cosmetics.js b/store/cosmetics.js
index 23618da6a..cf9c4f390 100644
--- a/store/cosmetics.js
+++ b/store/cosmetics.js
@@ -18,6 +18,7 @@ export const defaults = {
     plugin: 'list',
     resourcepack: 'gallery',
     modpack: 'list',
+    shader: 'gallery',
     user: 'list',
   },
 }
diff --git a/store/tag.js b/store/tag.js
index 9f60b9e6a..160a05333 100644
--- a/store/tag.js
+++ b/store/tag.js
@@ -27,6 +27,11 @@ export const state = () => ({
       id: 'modpack',
       display: 'modpack',
     },
+    {
+      actual: 'shader',
+      id: 'shader',
+      display: 'shader',
+    },
   ],
   loaderData: {
     pluginLoaders: ['bukkit', 'spigot', 'paper', 'purpur', 'sponge'],