1.71.7.1-REL

26 files changed, 109 insertions, 0 deletions

diff --git a/src/main/resources/assets/notenoughupdates/calendar/background.png b/src/main/resources/assets/notenoughupdates/calendar/background.png
new file mode 100644
index 00000000..95d23640
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/calendar/background.png
diff --git a/src/main/resources/assets/notenoughupdates/calendar/displaybar.png b/src/main/resources/assets/notenoughupdates/calendar/displaybar.png
new file mode 100644
index 00000000..12ffd858
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/calendar/displaybar.png
diff --git a/src/main/resources/assets/notenoughupdates/calendar/toast.png b/src/main/resources/assets/notenoughupdates/calendar/toast.png
new file mode 100644
index 00000000..e0dffdb4
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/calendar/toast.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/contrib_preview.png b/src/main/resources/assets/notenoughupdates/capes/contrib_preview.png
new file mode 100644
index 00000000..73ae1e0c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/contrib_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/fade_preview.png b/src/main/resources/assets/notenoughupdates/capes/fade_preview.png
new file mode 100644
index 00000000..87f169a0
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/fade_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/gravy_preview.png b/src/main/resources/assets/notenoughupdates/capes/gravy_preview.png
new file mode 100644
index 00000000..5a0ad33a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/gravy_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/lava_preview.png b/src/main/resources/assets/notenoughupdates/capes/lava_preview.png
new file mode 100644
index 00000000..b5f8fdae
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/lava_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/mbstaff_preview.png b/src/main/resources/assets/notenoughupdates/capes/mbstaff_preview.png
new file mode 100644
index 00000000..e52700b7
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/mbstaff_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/mcworld_preview.png b/src/main/resources/assets/notenoughupdates/capes/mcworld_preview.png
new file mode 100644
index 00000000..31f0a2bf
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/mcworld_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/nullzee_preview.png b/src/main/resources/assets/notenoughupdates/capes/nullzee_preview.png
new file mode 100644
index 00000000..f34bec5f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/nullzee_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/packshq_preview.png b/src/main/resources/assets/notenoughupdates/capes/packshq_preview.png
new file mode 100644
index 00000000..3db5be95
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/packshq_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/patreon1_preview.png b/src/main/resources/assets/notenoughupdates/capes/patreon1_preview.png
new file mode 100644
index 00000000..7dc0c845
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/patreon1_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/patreon2_preview.png b/src/main/resources/assets/notenoughupdates/capes/patreon2_preview.png
new file mode 100644
index 00000000..6aadaa18
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/patreon2_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/space_preview.png b/src/main/resources/assets/notenoughupdates/capes/space_preview.png
new file mode 100644
index 00000000..a5e0c008
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/space_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/thebakery.png b/src/main/resources/assets/notenoughupdates/capes/thebakery.png
new file mode 100644
index 00000000..8d4ca440
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/thebakery.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/thebakery_preview.png b/src/main/resources/assets/notenoughupdates/capes/thebakery_preview.png
new file mode 100644
index 00000000..f80b85aa
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/thebakery_preview.png
diff --git a/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.frag
new file mode 100644
index 00000000..e3f7feba
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.frag
@@ -0,0 +1,36 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+uniform sampler2D textureIn;
+
+uniform int millis;
+uniform int eventMillis;
+
+void main() {
+    vec4 texture = texture2D(textureIn, gl_TexCoord[0].st);
+
+    float t = gl_TexCoord[0].t;
+    t = clamp(t, 10.0f/1024.0f, 410.0f/1024.0f);
+
+    float index = mod(millis/30.0f-t*1024.0f, 1024.0f);
+    float xIndex = mod(index, 1024.0f);
+    float yIndex = mod(gl_TexCoord[0].s*1024.0f+millis/500.0f, 421.0f)+421.0f;
+    vec3 lava = texture2D(textureIn, vec2(xIndex/1024.0f, yIndex/1024.0f)).xyz;
+
+    if(eventMillis < 350) {
+        float scroll = (gl_TexCoord[0].s*1024.0f+gl_TexCoord[0].t*1024.0f);
+        float factor = (10 - abs(scroll - eventMillis*2))/20.0f;
+        if(factor > 0) {
+            lava += vec3(factor, factor, factor);
+        }
+    }
+
+    gl_FragColor = vec4(texture.rgb*texture.a + lava*(1.0f-texture.a), 1.0f) * passColour;
+
+    vec3 fakeSunNormal = normalize(vec3(0.2f,1.0f,-0.2f));
+    vec3 normNormal = normalize(passNormal);
+    float shading = max(0.6f, dot(fakeSunNormal, normNormal));
+
+    gl_FragColor = vec4(gl_FragColor.rgb*shading, gl_FragColor.a);
+}
diff --git a/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.vert
new file mode 100644
index 00000000..2b5c48f8
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.vert
@@ -0,0 +1,12 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+
+void main() {
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+
+    passColour = gl_Color;
+    passNormal = normalize(gl_Normal);
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.frag
new file mode 100644
index 00000000..77e2c5eb
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.frag
@@ -0,0 +1,26 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+uniform sampler2D textureIn;
+
+uniform int millis;
+uniform int eventMillis;
+
+void main() {
+    gl_FragColor = texture2D(textureIn, gl_TexCoord[0].st) * passColour;
+
+    if(eventMillis < 350 && gl_TexCoord[0].s < 512 && gl_TexCoord[0].t < 512) {
+        float scroll = (gl_TexCoord[0].s*1024.0f+gl_TexCoord[0].t*1024.0f);
+        float factor = (10 - abs(scroll - eventMillis*2))/40.0f;
+        if(factor > 0) {
+            gl_FragColor.rgb += vec3(factor+0.25f, factor+0.25f, factor+0.25f);
+        }
+    }
+
+    vec3 fakeSunNormal = normalize(vec3(0.2f,1.0f,-0.2f));
+    vec3 normNormal = normalize(passNormal);
+    float shading = max(0.6f, dot(fakeSunNormal, normNormal));
+
+    gl_FragColor = vec4(gl_FragColor.rgb*shading, gl_FragColor.a);
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.vert
new file mode 100644
index 00000000..2b5c48f8
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.vert
@@ -0,0 +1,12 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+
+void main() {
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+
+    passColour = gl_Color;
+    passNormal = normalize(gl_Normal);
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/slider_off_large.png b/src/main/resources/assets/notenoughupdates/slider_off_large.png
new file mode 100644
index 00000000..7c5fd825
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/slider_off_large.png
diff --git a/src/main/resources/assets/notenoughupdates/slider_on_large.png b/src/main/resources/assets/notenoughupdates/slider_on_large.png
new file mode 100644
index 00000000..ef821f16
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/slider_on_large.png
diff --git a/src/main/resources/assets/notenoughupdates/sounds.json b/src/main/resources/assets/notenoughupdates/sounds.json
new file mode 100644
index 00000000..47b0ba1b
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/sounds.json
@@ -0,0 +1,23 @@
+{
+  "calendar_notif_jingle":{
+    "category": "master",
+    "sounds": [{
+      "name": "jingle",
+      "stream": false
+    }]
+  },
+  "calendar_notif_in":{
+    "category": "master",
+    "sounds": [{
+      "name": "in",
+      "stream": false
+    }]
+  },
+  "calendar_notif_out":{
+    "category": "master",
+    "sounds": [{
+      "name": "out",
+      "stream": false
+    }]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/sounds/in.ogg b/src/main/resources/assets/notenoughupdates/sounds/in.ogg
new file mode 100644
index 00000000..5ec26ffc
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/sounds/in.ogg
diff --git a/src/main/resources/assets/notenoughupdates/sounds/jingle.ogg b/src/main/resources/assets/notenoughupdates/sounds/jingle.ogg
new file mode 100644
index 00000000..bd3c2643
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/sounds/jingle.ogg
diff --git a/src/main/resources/assets/notenoughupdates/sounds/out.ogg b/src/main/resources/assets/notenoughupdates/sounds/out.ogg
new file mode 100644
index 00000000..78d4b72f
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/sounds/out.ogg