From 288041f5367830877ab1eb31c06797b5014b1fcd Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 14 Dec 2021 12:17:32 +0100
Subject: [PATCH] rename shaders

---
 .../minosoft/gui/rendering/system/opengl/OpenGLShader.kt     | 5 +----
 .../shader/generic/color/{generic_color.fsh => color.fsh}    | 0
 .../shader/generic/color/{generic_color.vsh => color.vsh}    | 0
 .../shader/sky/skybox/{sky_skybox.fsh => skybox.fsh}         | 0
 .../shader/sky/skybox/{sky_skybox.vsh => skybox.vsh}         | 0
 .../rendering/shader/sky/sun/{sky_sun.fsh => sun.fsh}        | 0
 .../rendering/shader/sky/sun/{sky_sun.vsh => sun.vsh}        | 0
 7 files changed, 1 insertion(+), 4 deletions(-)
 rename src/main/resources/assets/minosoft/rendering/shader/generic/color/{generic_color.fsh => color.fsh} (100%)
 rename src/main/resources/assets/minosoft/rendering/shader/generic/color/{generic_color.vsh => color.vsh} (100%)
 rename src/main/resources/assets/minosoft/rendering/shader/sky/skybox/{sky_skybox.fsh => skybox.fsh} (100%)
 rename src/main/resources/assets/minosoft/rendering/shader/sky/skybox/{sky_skybox.vsh => skybox.vsh} (100%)
 rename src/main/resources/assets/minosoft/rendering/shader/sky/sun/{sky_sun.fsh => sun.fsh} (100%)
 rename src/main/resources/assets/minosoft/rendering/shader/sky/sun/{sky_sun.vsh => sun.vsh} (100%)

diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt
index c14f563ef..e45793ecc 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/opengl/OpenGLShader.kt
@@ -68,10 +68,7 @@ class OpenGLShader(
 
     override fun load() {
         val pathPrefix = "${resourceLocation.namespace}:rendering/shader/${resourceLocation.path}/${
-            resourceLocation.path.replace(
-                "/",
-                "_"
-            )
+            resourceLocation.path.split("/").last()
         }"
         shader = glCreateProgram()
 
diff --git a/src/main/resources/assets/minosoft/rendering/shader/generic/color/generic_color.fsh b/src/main/resources/assets/minosoft/rendering/shader/generic/color/color.fsh
similarity index 100%
rename from src/main/resources/assets/minosoft/rendering/shader/generic/color/generic_color.fsh
rename to src/main/resources/assets/minosoft/rendering/shader/generic/color/color.fsh
diff --git a/src/main/resources/assets/minosoft/rendering/shader/generic/color/generic_color.vsh b/src/main/resources/assets/minosoft/rendering/shader/generic/color/color.vsh
similarity index 100%
rename from src/main/resources/assets/minosoft/rendering/shader/generic/color/generic_color.vsh
rename to src/main/resources/assets/minosoft/rendering/shader/generic/color/color.vsh
diff --git a/src/main/resources/assets/minosoft/rendering/shader/sky/skybox/sky_skybox.fsh b/src/main/resources/assets/minosoft/rendering/shader/sky/skybox/skybox.fsh
similarity index 100%
rename from src/main/resources/assets/minosoft/rendering/shader/sky/skybox/sky_skybox.fsh
rename to src/main/resources/assets/minosoft/rendering/shader/sky/skybox/skybox.fsh
diff --git a/src/main/resources/assets/minosoft/rendering/shader/sky/skybox/sky_skybox.vsh b/src/main/resources/assets/minosoft/rendering/shader/sky/skybox/skybox.vsh
similarity index 100%
rename from src/main/resources/assets/minosoft/rendering/shader/sky/skybox/sky_skybox.vsh
rename to src/main/resources/assets/minosoft/rendering/shader/sky/skybox/skybox.vsh
diff --git a/src/main/resources/assets/minosoft/rendering/shader/sky/sun/sky_sun.fsh b/src/main/resources/assets/minosoft/rendering/shader/sky/sun/sun.fsh
similarity index 100%
rename from src/main/resources/assets/minosoft/rendering/shader/sky/sun/sky_sun.fsh
rename to src/main/resources/assets/minosoft/rendering/shader/sky/sun/sun.fsh
diff --git a/src/main/resources/assets/minosoft/rendering/shader/sky/sun/sky_sun.vsh b/src/main/resources/assets/minosoft/rendering/shader/sky/sun/sun.vsh
similarity index 100%
rename from src/main/resources/assets/minosoft/rendering/shader/sky/sun/sky_sun.vsh
rename to src/main/resources/assets/minosoft/rendering/shader/sky/sun/sun.vsh