From 089bac89c5435eb7e5cf80e7602da953a65f5b1a Mon Sep 17 00:00:00 2001 From: Moulberry Date: Mon, 23 Nov 2020 03:34:12 +1100 Subject: 1.7 --- .../notenoughupdates/calendar/background.png | Bin 0 -> 6052 bytes .../notenoughupdates/calendar/displaybar.png | Bin 0 -> 1389 bytes .../assets/notenoughupdates/calendar/toast.png | Bin 0 -> 1505 bytes .../notenoughupdates/capes/contrib_preview.png | Bin 0 -> 182965 bytes .../assets/notenoughupdates/capes/fade_preview.png | Bin 0 -> 18824 bytes .../notenoughupdates/capes/gravy_preview.png | Bin 0 -> 46719 bytes .../assets/notenoughupdates/capes/lava_preview.png | Bin 0 -> 48947 bytes .../notenoughupdates/capes/mbstaff_preview.png | Bin 0 -> 46832 bytes .../notenoughupdates/capes/mcworld_preview.png | Bin 0 -> 52375 bytes .../notenoughupdates/capes/nullzee_preview.png | Bin 0 -> 85132 bytes .../notenoughupdates/capes/packshq_preview.png | Bin 0 -> 19105 bytes .../notenoughupdates/capes/patreon1_preview.png | Bin 0 -> 36547 bytes .../notenoughupdates/capes/patreon2_preview.png | Bin 0 -> 35918 bytes .../notenoughupdates/capes/space_preview.png | Bin 0 -> 234303 bytes .../assets/notenoughupdates/capes/thebakery.png | Bin 0 -> 537705 bytes .../notenoughupdates/capes/thebakery_preview.png | Bin 0 -> 101986 bytes .../notenoughupdates/shaders/biscuit_cape.frag | 36 +++++++++++++++++++++ .../notenoughupdates/shaders/biscuit_cape.vert | 12 +++++++ .../notenoughupdates/shaders/shiny_cape.frag | 26 +++++++++++++++ .../notenoughupdates/shaders/shiny_cape.vert | 12 +++++++ .../assets/notenoughupdates/slider_off_large.png | Bin 0 -> 2008 bytes .../assets/notenoughupdates/slider_on_large.png | Bin 0 -> 2094 bytes .../resources/assets/notenoughupdates/sounds.json | 23 +++++++++++++ .../assets/notenoughupdates/sounds/in.ogg | Bin 0 -> 20040 bytes .../assets/notenoughupdates/sounds/jingle.ogg | Bin 0 -> 10846 bytes .../assets/notenoughupdates/sounds/out.ogg | Bin 0 -> 19939 bytes 26 files changed, 109 insertions(+) create mode 100644 src/main/resources/assets/notenoughupdates/calendar/background.png create mode 100644 src/main/resources/assets/notenoughupdates/calendar/displaybar.png create mode 100644 src/main/resources/assets/notenoughupdates/calendar/toast.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/contrib_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/fade_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/gravy_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/lava_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/mbstaff_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/mcworld_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/nullzee_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/packshq_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/patreon1_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/patreon2_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/space_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/thebakery.png create mode 100644 src/main/resources/assets/notenoughupdates/capes/thebakery_preview.png create mode 100644 src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.frag create mode 100644 src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.vert create mode 100644 src/main/resources/assets/notenoughupdates/shaders/shiny_cape.frag create mode 100644 src/main/resources/assets/notenoughupdates/shaders/shiny_cape.vert create mode 100644 src/main/resources/assets/notenoughupdates/slider_off_large.png create mode 100644 src/main/resources/assets/notenoughupdates/slider_on_large.png create mode 100644 src/main/resources/assets/notenoughupdates/sounds.json create mode 100644 src/main/resources/assets/notenoughupdates/sounds/in.ogg create mode 100644 src/main/resources/assets/notenoughupdates/sounds/jingle.ogg create mode 100644 src/main/resources/assets/notenoughupdates/sounds/out.ogg (limited to 'src/main/resources') 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/calendar/background.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/calendar/displaybar.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/calendar/toast.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/contrib_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/fade_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/gravy_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/lava_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/mbstaff_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/mcworld_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/nullzee_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/packshq_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/patreon1_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/patreon2_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/space_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/thebakery.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/capes/thebakery_preview.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/slider_off_large.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/slider_on_large.png differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/sounds/in.ogg differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/sounds/jingle.ogg differ 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 Binary files /dev/null and b/src/main/resources/assets/notenoughupdates/sounds/out.ogg differ -- cgit