1.4

37 files changed, 53 insertions, 0 deletions

diff --git a/src/main/resources/assets/notenoughupdates/button_white.png b/src/main/resources/assets/notenoughupdates/button_white.png
new file mode 100644
index 00000000..7763716d
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/button_white.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/lava.png b/src/main/resources/assets/notenoughupdates/capes/lava.png
new file mode 100644
index 00000000..8f60a03e
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/lava.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/mbstaff.png b/src/main/resources/assets/notenoughupdates/capes/mbstaff.png
new file mode 100644
index 00000000..15961c7c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/mbstaff.png
diff --git a/src/main/resources/assets/notenoughupdates/capes/packshq.png b/src/main/resources/assets/notenoughupdates/capes/packshq.png
new file mode 100644
index 00000000..860b10f5
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/capes/packshq.png
diff --git a/src/main/resources/assets/notenoughupdates/colour_selector_bar.png b/src/main/resources/assets/notenoughupdates/colour_selector_bar.png
new file mode 100644
index 00000000..f176af90
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/colour_selector_bar.png
diff --git a/src/main/resources/assets/notenoughupdates/colour_selector_bar_alpha.png b/src/main/resources/assets/notenoughupdates/colour_selector_bar_alpha.png
new file mode 100644
index 00000000..7a89510c
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/colour_selector_bar_alpha.png
diff --git a/src/main/resources/assets/notenoughupdates/colour_selector_chroma.png b/src/main/resources/assets/notenoughupdates/colour_selector_chroma.png
new file mode 100644
index 00000000..ea273959
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/colour_selector_chroma.png
diff --git a/src/main/resources/assets/notenoughupdates/colour_selector_dot.png b/src/main/resources/assets/notenoughupdates/colour_selector_dot.png
new file mode 100644
index 00000000..1150c8bb
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/colour_selector_dot.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png
index 934f6b4a..a8c9eac9 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png
index 956d085a..a29a685d 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png
index fa43a0ed..7eaecfc2 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json
new file mode 100644
index 00000000..05dbf61a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json
@@ -0,0 +1,3 @@
+{
+	"text-colour": "FF000000"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png
index 73711ee8..63479a74 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..4b28ee06
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..7eaecfc2
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json
new file mode 100644
index 00000000..05dbf61a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json
@@ -0,0 +1,3 @@
+{
+	"text-colour": "FF000000"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png
index 3a24654d..d14f0ed1 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png
index fa43a0ed..800acade 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..800acade
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json
new file mode 100644
index 00000000..5ae75066
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json
@@ -0,0 +1,3 @@
+{
+	"text-colour": "FFC8C8C8"
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png
new file mode 100644
index 00000000..934f6b4a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png
index ea57f0d0..956d085a 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png
new file mode 100644
index 00000000..73711ee8
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png
index bab0eab7..bab0eab7 100644
--- a/src/main/resources/assets/notenoughupdates/dynamic_54/dynamic_54_button_ctm.png
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png
new file mode 100644
index 00000000..3a24654d
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png
new file mode 100644
index 00000000..934f6b4a
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png
new file mode 100644
index 00000000..ea57f0d0
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png
new file mode 100644
index 00000000..fa43a0ed
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png
new file mode 100644
index 00000000..7a1aa4a4
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png
diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png
new file mode 100644
index 00000000..5f4960f9
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png
diff --git a/src/main/resources/assets/notenoughupdates/shaders/lava_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/lava_cape.frag
new file mode 100644
index 00000000..9fb35990
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/lava_cape.frag
@@ -0,0 +1,32 @@
+#version 120
+
+varying vec4 passColour;
+varying vec3 passNormal;
+uniform sampler2D textureIn;
+
+uniform int millis;
+
+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;
+
+    float factor = (lava.r / 0.65f)*(lava.r / 0.65f);
+    lava.r += sin(mod(millis/2000.0f, 6.28f))*factor*0.15f+sin(mod(millis/500.0f, 6.28f))*factor*0.15f;
+    lava.g += sin(mod(millis/2000.0f, 6.28f))*factor*0.15f;
+    lava.b += sin(mod(millis/2000.0f, 6.28f))*factor*0.15f;
+
+    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/lava_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/lava_cape.vert
new file mode 100644
index 00000000..2b5c48f8
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/shaders/lava_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/supersecretassets/bald.png b/src/main/resources/assets/notenoughupdates/supersecretassets/bald.png
new file mode 100644
index 00000000..4f730a44
--- /dev/null
+++ b/src/main/resources/assets/notenoughupdates/supersecretassets/bald.png