From a0402708801b525145d01d0f4da17f0ba9d93455 Mon Sep 17 00:00:00 2001 From: Moulberry Date: Sun, 18 Oct 2020 21:01:11 +1100 Subject: 1.4 --- .../assets/notenoughupdates/button_white.png | Bin 0 -> 6570 bytes .../assets/notenoughupdates/capes/lava.png | Bin 0 -> 169280 bytes .../assets/notenoughupdates/capes/mbstaff.png | Bin 0 -> 470630 bytes .../assets/notenoughupdates/capes/packshq.png | Bin 0 -> 22716 bytes .../notenoughupdates/colour_selector_bar.png | Bin 0 -> 245 bytes .../notenoughupdates/colour_selector_bar_alpha.png | Bin 0 -> 240 bytes .../notenoughupdates/colour_selector_chroma.png | Bin 0 -> 211 bytes .../notenoughupdates/colour_selector_dot.png | Bin 0 -> 3677 bytes .../dynamic_54/dynamic_54_button_ctm.png | Bin 543 -> 0 bytes .../dynamic_54/style1/dynamic_54.png | Bin 5234 -> 4299 bytes .../dynamic_54/style1/dynamic_54_button_ctm.png | Bin 607 -> 4312 bytes .../dynamic_54/style1/dynamic_54_slot_ctm.png | Bin 539 -> 4721 bytes .../dynamic_54/style1/dynamic_config.json | 3 ++ .../dynamic_54/style2/dynamic_54.png | Bin 5429 -> 4424 bytes .../dynamic_54/style2/dynamic_54_button_ctm.png | Bin 0 -> 4723 bytes .../dynamic_54/style2/dynamic_54_slot_ctm.png | Bin 0 -> 4721 bytes .../dynamic_54/style2/dynamic_config.json | 3 ++ .../dynamic_54/style3/dynamic_54.png | Bin 5519 -> 2555 bytes .../dynamic_54/style3/dynamic_54_button_ctm.png | Bin 539 -> 4602 bytes .../dynamic_54/style3/dynamic_54_slot_ctm.png | Bin 0 -> 4602 bytes .../dynamic_54/style3/dynamic_config.json | 3 ++ .../dynamic_54/style4/dynamic_54.png | Bin 0 -> 5234 bytes .../dynamic_54/style4/dynamic_54_button_ctm.png | Bin 3437 -> 607 bytes .../dynamic_54/style4/dynamic_54_slot_ctm.png | Bin 0 -> 539 bytes .../dynamic_54/style5/dynamic_54.png | Bin 0 -> 5429 bytes .../dynamic_54/style5/dynamic_54_button_ctm.png | Bin 0 -> 543 bytes .../dynamic_54/style5/dynamic_54_slot_ctm.png | Bin 0 -> 539 bytes .../dynamic_54/style6/dynamic_54.png | Bin 0 -> 5519 bytes .../dynamic_54/style6/dynamic_54_button_ctm.png | Bin 0 -> 539 bytes .../dynamic_54/style6/dynamic_54_slot_ctm.png | Bin 0 -> 539 bytes .../dynamic_54/style7/dynamic_54.png | Bin 0 -> 5234 bytes .../dynamic_54/style7/dynamic_54_button_ctm.png | Bin 0 -> 3437 bytes .../dynamic_54/style7/dynamic_54_slot_ctm.png | Bin 0 -> 539 bytes .../notenoughupdates/dynamic_54/toggle_off.png | Bin 0 -> 389 bytes .../notenoughupdates/dynamic_54/toggle_on.png | Bin 0 -> 406 bytes .../assets/notenoughupdates/shaders/lava_cape.frag | 32 +++++++++++++++++++++ .../assets/notenoughupdates/shaders/lava_cape.vert | 12 ++++++++ .../notenoughupdates/supersecretassets/bald.png | Bin 0 -> 19909 bytes 38 files changed, 53 insertions(+) create mode 100644 src/main/resources/assets/notenoughupdates/button_white.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/lava.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/mbstaff.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/packshq.png create mode 100644 src/main/resources/assets/notenoughupdates/colour_selector_bar.png create mode 100644 src/main/resources/assets/notenoughupdates/colour_selector_bar_alpha.png create mode 100644 src/main/resources/assets/notenoughupdates/colour_selector_chroma.png create mode 100644 src/main/resources/assets/notenoughupdates/colour_selector_dot.png delete mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/dynamic_54_button_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_config.json create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_config.json create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_config.json create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png create mode 100644 src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png create mode 100644 src/main/resources/assets/notenoughupdates/shaders/lava_cape.frag create mode 100644 src/main/resources/assets/notenoughupdates/shaders/lava_cape.vert create mode 100644 src/main/resources/assets/notenoughupdates/supersecretassets/bald.png (limited to 'src/main/resources/assets') 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/button_white.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/lava.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/mbstaff.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/packshq.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/colour_selector_bar.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/colour_selector_bar_alpha.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/colour_selector_chroma.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/colour_selector_dot.png differ diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/dynamic_54_button_ctm.png deleted file mode 100644 index bab0eab7..00000000 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/dynamic_54_button_ctm.png and /dev/null differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54.png differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_button_ctm.png differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style1/dynamic_54_slot_ctm.png differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_button_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style2/dynamic_54_slot_ctm.png differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54.png differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_button_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style3/dynamic_54_slot_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54.png differ 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 Binary files a/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png and b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_button_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style4/dynamic_54_slot_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54.png differ diff --git a/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png new file mode 100644 index 00000000..bab0eab7 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_button_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style5/dynamic_54_slot_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_button_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style6/dynamic_54_slot_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_button_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/style7/dynamic_54_slot_ctm.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_off.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/dynamic_54/toggle_on.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/supersecretassets/bald.png differ -- cgit