1.8BETA-1.9BETA-1.8

13 files changed, 50 insertions, 1 deletions

diff --git a/src/main/resources/assets/notenoughupdates/ah_item_holder.png b/src/main/resources/assets/notenoughupdates/ah_item_holder.png
new file mode 100644
index 00000000..ed396f25
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/ah_item_holder.png
diff --git a/src/main/resources/assets/notenoughupdates/ah_item_tab.png b/src/main/resources/assets/notenoughupdates/ah_item_tab.png
new file mode 100644
index 00000000..c307fa31
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/ah_item_tab.png
diff --git a/src/main/resources/assets/notenoughupdates/item_mask.png b/src/main/resources/assets/notenoughupdates/item_mask.png
index 7a202a33..3b402d7f 100644
--- a/src/main/resources/assets/notenoughupdates/item_mask.png
+++ b/src/main/resources/assets/notenoughupdates/item_mask.png
diff --git a/src/main/resources/assets/notenoughupdates/off.png b/src/main/resources/assets/notenoughupdates/off.png
index 174d1b4f..cfb17e40 100644
--- a/src/main/resources/assets/notenoughupdates/off.png
+++ b/src/main/resources/assets/notenoughupdates/off.png
diff --git a/src/main/resources/assets/notenoughupdates/order_value.png b/src/main/resources/assets/notenoughupdates/order_value.png
new file mode 100644
index 00000000..5526e8f6
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/order_value.png
diff --git a/src/main/resources/assets/notenoughupdates/order_value_active.png b/src/main/resources/assets/notenoughupdates/order_value_active.png
new file mode 100644
index 00000000..3864021c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/order_value_active.png
diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh b/src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh
new file mode 100644
index 00000000..01a16db5
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/program/blit.vsh
@@ -0,0 +1,16 @@
+#version 120
+
+attribute vec4 Position;
+
+uniform mat4 ProjMat;
+uniform vec2 OutSize;
+
+varying vec2 texCoord;
+
+void main(){
+    vec4 outPos = ProjMat * vec4(Position.xy, 0.0, 1.0);
+    gl_Position = vec4(outPos.xy, 0.2, 1.0);
+
+    texCoord = Position.xy / OutSize;
+    texCoord.y = 1.0 - texCoord.y;
+}
diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh
new file mode 100644
index 00000000..70875510
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.fsh
@@ -0,0 +1,15 @@
+#version 120
+
+uniform sampler2D DiffuseSampler;
+
+varying vec2 texCoord;
+
+void main(){
+    vec3 Gray = vec3(0.3, 0.59, 0.11);
+    vec4 diffuseColor = texture2D(DiffuseSampler, texCoord);
+
+    float Luma = dot(diffuseColor.rgb, Gray);
+    diffuseColor.rgb = vec3(Luma, Luma, Luma);
+
+    gl_FragColor = diffuseColor;
+}
diff --git a/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json
new file mode 100644
index 00000000..048ceb9f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/program/grayscale.json
@@ -0,0 +1,17 @@
+{
+  "blend": {
+    "func": "add",
+    "srcrgb": "srcalpha",
+    "dstrgb": "1-srcalpha"
+  },
+  "vertex": "blit",
+  "fragment": "grayscale",
+  "attributes": [ "Position" ],
+  "samplers": [
+    { "name": "DiffuseSampler" }
+  ],
+  "uniforms": [
+    { "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": "OutSize",       "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] }
+  ]
+}
diff --git a/src/main/resources/assets/notenoughupdates/slider_button.png b/src/main/resources/assets/notenoughupdates/slider_button.png
new file mode 100644
index 00000000..aeb81b86
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/slider_button.png
diff --git a/src/main/resources/assets/notenoughupdates/slider_off.png b/src/main/resources/assets/notenoughupdates/slider_off.png
new file mode 100644
index 00000000..0f514c41
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/slider_off.png
diff --git a/src/main/resources/assets/notenoughupdates/slider_on.png b/src/main/resources/assets/notenoughupdates/slider_on.png
new file mode 100644
index 00000000..8d2d6680
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/slider_on.png
diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json
index 6b616e4e..49e37916 100644
--- a/src/main/resources/mixins.notenoughupdates.json
+++ b/src/main/resources/mixins.notenoughupdates.json
@@ -4,6 +4,7 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinItemStack",
-    "MixinInventoryEffectRenderer"
+    "MixinInventoryEffectRenderer",
+    "MixinGuiIngame"
   ]
 }
\ No newline at end of file