PRE4

27 files changed, 60 insertions, 1 deletions

diff --git a/src/main/resources/assets/notenoughupdates/capes/furf.png b/src/main/resources/assets/notenoughupdates/capes/furf.png
new file mode 100644
index 00000000..70f8f98a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/furf.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/lightning.png b/src/main/resources/assets/notenoughupdates/capes/lightning.png
deleted file mode 100644
index dc0afce1..00000000
--- a/src/main/resources/assets/notenoughupdates/capes/lightning.png
+++ /dev/null
diff --git a/src/main/resources/assets/notenoughupdates/capes/void.png b/src/main/resources/assets/notenoughupdates/capes/void.png
new file mode 100644
index 00000000..d9f27e95
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/void.png
diff --git a/src/main/resources/assets/notenoughupdates/core/bar.png b/src/main/resources/assets/notenoughupdates/core/bar.png
new file mode 100644
index 00000000..664c0f32
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/bar.png
diff --git a/src/main/resources/assets/notenoughupdates/core/colour_selector_bar.png b/src/main/resources/assets/notenoughupdates/core/colour_selector_bar.png
new file mode 100644
index 00000000..f176af90
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/colour_selector_bar.png
diff --git a/src/main/resources/assets/notenoughupdates/core/colour_selector_bar_alpha.png b/src/main/resources/assets/notenoughupdates/core/colour_selector_bar_alpha.png
new file mode 100644
index 00000000..7a89510c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/colour_selector_bar_alpha.png
diff --git a/src/main/resources/assets/notenoughupdates/core/colour_selector_chroma.png b/src/main/resources/assets/notenoughupdates/core/colour_selector_chroma.png
new file mode 100644
index 00000000..ea273959
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/colour_selector_chroma.png
diff --git a/src/main/resources/assets/notenoughupdates/core/colour_selector_dot.png b/src/main/resources/assets/notenoughupdates/core/colour_selector_dot.png
new file mode 100644
index 00000000..1150c8bb
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/colour_selector_dot.png
diff --git a/src/main/resources/assets/notenoughupdates/core/slider/slider_off_cap.png b/src/main/resources/assets/notenoughupdates/core/slider/slider_off_cap.png
new file mode 100644
index 00000000..60ddcbf5
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/slider/slider_off_cap.png
diff --git a/src/main/resources/assets/notenoughupdates/core/slider/slider_off_notch.png b/src/main/resources/assets/notenoughupdates/core/slider/slider_off_notch.png
new file mode 100644
index 00000000..3cdfbec9
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/slider/slider_off_notch.png
diff --git a/src/main/resources/assets/notenoughupdates/core/slider/slider_off_segment.png b/src/main/resources/assets/notenoughupdates/core/slider/slider_off_segment.png
new file mode 100644
index 00000000..13f161d1
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/slider/slider_off_segment.png
diff --git a/src/main/resources/assets/notenoughupdates/core/slider/slider_on_cap.png b/src/main/resources/assets/notenoughupdates/core/slider/slider_on_cap.png
new file mode 100644
index 00000000..e1d1aab5
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/slider/slider_on_cap.png
diff --git a/src/main/resources/assets/notenoughupdates/core/slider/slider_on_notch.png b/src/main/resources/assets/notenoughupdates/core/slider/slider_on_notch.png
new file mode 100644
index 00000000..8e39633b
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/slider/slider_on_notch.png
diff --git a/src/main/resources/assets/notenoughupdates/core/slider/slider_on_segment.png b/src/main/resources/assets/notenoughupdates/core/slider/slider_on_segment.png
new file mode 100644
index 00000000..931a8904
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/slider/slider_on_segment.png
diff --git a/src/main/resources/assets/notenoughupdates/core/toggle_1.png b/src/main/resources/assets/notenoughupdates/core/toggle_1.png
new file mode 100644
index 00000000..618e2c62
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/toggle_1.png
diff --git a/src/main/resources/assets/notenoughupdates/core/toggle_2.png b/src/main/resources/assets/notenoughupdates/core/toggle_2.png
new file mode 100644
index 00000000..4bb5ee39
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/toggle_2.png
diff --git a/src/main/resources/assets/notenoughupdates/core/toggle_3.png b/src/main/resources/assets/notenoughupdates/core/toggle_3.png
new file mode 100644
index 00000000..50164cc3
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/toggle_3.png
diff --git a/src/main/resources/assets/notenoughupdates/core/toggle_off.png b/src/main/resources/assets/notenoughupdates/core/toggle_off.png
new file mode 100644
index 00000000..ed7d5e68
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/toggle_off.png
diff --git a/src/main/resources/assets/notenoughupdates/core/toggle_on.png b/src/main/resources/assets/notenoughupdates/core/toggle_on.png
new file mode 100644
index 00000000..68ce1c0c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/core/toggle_on.png
diff --git a/src/main/resources/assets/notenoughupdates/shaders/void.frag b/src/main/resources/assets/notenoughupdates/shaders/void.frag
new file mode 100644
index 00000000..3809c133
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/void.frag
@@ -0,0 +1,41 @@
+#version 130
+
+varying vec4 passColour;
+varying vec3 passNormal;
+uniform sampler2D textureIn;
+varying vec4 passPosition;
+uniform vec2 screensize;
+uniform int millis;
+
+//Algorithm by hughsk
+vec3 hsv2rgb(vec3 c) {
+  vec4 K = vec4(1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0);
+  vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
+  return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
+}
+
+void main() {
+    vec2 viewportCoord1 = (gl_FragCoord.xy+vec2(-millis/100.0f, 70)/5.0f)/screensize.yy;
+    vec4 texture1 = texture2D(textureIn, viewportCoord1);
+
+    vec2 viewportCoord2 = (gl_FragCoord.xy/2.0f+vec2(50, millis/100.0f)/3.0f)/screensize.yy;
+    vec4 texture2 = texture2D(textureIn, viewportCoord2);
+
+    vec2 viewportCoord3 = (gl_FragCoord.xy/3.0f+vec2(-millis/100.0f+30, millis/100.0f+90)/2.0f)/screensize.yy;
+    vec4 texture3 = texture2D(textureIn, viewportCoord3);
+
+    vec2 viewportCoord4 = (gl_FragCoord.xy/3.0f+vec2(-millis/100.0f+50, -millis/100.0f+10)/2.0f)/screensize.yy;
+    vec4 texture4 = texture2D(textureIn, viewportCoord4);
+
+    float r = texture1.r + texture2.r + texture3.r + texture4.r;
+    float g = texture1.g + texture2.g + texture3.g + texture4.g;
+    float b = texture1.b + texture2.b + texture3.b + texture4.b;
+
+    if(r > 1) r = 1;
+    if(g > 1) g = 1;
+    if(b > 1) b = 1;
+
+    vec4 colour = vec4(hsv2rgb(vec3(mod(millis/50000.0f+gl_FragCoord.x/screensize.x/3.0f, 1.0f), 0.35f, 1.0f)), 1.0f);
+
+    gl_FragColor = vec4(r, g, b, 1) * passColour * colour;
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/shaders/void.vert b/src/main/resources/assets/notenoughupdates/shaders/void.vert
new file mode 100644
index 00000000..0cc39c90
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/void.vert
@@ -0,0 +1,16 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+varying vec4 passPosition;
+uniform vec2 screensize;
+uniform int millis;
+
+void main() {
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+
+    passColour = gl_Color;
+    passNormal = normalize(gl_Normal);
+    passPosition = gl_Position;
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/social/discord.png b/src/main/resources/assets/notenoughupdates/social/discord.png
new file mode 100644
index 00000000..27962167
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/social/discord.png
diff --git a/src/main/resources/assets/notenoughupdates/social/github.png b/src/main/resources/assets/notenoughupdates/social/github.png
new file mode 100644
index 00000000..9c8650a5
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/social/github.png
diff --git a/src/main/resources/assets/notenoughupdates/social/patreon.png b/src/main/resources/assets/notenoughupdates/social/patreon.png
new file mode 100644
index 00000000..00a169de
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/social/patreon.png
diff --git a/src/main/resources/assets/notenoughupdates/social/twitter.png b/src/main/resources/assets/notenoughupdates/social/twitter.png
new file mode 100644
index 00000000..5f249b80
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/social/twitter.png
diff --git a/src/main/resources/assets/notenoughupdates/social/youtube.png b/src/main/resources/assets/notenoughupdates/social/youtube.png
new file mode 100644
index 00000000..b0c05d07
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/social/youtube.png
diff --git a/src/main/resources/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json
index a90fbb8d..e1572aa5 100644
--- a/src/main/resources/mixins.notenoughupdates.json
+++ b/src/main/resources/mixins.notenoughupdates.json
@@ -17,6 +17,8 @@
     "MixinEntityPlayer",
     "MixinTileEntitySpecialRenderer",
     "MixinRender",
-    "MixinRenderFish"
+    "MixinRenderFish",
+    "MixinContainer",
+    "MixinWorld"
   ]
 }
\ No newline at end of file