diff options
Diffstat (limited to 'src/main/resources')
29 files changed, 235 insertions, 26 deletions
diff --git a/src/main/resources/assets/notenoughupdates/ah_search_overlay.png b/src/main/resources/assets/notenoughupdates/auc_search/ah_search_overlay.png Binary files differindex 3e21edda..3e21edda 100644 --- a/src/main/resources/assets/notenoughupdates/ah_search_overlay.png +++ b/src/main/resources/assets/notenoughupdates/auc_search/ah_search_overlay.png diff --git a/src/main/resources/assets/notenoughupdates/auc_search/star.png b/src/main/resources/assets/notenoughupdates/auc_search/star.png Binary files differnew file mode 100644 index 00000000..f0e86860 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/auc_search/star.png diff --git a/src/main/resources/assets/notenoughupdates/auc_search/star_board.png b/src/main/resources/assets/notenoughupdates/auc_search/star_board.png Binary files differnew file mode 100644 index 00000000..8251731f --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/auc_search/star_board.png diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/elephant.png b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/elephant.png Binary files differnew file mode 100644 index 00000000..0a8a46f0 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/elephant.png diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/moul_hat.json b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/moul_hat.json new file mode 100644 index 00000000..517fb881 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/moul_hat.json @@ -0,0 +1,204 @@ +{ + "credit": "for some random ass australian", + "textures": { + "0": "australia/spartan", + "particle": "australia/spartan" + }, + "elements": [ + { + "from": [4, -1, 12], + "to": [12, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 20]}, + "faces": { + "north": {"uv": [9.75, 2.5, 11.75, 4], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 6], "texture": "#missing"}, + "south": {"uv": [9.75, 2.5, 11.75, 4], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 6], "texture": "#missing"}, + "up": {"uv": [1.75, 5, 2, 7], "texture": "#0"}, + "down": {"uv": [4, 2.5, 4.5, 2.75], "texture": "#0"} + } + }, + { + "from": [4, 4, 4], + "to": [12, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 12, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "up": {"uv": [0.25, 5.25, 1.75, 6.75], "texture": "#0"}, + "down": {"uv": [0.25, 5.25, 1.75, 6.75], "texture": "#0"} + } + }, + { + "from": [4, 2, 3], + "to": [12, 5, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 10, 11]}, + "faces": { + "north": {"uv": [4, 2.5, 6, 3.25], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 3], "texture": "#missing"}, + "south": {"uv": [0, 0, 8, 3], "texture": "#missing"}, + "west": {"uv": [0, 0, 1, 3], "texture": "#missing"}, + "up": {"uv": [1.75, 5, 2, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 1], "texture": "#missing"} + } + }, + { + "from": [4, -6, 3], + "to": [6, 0, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 2, 11]}, + "faces": { + "north": {"uv": [1, 2.5, 1.5, 4], "texture": "#0"}, + "east": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"}, + "south": {"uv": [0, 2.5, 0.5, 4], "texture": "#0"}, + "west": {"uv": [3.25, 2.5, 3.5, 3.25], "texture": "#0"}, + "up": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"}, + "down": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"} + } + }, + { + "from": [10, -6, 3], + "to": [12, 0, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [18, 2, 11]}, + "faces": { + "north": {"uv": [0, 2.5, 0.5, 4], "texture": "#0"}, + "east": {"uv": [3.25, 2.5, 3.5, 3.25], "texture": "#0"}, + "south": {"uv": [1, 2.5, 1.5, 4], "texture": "#0"}, + "west": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"}, + "up": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"}, + "down": {"uv": [1.75, 2.5, 2, 4], "texture": "#0"} + } + }, + { + "from": [7, -1, 3.5], + "to": [9, 2, 4.5], + "rotation": {"angle": 0, "axis": "y", "origin": [15, 7, 11]}, + "faces": { + "north": {"uv": [3, 2.5, 3.5, 3.25], "texture": "#0"}, + "east": {"uv": [3, 2.5, 3.25, 3.25], "texture": "#0"}, + "south": {"uv": [3, 2.5, 3.5, 3.25], "texture": "#0"}, + "west": {"uv": [3, 2.5, 3.25, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "down": {"uv": [13.5, 2.75, 14, 3], "texture": "#0"} + } + }, + { + "from": [3, -4, 3], + "to": [4, 5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 4, 11]}, + "faces": { + "north": {"uv": [6, 2.5, 6.25, 4.75], "texture": "#0"}, + "east": {"uv": [13.5, 2.5, 14.75, 4.75], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 9], "texture": "#missing"}, + "west": {"uv": [6.75, 2.5, 8, 4.75], "texture": "#0"}, + "up": {"uv": [1.75, 5, 2, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 5], "texture": "#missing"} + } + }, + { + "from": [12, -4, 3], + "to": [13, 5, 8], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 4, 11]}, + "faces": { + "north": {"uv": [6, 2.5, 6.25, 4.75], "texture": "#0"}, + "east": {"uv": [13.5, 2.5, 14.75, 4.75], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 9], "texture": "#missing"}, + "west": {"uv": [6.75, 2.5, 8, 4.75], "texture": "#0"}, + "up": {"uv": [1.75, 5, 2, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 5], "texture": "#missing"} + } + }, + { + "from": [3, -2, 8], + "to": [4, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 6, 16]}, + "faces": { + "north": {"uv": [0, 0, 1, 7], "texture": "#missing"}, + "east": {"uv": [12.25, 2.5, 13.5, 4.25], "texture": "#0"}, + "south": {"uv": [6, 2.5, 6.25, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 9.25, 4.25], "texture": "#0"}, + "up": {"uv": [1.75, 5, 2, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 5], "texture": "#missing"} + } + }, + { + "from": [12, -2, 8], + "to": [13, 5, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [20, 6, 16]}, + "faces": { + "north": {"uv": [0, 0, 1, 7], "texture": "#missing"}, + "east": {"uv": [12.25, 2.5, 13.5, 4.25], "texture": "#0"}, + "south": {"uv": [6, 2.5, 6.25, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 9.25, 4.25], "texture": "#0"}, + "up": {"uv": [1.75, 5, 2, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 5], "texture": "#missing"} + } + }, + { + "from": [4, -1, 13], + "to": [12, 0, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 7, 21]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "texture": "#missing"}, + "east": {"uv": [4, 2.5, 4.5, 2.75], "texture": "#0"}, + "south": {"uv": [9.75, 3.75, 11.75, 4], "texture": "#0"}, + "west": {"uv": [4, 2.5, 4.5, 2.75], "texture": "#0"}, + "up": {"uv": [9.75, 3.25, 11.75, 4], "texture": "#0"}, + "down": {"uv": [9.75, 3.75, 11.75, 4.5], "texture": "#0"} + } + }, + { + "from": [7, 5.7, 2], + "to": [9, 14.7, 8], + "rotation": {"angle": -22.5, "axis": "x", "origin": [15, 14, 10]}, + "faces": { + "north": {"uv": [2, 0, 2.5, 2.25], "texture": "#0"}, + "east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "south": {"uv": [0, 0, 2, 9], "texture": "#missing"}, + "west": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "up": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}, + "down": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"} + } + }, + { + "from": [7.01, 4.88135, 7.88436], + "to": [8.99, 13.88135, 13.88436], + "rotation": {"angle": 0, "axis": "x", "origin": [15.01, 13.18135, 15.88436]}, + "faces": { + "north": {"uv": [0, 0, 1.98, 9], "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "south": {"uv": [0, 0, 1.98, 9], "texture": "#missing"}, + "west": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "up": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}, + "down": {"uv": [0, 0, 1.98, 6], "texture": "#missing"} + } + }, + { + "from": [7.02, -0.57048, 11.04624], + "to": [8.98, 8.42952, 17.04624], + "rotation": {"angle": 45, "axis": "x", "origin": [15.02, 7.72952, 19.04624]}, + "faces": { + "north": {"uv": [0, 0, 1.96, 9], "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "south": {"uv": [0, 0, 1.96, 9], "texture": "#missing"}, + "west": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "up": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}, + "down": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"} + } + }, + { + "from": [7.03, 3.63871, 12.127], + "to": [8.97, 9.63871, 18.127], + "rotation": {"angle": 0, "axis": "x", "origin": [15, 17.33871, 19.127]}, + "faces": { + "north": {"uv": [0, 0, 1.94, 9], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 2.25], "texture": "#0"}, + "south": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"}, + "west": {"uv": [0, 0.75, 1.5, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 1.94, 6], "texture": "#missing"}, + "down": {"uv": [2, 0, 2.5, 1.75], "texture": "#0"} + } + } + ] +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/spartan.png b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/spartan.png Binary files differnew file mode 100644 index 00000000..95d484e3 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/custom_skull_textures/australia/spartan.png diff --git a/src/main/resources/assets/notenoughupdates/custom_skull_textures/customskull.json b/src/main/resources/assets/notenoughupdates/custom_skull_textures/customskull.json new file mode 100644 index 00000000..dddd7878 --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/custom_skull_textures/customskull.json @@ -0,0 +1,7 @@ +{ + "comment": "custom models override textures, remove the 'model' part below to make it use the elephant texture", + "f69ba621-a8b6-31a7-8de1-dc7ade140e1d": { + "model": "australia/moul_hat", + "texture": "australia/elephant" + } +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/hhh.json b/src/main/resources/assets/notenoughupdates/hhh.json new file mode 100644 index 00000000..1d34aafc --- /dev/null +++ b/src/main/resources/assets/notenoughupdates/hhh.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "Desktop/hhhh", + "particle": "Desktop/hhhh" + }, + "elements": [ + { + "from": [4, -4, 4], + "to": [12, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [12, 4, 12]}, + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 8], "texture": "#0"} + } + } + ] +}
\ No newline at end of file diff --git a/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/biscuit_cape/biscuit_cape.frag index e3f7feba..e3f7feba 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/biscuit_cape/biscuit_cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/biscuit_cape/biscuit_cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/biscuit_cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/biscuit_cape/biscuit_cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/cape/cape.frag index bfc089bb..bfc089bb 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/cape/cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/cape/cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/cape/cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/fade_cape/fade_cape.frag index 33d6b341..33d6b341 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/fade_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/fade_cape/fade_cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/fade_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/fade_cape/fade_cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/fade_cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/fade_cape/fade_cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/lava_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/lava_cape/lava_cape.frag index 9fb35990..9fb35990 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/lava_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/lava_cape/lava_cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/lava_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/lava_cape/lava_cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/lava_cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/lava_cape/lava_cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/mcworld_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/mcworld_cape/mcworld_cape.frag index 1dc5e1c8..1dc5e1c8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/mcworld_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/mcworld_cape/mcworld_cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/mcworld_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/mcworld_cape/mcworld_cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/mcworld_cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/mcworld_cape/mcworld_cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/negative.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/negative/negative.frag index a601bd0c..a601bd0c 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/negative.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/negative/negative.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/negative.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/negative/negative.vert index 9ccbcd6f..9ccbcd6f 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/negative.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/negative/negative.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/shiny_cape/shiny_cape.frag index 77e2c5eb..77e2c5eb 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/shiny_cape/shiny_cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/shiny_cape/shiny_cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/shiny_cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/shiny_cape/shiny_cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/space_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/space_cape/space_cape.frag index e3e5d56e..e3e5d56e 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/space_cape.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/space_cape/space_cape.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/space_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/space_cape/space_cape.vert index 2b5c48f8..2b5c48f8 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/space_cape.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/space_cape/space_cape.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/void.frag b/src/main/resources/assets/notenoughupdates/shaders/capes/void/void.frag index 3809c133..3809c133 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/void.frag +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/void/void.frag diff --git a/src/main/resources/assets/notenoughupdates/shaders/void.vert b/src/main/resources/assets/notenoughupdates/shaders/capes/void/void.vert index 0cc39c90..0cc39c90 100644 --- a/src/main/resources/assets/notenoughupdates/shaders/void.vert +++ b/src/main/resources/assets/notenoughupdates/shaders/capes/void/void.vert diff --git a/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.frag b/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.frag deleted file mode 100644 index c4472679..00000000 --- a/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.frag +++ /dev/null @@ -1,13 +0,0 @@ -#version 120 - -varying vec4 passColour; -varying vec3 passNormal; -uniform sampler2D textureIn; - -uniform int millis; - -void main() { - vec4 texture = texture2D(textureIn, gl_TexCoord[0].st); - - gl_FragColor = vec4(texture.rgb*shading, gl_FragColor.a); -} diff --git a/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.vert b/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.vert deleted file mode 100644 index 2b5c48f8..00000000 --- a/src/main/resources/assets/notenoughupdates/shaders/lightning_cape.vert +++ /dev/null @@ -1,12 +0,0 @@ -#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/mixins.notenoughupdates.json b/src/main/resources/mixins.notenoughupdates.json index 5a71282c..3b8669cb 100644 --- a/src/main/resources/mixins.notenoughupdates.json +++ b/src/main/resources/mixins.notenoughupdates.json @@ -25,6 +25,7 @@ "MixinEffectRenderer", "MixinRendererLivingEntity", "GuiEditSignAccessor", - "MixinGuiScreen" + "MixinGuiScreen", + "MixinTileEntitySkullRenderer" ] }
\ No newline at end of file |
