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