aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2024-11-08 17:52:10 +0100
committerLinnea Gräf <nea@nea.moe>2024-11-08 17:52:10 +0100
commitf6f8fef556e74f24187ad2a6296f573024a378b3 (patch)
treee6d8873e15e88c23d42b8634dad7179fbd198eec /src/main/resources
parent06534f9d09732ed29a6fa6bc48def5f7c2b0b865 (diff)
downloadFirmament-f6f8fef556e74f24187ad2a6296f573024a378b3.tar.gz
Firmament-f6f8fef556e74f24187ad2a6296f573024a378b3.tar.bz2
Firmament-f6f8fef556e74f24187ad2a6296f573024a378b3.zip
Fix line renderer
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/firmament/shaders/core/rendertype_lines.fsh (renamed from src/main/resources/assets/firmament/shaders/code/rendertype_lines.fsh)0
-rw-r--r--src/main/resources/assets/firmament/shaders/core/rendertype_lines.json (renamed from src/main/resources/assets/firmament/shaders/code/rendertype_lines.json)6
-rw-r--r--src/main/resources/assets/firmament/shaders/core/rendertype_lines.vsh (renamed from src/main/resources/assets/firmament/shaders/code/rendertype_lines.vsh)0
-rw-r--r--src/main/resources/fabric.mod.json3
4 files changed, 6 insertions, 3 deletions
diff --git a/src/main/resources/assets/firmament/shaders/code/rendertype_lines.fsh b/src/main/resources/assets/firmament/shaders/core/rendertype_lines.fsh
index 057f31f..057f31f 100644
--- a/src/main/resources/assets/firmament/shaders/code/rendertype_lines.fsh
+++ b/src/main/resources/assets/firmament/shaders/core/rendertype_lines.fsh
diff --git a/src/main/resources/assets/firmament/shaders/code/rendertype_lines.json b/src/main/resources/assets/firmament/shaders/core/rendertype_lines.json
index f276639..e4537ca 100644
--- a/src/main/resources/assets/firmament/shaders/code/rendertype_lines.json
+++ b/src/main/resources/assets/firmament/shaders/core/rendertype_lines.json
@@ -1,6 +1,6 @@
{
- "vertex": "firmament:rendertype_lines",
- "fragment": "firmament:rendertype_lines",
+ "vertex": "firmament:core/rendertype_lines",
+ "fragment": "firmament:core/rendertype_lines",
"samplers": [
],
"uniforms": [
@@ -8,7 +8,7 @@
{ "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
{ "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
{ "name": "LineWidth", "type": "float", "count": 1, "values": [ 1.0 ] },
- { "name": "ScreenSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] },
+ { "name": "ScreenSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] },
{ "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
{ "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] },
{ "name": "FogColor", "type": "float", "count": 4, "values": [ 0.0, 0.0, 0.0, 0.0 ] },
diff --git a/src/main/resources/assets/firmament/shaders/code/rendertype_lines.vsh b/src/main/resources/assets/firmament/shaders/core/rendertype_lines.vsh
index b2d0f99..b2d0f99 100644
--- a/src/main/resources/assets/firmament/shaders/code/rendertype_lines.vsh
+++ b/src/main/resources/assets/firmament/shaders/core/rendertype_lines.vsh
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 9997018..9b00adf 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -33,6 +33,9 @@
"rei_client": [
"moe.nea.firmament.compat.rei.FirmamentReiPlugin"
],
+ "rei_common": [
+ "moe.nea.firmament.compat.rei.FirmamentReiCommonPlugin"
+ ],
"modmenu": [
"moe.nea.firmament.compat.modmenu.FirmamentModMenuPlugin"
],