diff --git a/1_21_2/assets/minecraft/post_effect/entity_outline.json b/1_21_2/assets/minecraft/post_effect/entity_outline.json new file mode 100644 index 000000000..ed43e272e --- /dev/null +++ b/1_21_2/assets/minecraft/post_effect/entity_outline.json @@ -0,0 +1,27 @@ +{ + "targets": { + "swap": {} + }, + "passes": [ + { + "program": "post/entity_outline", + "inputs": [ + { + "sampler_name": "In", + "target": "entity_outline" + } + ], + "output": "swap" + }, + { + "program": "post/blit", + "inputs": [ + { + "sampler_name": "In", + "target": "swap" + } + ], + "output": "entity_outline" + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/position_color.json b/1_21_2/assets/minecraft/shaders/core/position_color.json new file mode 100644 index 000000000..ccfbd842b --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/position_color.json @@ -0,0 +1,61 @@ +{ + "vertex": "core/render/gui", + "fragment": "core/position_color", + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/position_tex.json b/1_21_2/assets/minecraft/shaders/core/position_tex.json new file mode 100644 index 000000000..5c2706f0e --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/position_tex.json @@ -0,0 +1,78 @@ +{ + "vertex": "core/position_tex", + "fragment": "core/position_tex", + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "ScreenSize", + "type": "float", + "count": 2, + "values": [ + 0.0, + 0.0 + ] + }, + { + "name": "GameTime", + "type": "float", + "count": 1, + "values": [ + 1.0 + ] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/position_tex_color.json b/1_21_2/assets/minecraft/shaders/core/position_tex_color.json new file mode 100644 index 000000000..17d7fe5a6 --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/position_tex_color.json @@ -0,0 +1,78 @@ +{ + "vertex": "core/render/texture", + "fragment": "core/render/texture", + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "ScreenSize", + "type": "float", + "count": 2, + "values": [ + 0.0, + 0.0 + ] + }, + { + "name": "GameTime", + "type": "float", + "count": 1, + "values": [ + 1.0 + ] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json b/1_21_2/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json new file mode 100644 index 000000000..0546a34d9 --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json @@ -0,0 +1,108 @@ +{ + "vertex": "core/render/glint", + "fragment": "core/render/glint", + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "GlintAlpha", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogStart", + "type": "float", + "count": 1, + "values": [0.0] + }, + { + "name": "FogEnd", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogShape", + "type": "int", + "count": 1, + "values": [0] + }, + { + "name": "TextureMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/rendertype_entity_glint.json b/1_21_2/assets/minecraft/shaders/core/rendertype_entity_glint.json new file mode 100644 index 000000000..0546a34d9 --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/rendertype_entity_glint.json @@ -0,0 +1,108 @@ +{ + "vertex": "core/render/glint", + "fragment": "core/render/glint", + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "GlintAlpha", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogStart", + "type": "float", + "count": 1, + "values": [0.0] + }, + { + "name": "FogEnd", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogShape", + "type": "int", + "count": 1, + "values": [0] + }, + { + "name": "TextureMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/rendertype_glint.json b/1_21_2/assets/minecraft/shaders/core/rendertype_glint.json new file mode 100644 index 000000000..0546a34d9 --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/rendertype_glint.json @@ -0,0 +1,108 @@ +{ + "vertex": "core/render/glint", + "fragment": "core/render/glint", + "samplers": [ + { "name": "Sampler0" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "GlintAlpha", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogStart", + "type": "float", + "count": 1, + "values": [0.0] + }, + { + "name": "FogEnd", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogShape", + "type": "int", + "count": 1, + "values": [0] + }, + { + "name": "TextureMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/rendertype_gui.json b/1_21_2/assets/minecraft/shaders/core/rendertype_gui.json new file mode 100644 index 000000000..85a21452a --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/rendertype_gui.json @@ -0,0 +1,59 @@ +{ + "vertex": "core/render/gui", + "fragment": "core/render/gui", + "samplers": [], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json b/1_21_2/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json new file mode 100644 index 000000000..7cc766c6d --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json @@ -0,0 +1,98 @@ +{ + "vertex": "core/render/item", + "fragment": "core/render/item", + "samplers": [ + { "name": "Sampler0" }, + { "name": "Sampler2" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "Light0_Direction", + "type": "float", + "count": 3, + "values": [0.0, 0.0, 0.0] + }, + { + "name": "Light1_Direction", + "type": "float", + "count": 3, + "values": [0.0, 0.0, 0.0] + }, + { + "name": "FogStart", + "type": "float", + "count": 1, + "values": [0.0] + }, + { + "name": "FogEnd", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogColor", + "type": "float", + "count": 4, + "values": [0.0, 0.0, 0.0, 0.0] + }, + { + "name": "FogShape", + "type": "int", + "count": 1, + "values": [0] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/core/rendertype_text.json b/1_21_2/assets/minecraft/shaders/core/rendertype_text.json new file mode 100644 index 000000000..8872321f1 --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/core/rendertype_text.json @@ -0,0 +1,92 @@ +{ + "vertex": "core/render/text", + "fragment": "core/render/text", + "samplers": [ + { "name": "Sampler0" }, + { "name": "Sampler2" } + ], + "uniforms": [ + { + "name": "ModelViewMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "ColorModulator", + "type": "float", + "count": 4, + "values": [1.0, 1.0, 1.0, 1.0] + }, + { + "name": "FogStart", + "type": "float", + "count": 1, + "values": [0.0] + }, + { + "name": "FogEnd", + "type": "float", + "count": 1, + "values": [1.0] + }, + { + "name": "FogColor", + "type": "float", + "count": 4, + "values": [0.0, 0.0, 0.0, 0.0] + }, + { + "name": "FogShape", + "type": "int", + "count": 1, + "values": [0] + }, + { + "name": "ScreenSize", + "type": "float", + "count": 2, + "values": [1.0, 1.0] + } + ] +} diff --git a/1_21_2/assets/minecraft/shaders/include/version.glsl b/1_21_2/assets/minecraft/shaders/include/version.glsl new file mode 100644 index 000000000..9c517a90f --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/include/version.glsl @@ -0,0 +1 @@ +#define MC_1_21_2 \ No newline at end of file diff --git a/1_21_2/assets/minecraft/shaders/post/entity_outline.json b/1_21_2/assets/minecraft/shaders/post/entity_outline.json new file mode 100644 index 000000000..712273142 --- /dev/null +++ b/1_21_2/assets/minecraft/shaders/post/entity_outline.json @@ -0,0 +1,44 @@ +{ + "vertex": "post/sobel", + "fragment": "post/entity_sobel", + "samplers": [ + { "name": "InSampler" } + ], + "uniforms": [ + { + "name": "ProjMat", + "type": "matrix4x4", + "count": 16, + "values": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ] + }, + { + "name": "InSize", + "type": "float", + "count": 2, + "values": [1.0, 1.0] + }, + { + "name": "OutSize", + "type": "float", + "count": 2, + "values": [1.0, 1.0] + } + ] +} diff --git a/assets/minecraft/font/default.json b/assets/minecraft/font/default.json index b4b2fd8b7..23f11a90c 100644 --- a/assets/minecraft/font/default.json +++ b/assets/minecraft/font/default.json @@ -1 +1 @@ -{"providers":[{"type":"space","advances":{" ":4,"‌":0,"":64,"":5,"À":1,"֎":0,"⁤":-1,"":-6,"":-7,"":-14,"":-16,"":-144,"":-517,"":16384}},{"type":"reference","id":"overlay"},{"type":"bitmap","file":"font/profession.png","ascent":7,"chars":["ⒿⓀⒷⒸⓁⒽⒶⒹⒺⒻⒼⒾ"]},{"type":"bitmap","file":"font/common.png","ascent":8,"height":10,"chars":["❋✤✹✦❉✣❤✺\u0000\u0000\u0000⬣⬌⬤✖✔","\u0000\u0000❁➲\u0000✃⚘\u0000☠✜➽⚔➼☀⛨⌛","⚕\u0000\u0000\u0000\u0000\u0000\u0000⌚⬟\u0000\u0000\u0000\u0000\u0000⬠\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000⬡"]},{"type":"bitmap","file":"font/language/wynnic.png","ascent":7,"chars":["⑽⑾⑿\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u00001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00000\u0000","\u0000⑴⑵⑶⑷⑸⑹⑺⑻⑼\u0000\u0000\u0000\u0000\u00002","\u0000⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪","⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"]},{"type":"bitmap","file":"font/language/high_gavellian.png","ascent":7,"chars":["\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞ","ⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"]},{"type":"bitmap","file":"font/screen/fade.png","ascent":512,"height":1024,"chars":["Á"]},{"type":"bitmap","file":"font/screen/trans.png","ascent":512,"height":1024,"chars":[""]},{"type":"bitmap","file":"font/screen/flash.png","ascent":512,"height":1024,"chars":[""]},{"type":"bitmap","file":"font/currency.png","ascent":8,"chars":["½²¼"]},{"type":"bitmap","file":"font/rank.png","ascent":7,"height":7,"chars":["","","","","","","","","","","","","","","","","",""]},{"type":"bitmap","file":"font/badge.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/sb.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/class.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/five.png","ascent":6,"height":7,"chars":["","",""]},{"type":"bitmap","file":"font/chat/banner_full.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_start.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_end.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_end_alt.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_short.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat.png","ascent":8,"height":9,"chars":["\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"]}]} \ No newline at end of file +{"providers":[{"type":"space","advances":{" ":4,"‌":0,"":64,"":5,"À":1,"֎":0,"⁤":-1,"":-6,"":-7,"":-14,"":-16,"":-144,"":-517}},{"type":"reference","id":"overlay"},{"type":"bitmap","file":"font/profession.png","ascent":7,"chars":["ⒿⓀⒷⒸⓁⒽⒶⒹⒺⒻⒼⒾ"]},{"type":"bitmap","file":"font/common.png","ascent":8,"height":10,"chars":["❋✤✹✦❉✣❤✺\u0000\u0000\u0000⬣⬌⬤✖✔","\u0000\u0000❁➲\u0000✃⚘\u0000☠✜➽⚔➼☀⛨⌛","⚕\u0000\u0000\u0000\u0000\u0000\u0000⌚⬟\u0000\u0000\u0000\u0000\u0000⬠\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000⬡"]},{"type":"bitmap","file":"font/language/wynnic.png","ascent":7,"chars":["⑽⑾⑿\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u00001\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u00000\u0000","\u0000⑴⑵⑶⑷⑸⑹⑺⑻⑼\u0000\u0000\u0000\u0000\u00002","\u0000⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪","⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"]},{"type":"bitmap","file":"font/language/high_gavellian.png","ascent":7,"chars":["\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞ","ⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"]},{"type":"bitmap","file":"font/screen/fade.png","ascent":512,"height":1024,"chars":["Á"]},{"type":"bitmap","file":"font/screen/trans.png","ascent":512,"height":1024,"chars":[""]},{"type":"bitmap","file":"font/screen/flash.png","ascent":512,"height":1024,"chars":[""]},{"type":"bitmap","file":"font/currency.png","ascent":8,"chars":["½²¼"]},{"type":"bitmap","file":"font/rank.png","ascent":7,"height":7,"chars":["","","","","","","","","","","","","","","","","",""]},{"type":"bitmap","file":"font/badge.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/sb.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/class.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/five.png","ascent":6,"height":7,"chars":["","",""]},{"type":"bitmap","file":"font/chat/banner_full.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_start.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_end.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_end_alt.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat/banner_short.png","ascent":7,"height":7,"chars":[""]},{"type":"bitmap","file":"font/chat.png","ascent":8,"height":9,"chars":["\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000"]}]} \ No newline at end of file diff --git a/assets/minecraft/lang/en_au.json b/assets/minecraft/lang/en_au.json index 259a7cfc7..17772b932 100644 --- a/assets/minecraft/lang/en_au.json +++ b/assets/minecraft/lang/en_au.json @@ -1 +1 @@ -{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","chat.tag.error":"","chat.tag.modified":"","chat.tag.not_secure":"","chat.tag.system":"","chat.tag.system_single_player":"","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file +{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file diff --git a/assets/minecraft/lang/en_ca.json b/assets/minecraft/lang/en_ca.json index 259a7cfc7..17772b932 100644 --- a/assets/minecraft/lang/en_ca.json +++ b/assets/minecraft/lang/en_ca.json @@ -1 +1 @@ -{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","chat.tag.error":"","chat.tag.modified":"","chat.tag.not_secure":"","chat.tag.system":"","chat.tag.system_single_player":"","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file +{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file diff --git a/assets/minecraft/lang/en_gb.json b/assets/minecraft/lang/en_gb.json index 259a7cfc7..17772b932 100644 --- a/assets/minecraft/lang/en_gb.json +++ b/assets/minecraft/lang/en_gb.json @@ -1 +1 @@ -{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","chat.tag.error":"","chat.tag.modified":"","chat.tag.not_secure":"","chat.tag.system":"","chat.tag.system_single_player":"","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file +{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file diff --git a/assets/minecraft/lang/en_nz.json b/assets/minecraft/lang/en_nz.json index 259a7cfc7..17772b932 100644 --- a/assets/minecraft/lang/en_nz.json +++ b/assets/minecraft/lang/en_nz.json @@ -1 +1 @@ -{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","chat.tag.error":"","chat.tag.modified":"","chat.tag.not_secure":"","chat.tag.system":"","chat.tag.system_single_player":"","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file +{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file diff --git a/assets/minecraft/lang/en_us.json b/assets/minecraft/lang/en_us.json index 259a7cfc7..17772b932 100644 --- a/assets/minecraft/lang/en_us.json +++ b/assets/minecraft/lang/en_us.json @@ -1 +1 @@ -{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","chat.tag.error":"","chat.tag.modified":"","chat.tag.not_secure":"","chat.tag.system":"","chat.tag.system_single_player":"","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file +{"advancements.empty":"Territory Map refreshed. Reopen to view.","advancements.sad_label":"","advancements.toast.challenge":"§bGuild Notification","advancements.toast.goal":"§aFriend Notification","advancements.toast.task":"Notification","attribute.name.generic.attack_damage":"","attribute.name.generic.attack_knockback":"","attribute.name.generic.attack_speed":"","block.minecraft.infested_chiseled_stone_bricks":"Dark Chiseled Stone Bricks","block.minecraft.infested_cobblestone":"Dark Cobblestone","block.minecraft.infested_cracked_stone_bricks":"Dark Cracked Stone Bricks","block.minecraft.infested_mossy_stone_bricks":"Dark Mossy Stone Bricks","block.minecraft.infested_stone":"Dark Stone","block.minecraft.infested_stone_bricks":"Dark Stone Bricks","block.minecraft.purpur_block":"Sky Wood","block.minecraft.purpur_pillar":"Sky Log","block.minecraft.purpur_slab":"Sky Slab","block.minecraft.purpur_stairs":"Sky Stairs","container.crafting":"","container.inventory":"","effect.minecraft.haste":"Attack Speed","effect.minecraft.mining_fatigue":"Attack Speed","effect.none":"","enchantment.level.1":"","enchantment.level.2":"","enchantment.level.3":"","enchantment.level.4":"","enchantment.level.5":"","enchantment.level.6":"","enchantment.level.7":"","enchantment.level.8":"","enchantment.level.9":"","enchantment.level.10":"","enchantment.minecraft.unbreaking":"","gui.advancements":"Territory Map","item.modifiers.mainhand":"","item.modifiers.offhand":"","item.unbreakable":"","menu.game":"","menu.returnToGame":"Return to Wynncraft","menu.returnToMenu":"Disconnect","menu.disconnect":"Disconnect","menu.shareToLan":"§aWynncraft.com","mount.onboard":"","soundCategory.music":"§cMinecraft Music","soundCategory.record":"§aWynncraft Music"} \ No newline at end of file diff --git a/assets/minecraft/models/equipment/chainmail.json b/assets/minecraft/models/equipment/chainmail.json new file mode 100644 index 000000000..d7c916603 --- /dev/null +++ b/assets/minecraft/models/equipment/chainmail.json @@ -0,0 +1 @@ +{"layers":{"humanoid":[{"texture":"chainmail"}],"humanoid_leggings":[{"texture":"chainmail"}]}} \ No newline at end of file diff --git a/assets/minecraft/models/equipment/diamond.json b/assets/minecraft/models/equipment/diamond.json new file mode 100644 index 000000000..969df4216 --- /dev/null +++ b/assets/minecraft/models/equipment/diamond.json @@ -0,0 +1 @@ +{"layers":{"horse_body":[{"texture":"diamond"}],"humanoid":[{"texture":"diamond"}],"humanoid_leggings":[{"texture":"diamond"}]}} \ No newline at end of file diff --git a/assets/minecraft/models/equipment/gold.json b/assets/minecraft/models/equipment/gold.json new file mode 100644 index 000000000..43f4e28c3 --- /dev/null +++ b/assets/minecraft/models/equipment/gold.json @@ -0,0 +1 @@ +{"layers":{"horse_body":[{"texture":"gold"}],"humanoid":[{"texture":"gold"}],"humanoid_leggings":[{"texture":"gold"}]}} \ No newline at end of file diff --git a/assets/minecraft/models/equipment/iron.json b/assets/minecraft/models/equipment/iron.json new file mode 100644 index 000000000..99da593a7 --- /dev/null +++ b/assets/minecraft/models/equipment/iron.json @@ -0,0 +1 @@ +{"layers":{"horse_body":[{"texture":"iron"}],"humanoid":[{"texture":"iron"}],"humanoid_leggings":[{"texture":"iron"}]}} \ No newline at end of file diff --git a/assets/minecraft/models/equipment/leather.json b/assets/minecraft/models/equipment/leather.json new file mode 100644 index 000000000..8dd1f65fd --- /dev/null +++ b/assets/minecraft/models/equipment/leather.json @@ -0,0 +1 @@ +{"layers":{"horse_body":[{"dyeable":{"color_when_undyed":-6265536},"texture":"leather"}],"humanoid":[{"dyeable":{"color_when_undyed":-6265536},"texture":"leather"}],"humanoid_leggings":[{"dyeable":{"color_when_undyed":-6265536},"texture":"leather"}]}} \ No newline at end of file diff --git a/assets/minecraft/models/item/wynn/gui/tutorial/character_info.json b/assets/minecraft/models/item/wynn/gui/tutorial/character_info.json index f796db37d..95cee693d 100644 --- a/assets/minecraft/models/item/wynn/gui/tutorial/character_info.json +++ b/assets/minecraft/models/item/wynn/gui/tutorial/character_info.json @@ -1 +1 @@ -{"textures":{"layer0":"wynn/gui/tutorial","layer1":"item/compass_16"},"elements":[{"from":[-16,-16,7],"to":[32,32,7],"faces":{"north":{"uv":[0,0,16,16],"texture":"#layer0","tintindex":0}}},{"from":[6,1,7],"to":[11,15,8],"faces":{"north":{"uv":[10,1,5,15],"texture":"#layer1"},"east":{"uv":[9,1,10,15],"texture":"#layer1"},"south":{"uv":[5,1,10,15],"texture":"#layer1"},"west":{"uv":[5,1,6,15],"texture":"#layer1"},"up":{"uv":[5,1,10,2],"texture":"#layer1"},"down":{"uv":[5,14,10,15],"texture":"#layer1"}}},{"from":[4,2,7],"to":[6,14,8],"faces":{"north":{"uv":[5,2,3,14],"texture":"#layer1"},"east":{"uv":[4,2,5,14],"texture":"#layer1"},"south":{"uv":[3,2,5,14],"texture":"#layer1"},"west":{"uv":[3,2,4,14],"texture":"#layer1"},"up":{"uv":[3,2,5,3],"texture":"#layer1"},"down":{"uv":[3,13,5,14],"texture":"#layer1"}}},{"from":[11,2,7],"to":[13,14,8],"faces":{"north":{"uv":[12,2,10,14],"texture":"#layer1"},"east":{"uv":[11,2,12,14],"texture":"#layer1"},"south":{"uv":[10,2,12,14],"texture":"#layer1"},"west":{"uv":[10,2,11,14],"texture":"#layer1"},"up":{"uv":[10,2,12,3],"texture":"#layer1"},"down":{"uv":[10,13,12,14],"texture":"#layer1"}}},{"from":[3,3,7],"to":[4,13,8],"faces":{"north":{"uv":[3,3,2,13],"texture":"#layer1"},"east":{"uv":[2,3,3,13],"texture":"#layer1"},"south":{"uv":[2,3,3,13],"texture":"#layer1"},"west":{"uv":[2,3,3,13],"texture":"#layer1"},"up":{"uv":[2,3,3,4],"texture":"#layer1"},"down":{"uv":[2,12,3,13],"texture":"#layer1"}}},{"from":[13,3,7],"to":[14,13,8],"faces":{"north":{"uv":[13,3,12,13],"texture":"#layer1"},"east":{"uv":[12,3,13,13],"texture":"#layer1"},"south":{"uv":[12,3,13,13],"texture":"#layer1"},"west":{"uv":[12,3,13,13],"texture":"#layer1"},"up":{"uv":[12,3,13,4],"texture":"#layer1"},"down":{"uv":[12,12,13,13],"texture":"#layer1"}}},{"from":[2,4,7],"to":[3,12,8],"faces":{"north":{"uv":[2,4,1,12],"texture":"#layer1"},"east":{"uv":[1,4,2,12],"texture":"#layer1"},"south":{"uv":[1,4,2,12],"texture":"#layer1"},"west":{"uv":[1,4,2,12],"texture":"#layer1"},"up":{"uv":[1,4,2,5],"texture":"#layer1"},"down":{"uv":[1,11,2,12],"texture":"#layer1"}}},{"from":[14,4,7],"to":[15,12,8],"faces":{"north":{"uv":[14,4,13,12],"texture":"#layer1"},"east":{"uv":[13,4,14,12],"texture":"#layer1"},"south":{"uv":[13,4,14,12],"texture":"#layer1"},"west":{"uv":[13,4,14,12],"texture":"#layer1"},"up":{"uv":[13,4,14,5],"texture":"#layer1"},"down":{"uv":[13,11,14,12],"texture":"#layer1"}}},{"from":[1,5,7],"to":[2,11,8],"faces":{"north":{"uv":[1,5,0,11],"texture":"#layer1"},"east":{"uv":[0,5,1,11],"texture":"#layer1"},"south":{"uv":[0,5,1,11],"texture":"#layer1"},"west":{"uv":[0,5,1,11],"texture":"#layer1"},"up":{"uv":[0,5,1,6],"texture":"#layer1"},"down":{"uv":[0,10,1,11],"texture":"#layer1"}}},{"from":[15,5,7],"to":[16,11,8],"faces":{"north":{"uv":[15,5,14,11],"texture":"#layer1"},"east":{"uv":[14,5,15,11],"texture":"#layer1"},"south":{"uv":[14,5,15,11],"texture":"#layer1"},"west":{"uv":[14,5,15,11],"texture":"#layer1"},"up":{"uv":[14,5,15,6],"texture":"#layer1"},"down":{"uv":[14,10,15,11],"texture":"#layer1"}}}],"gui_light":"front","display":{"thirdperson_righthand":{"translation":[0,3,1],"scale":[0.55,0.55,0.55]},"thirdperson_lefthand":{"translation":[0,3,1],"scale":[0.55,0.55,0.55]},"firstperson_righthand":{"rotation":[0,-90,25],"translation":[1.13,3.2,1.13],"scale":[0.68,0.68,0.68]},"firstperson_lefthand":{"rotation":[0,-90,25],"translation":[1.13,3.2,1.13],"scale":[0.68,0.68,0.68]},"ground":{"translation":[0,2,0],"scale":[0.5,0.5,0.5]},"gui":{"rotation":[0,180,0]},"head":{"rotation":[0,180,0],"translation":[0,13,7]},"fixed":{"rotation":[0,180,0]}}} \ No newline at end of file +{"textures":{"layer0":"wynn/gui/tutorial","layer1":"item/compass_16","particle":"item/compass_16"},"elements":[{"from":[-16,-16,7],"to":[32,32,7],"faces":{"north":{"uv":[0,0,16,16],"texture":"#layer0","tintindex":0}}},{"name":"compass_16_0","from":[4,2,7],"to":[11,14,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[11,2,4,14],"texture":"#layer1"},"east":{"uv":[10,2,11,14],"texture":"#layer1"},"south":{"uv":[4,2,11,14],"texture":"#layer1"},"west":{"uv":[4,2,5,14],"texture":"#layer1"},"up":{"uv":[4,2,11,3],"texture":"#layer1"},"down":{"uv":[4,13,11,14],"texture":"#layer1"}}},{"name":"compass_16_1","from":[2,3,7],"to":[4,13,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[4,3,2,13],"texture":"#layer1"},"east":{"uv":[3,3,4,13],"texture":"#layer1"},"south":{"uv":[2,3,4,13],"texture":"#layer1"},"west":{"uv":[2,3,3,13],"texture":"#layer1"},"up":{"uv":[2,3,4,4],"texture":"#layer1"},"down":{"uv":[2,12,4,13],"texture":"#layer1"}}},{"name":"compass_16_2","from":[11,3,7],"to":[13,13,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[13,3,11,13],"texture":"#layer1"},"east":{"uv":[12,3,13,13],"texture":"#layer1"},"south":{"uv":[11,3,13,13],"texture":"#layer1"},"west":{"uv":[11,3,12,13],"texture":"#layer1"},"up":{"uv":[11,3,13,4],"texture":"#layer1"},"down":{"uv":[11,12,13,13],"texture":"#layer1"}}},{"name":"compass_16_3","from":[1,4,7],"to":[2,12,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[2,4,1,12],"texture":"#layer1"},"east":{"uv":[1,4,2,12],"texture":"#layer1"},"south":{"uv":[1,4,2,12],"texture":"#layer1"},"west":{"uv":[1,4,2,12],"texture":"#layer1"},"up":{"uv":[1,4,2,5],"texture":"#layer1"},"down":{"uv":[1,11,2,12],"texture":"#layer1"}}},{"name":"compass_16_4","from":[13,4,7],"to":[14,12,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[14,4,13,12],"texture":"#layer1"},"east":{"uv":[13,4,14,12],"texture":"#layer1"},"south":{"uv":[13,4,14,12],"texture":"#layer1"},"west":{"uv":[13,4,14,12],"texture":"#layer1"},"up":{"uv":[13,4,14,5],"texture":"#layer1"},"down":{"uv":[13,11,14,12],"texture":"#layer1"}}},{"name":"compass_16_5","from":[0,5,7],"to":[1,11,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[1,5,0,11],"texture":"#layer1"},"east":{"uv":[0,5,1,11],"texture":"#layer1"},"south":{"uv":[0,5,1,11],"texture":"#layer1"},"west":{"uv":[0,5,1,11],"texture":"#layer1"},"up":{"uv":[0,5,1,6],"texture":"#layer1"},"down":{"uv":[0,10,1,11],"texture":"#layer1"}}},{"name":"compass_16_6","from":[14,5,7],"to":[15,11,8],"rotation":{"angle":0,"axis":"y","origin":[0,0,7]},"faces":{"north":{"uv":[15,5,14,11],"texture":"#layer1"},"east":{"uv":[14,5,15,11],"texture":"#layer1"},"south":{"uv":[14,5,15,11],"texture":"#layer1"},"west":{"uv":[14,5,15,11],"texture":"#layer1"},"up":{"uv":[14,5,15,6],"texture":"#layer1"},"down":{"uv":[14,10,15,11],"texture":"#layer1"}}}],"gui_light":"front","display":{"thirdperson_righthand":{"translation":[0,3,1],"scale":[0.55,0.55,0.55]},"thirdperson_lefthand":{"translation":[0,3,1],"scale":[0.55,0.55,0.55]},"firstperson_righthand":{"rotation":[0,-90,25],"translation":[1.13,3.2,1.13],"scale":[0.68,0.68,0.68]},"firstperson_lefthand":{"rotation":[0,-90,25],"translation":[1.13,3.2,1.13],"scale":[0.68,0.68,0.68]},"ground":{"translation":[0,2,0],"scale":[0.5,0.5,0.5]},"gui":{"rotation":[0,180,0]},"head":{"rotation":[0,180,0],"translation":[0,13,7]},"fixed":{"rotation":[0,180,0]}}} \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/item.fsh b/assets/minecraft/shaders/core/render/item.fsh index b0185f57d..a388053de 100644 --- a/assets/minecraft/shaders/core/render/item.fsh +++ b/assets/minecraft/shaders/core/render/item.fsh @@ -36,7 +36,11 @@ void main() { transform.depth = depth; emissiveModel(); - perspectiveModel(253.0, 252.0); + #if defined(MC_1_21_2) + perspectiveModel(253.0, 252.0, -800.0); + #else + perspectiveModel(253.0, 252.0, 2.0); + #endif if(transform.color.a < 0.1) discard; diff --git a/assets/minecraft/shaders/core/render/item.vsh b/assets/minecraft/shaders/core/render/item.vsh index b7f389fc1..cb4cfc0dd 100644 --- a/assets/minecraft/shaders/core/render/item.vsh +++ b/assets/minecraft/shaders/core/render/item.vsh @@ -38,7 +38,7 @@ void main() { transform.color = Color; transform.position = Position; - #if defined(MC_1_20_5) + #if defined(MC_1_20_5) || defined(MC_1_21_2) anchorZ(551, 2201); #endif diff --git a/assets/minecraft/shaders/core/render/text.fsh b/assets/minecraft/shaders/core/render/text.fsh index 3859d42ff..5b5212a18 100644 --- a/assets/minecraft/shaders/core/render/text.fsh +++ b/assets/minecraft/shaders/core/render/text.fsh @@ -31,6 +31,10 @@ void main() { disableShadow(0); #elif defined(MC_1_20_5) disableShadow(2200); + #elif defined(MC_1_21_2) + disableShadow(2200); + disableShadow(1200); + disableShadow(-1000); #endif fragColor = linear_fog(transform.color, vertexDistance, FogStart, FogEnd, FogColor); diff --git a/assets/minecraft/shaders/core/render/text.vsh b/assets/minecraft/shaders/core/render/text.vsh index 0362457a5..146bc7f63 100644 --- a/assets/minecraft/shaders/core/render/text.vsh +++ b/assets/minecraft/shaders/core/render/text.vsh @@ -40,9 +40,9 @@ void main() { #if defined(MC_1_20_2) hideScoreboardNumbers(vec3(0.94, -0.35, 0), vec3(255, 85, 85), 4); anchorZ(1.0, 0.03, -1); - #elif defined(MC_1_20_5) + #elif defined(MC_1_20_5) || defined(MC_1_21_2) hideScoreboardNumbers(vec3(0.94, -0.35, 2000), vec3(255, 85, 85), 4); - anchorZ(1.0, 2200.03, -1); + anchorZ(1.0, 2200.03, -2200.03); #endif verticalSlide(2, Color.a); diff --git a/assets/minecraft/shaders/core/render/texture.fsh b/assets/minecraft/shaders/core/render/texture.fsh index 309aac65c..6eaf48aa8 100644 --- a/assets/minecraft/shaders/core/render/texture.fsh +++ b/assets/minecraft/shaders/core/render/texture.fsh @@ -1,6 +1,7 @@ #version 150 #define FRAGMENT_SHADER #define POSITION_TEX +#define POSITION_TEX_COLOR #moj_import #moj_import @@ -11,13 +12,18 @@ uniform sampler2D Sampler0; uniform vec4 ColorModulator; in vec2 texCoord0; +in vec4 vertexColor; out vec4 fragColor; void main() { transform.textureUV = texCoord0; - transform.color = texture(Sampler0, texCoord0); transform.colorMod = ColorModulator; + #if defined(MC_1_21_2) + transform.color = texture(Sampler0, texCoord0) * vertexColor; + #else + transform.color = texture(Sampler0, texCoord0); + #endif removePixel(Sampler0, ivec2(0, 0), ivec4(255, 0, 0, 255)); removePixel(Sampler0, ivec2(0, 1), ivec4(255, 0, 0, 255)); diff --git a/assets/minecraft/shaders/core/render/texture.vsh b/assets/minecraft/shaders/core/render/texture.vsh index d17c7b259..f4d00b5e7 100644 --- a/assets/minecraft/shaders/core/render/texture.vsh +++ b/assets/minecraft/shaders/core/render/texture.vsh @@ -1,6 +1,7 @@ #version 150 #define VERTEX_SHADER #define POSITION_TEX +#define POSITION_TEX_COLOR #moj_import #moj_import @@ -8,6 +9,7 @@ in vec3 Position; in vec2 UV0; +in vec4 Color; uniform sampler2D Sampler0; uniform vec2 ScreenSize; @@ -16,11 +18,13 @@ uniform mat4 ModelViewMat; uniform mat4 ProjMat; out vec2 texCoord0; +out vec4 vertexColor; void main() { texCoord0 = UV0; transform.position = Position; + transform.vertexColor = Color; transform.textureUV = UV0; transform.gameTime = GameTime; transform.guiScale = getGuiScale(ProjMat, ScreenSize); @@ -36,4 +40,8 @@ void main() { gl_Position = ProjMat * ModelViewMat * vec4(transform.position, 1.0); texCoord0 = transform.textureUV; + + #if defined(MC_1_21_2) + vertexColor = transform.vertexColor; + #endif } \ No newline at end of file diff --git a/assets/minecraft/shaders/include/item.glsl b/assets/minecraft/shaders/include/item.glsl index c01e093fb..0bbc259f7 100644 --- a/assets/minecraft/shaders/include/item.glsl +++ b/assets/minecraft/shaders/include/item.glsl @@ -41,14 +41,14 @@ void emissiveModel() { transform.color *= mix(vec4(1), transform.lightColor, transform.emissive); } -void perspectiveModel(float worldAlpha, float interfaceAlpha) { +void perspectiveModel(float worldAlpha, float interfaceAlpha, float depth) { if(alpha(transform.alpha, worldAlpha) && transform.vertexDistance < 800) discard; if(transform.vertexDistance >= 800) { - if(alpha(transform.alpha, worldAlpha) && transform.depth < 2.0) + if(alpha(transform.alpha, worldAlpha) && transform.depth < depth) discard; - else if(alpha(transform.alpha, interfaceAlpha) && transform.depth >= 2.0) + else if(alpha(transform.alpha, interfaceAlpha) && transform.depth >= depth) discard; } } diff --git a/assets/minecraft/shaders/include/texture.glsl b/assets/minecraft/shaders/include/texture.glsl index 99c85f084..bac77a86e 100644 --- a/assets/minecraft/shaders/include/texture.glsl +++ b/assets/minecraft/shaders/include/texture.glsl @@ -1,10 +1,11 @@ #version 150 -#if defined(POSITION_TEX) +#if defined(POSITION_TEX) || defined(POSITION_TEX_COLOR) #ifdef VERTEX_SHADER struct Transform { vec4 color; + vec4 vertexColor; float guiScale; float gameTime; float elementDepth; diff --git a/assets/minecraft/sounds/instrument/bass.ogg b/assets/minecraft/sounds/instrument/bass.ogg index 4b65c26b0..ee9ac5086 100644 Binary files a/assets/minecraft/sounds/instrument/bass.ogg and b/assets/minecraft/sounds/instrument/bass.ogg differ diff --git a/assets/minecraft/sounds/instrument/bell.ogg b/assets/minecraft/sounds/instrument/bell.ogg index 9583d4cc7..08728e513 100644 Binary files a/assets/minecraft/sounds/instrument/bell.ogg and b/assets/minecraft/sounds/instrument/bell.ogg differ diff --git a/assets/minecraft/sounds/instrument/brass.ogg b/assets/minecraft/sounds/instrument/brass.ogg index d02004b2f..aac670de2 100644 Binary files a/assets/minecraft/sounds/instrument/brass.ogg and b/assets/minecraft/sounds/instrument/brass.ogg differ diff --git a/assets/minecraft/sounds/instrument/drum.ogg b/assets/minecraft/sounds/instrument/drum.ogg index 14ddff340..394518677 100644 Binary files a/assets/minecraft/sounds/instrument/drum.ogg and b/assets/minecraft/sounds/instrument/drum.ogg differ diff --git a/assets/minecraft/sounds/instrument/flute.ogg b/assets/minecraft/sounds/instrument/flute.ogg index 292405cc0..2d0ce633f 100644 Binary files a/assets/minecraft/sounds/instrument/flute.ogg and b/assets/minecraft/sounds/instrument/flute.ogg differ diff --git a/assets/minecraft/sounds/instrument/guitar.ogg b/assets/minecraft/sounds/instrument/guitar.ogg index 9e11a3950..c92e1eea9 100644 Binary files a/assets/minecraft/sounds/instrument/guitar.ogg and b/assets/minecraft/sounds/instrument/guitar.ogg differ diff --git a/assets/minecraft/sounds/instrument/harp.ogg b/assets/minecraft/sounds/instrument/harp.ogg index 174507ad2..4f8ef79ce 100644 Binary files a/assets/minecraft/sounds/instrument/harp.ogg and b/assets/minecraft/sounds/instrument/harp.ogg differ diff --git a/assets/minecraft/sounds/instrument/hat.ogg b/assets/minecraft/sounds/instrument/hat.ogg index 160055adc..2d6684a51 100644 Binary files a/assets/minecraft/sounds/instrument/hat.ogg and b/assets/minecraft/sounds/instrument/hat.ogg differ diff --git a/assets/minecraft/sounds/instrument/kora.ogg b/assets/minecraft/sounds/instrument/kora.ogg index 79c1eccc1..0202d0cb5 100644 Binary files a/assets/minecraft/sounds/instrument/kora.ogg and b/assets/minecraft/sounds/instrument/kora.ogg differ diff --git a/assets/minecraft/sounds/instrument/marimba.ogg b/assets/minecraft/sounds/instrument/marimba.ogg index 6ea000b4e..f7e930757 100644 Binary files a/assets/minecraft/sounds/instrument/marimba.ogg and b/assets/minecraft/sounds/instrument/marimba.ogg differ diff --git a/assets/minecraft/sounds/instrument/piano.ogg b/assets/minecraft/sounds/instrument/piano.ogg index c57ada421..e4797a87d 100644 Binary files a/assets/minecraft/sounds/instrument/piano.ogg and b/assets/minecraft/sounds/instrument/piano.ogg differ diff --git a/assets/minecraft/sounds/instrument/pizz.ogg b/assets/minecraft/sounds/instrument/pizz.ogg index 9359365fb..51737077c 100644 Binary files a/assets/minecraft/sounds/instrument/pizz.ogg and b/assets/minecraft/sounds/instrument/pizz.ogg differ diff --git a/assets/minecraft/sounds/instrument/snare.ogg b/assets/minecraft/sounds/instrument/snare.ogg index 04e71c66a..efaa68a17 100644 Binary files a/assets/minecraft/sounds/instrument/snare.ogg and b/assets/minecraft/sounds/instrument/snare.ogg differ diff --git a/assets/minecraft/sounds/instrument/tamborine.ogg b/assets/minecraft/sounds/instrument/tamborine.ogg index f75b8f43e..d8365bbbb 100644 Binary files a/assets/minecraft/sounds/instrument/tamborine.ogg and b/assets/minecraft/sounds/instrument/tamborine.ogg differ diff --git a/assets/minecraft/sounds/instrument/tom.ogg b/assets/minecraft/sounds/instrument/tom.ogg index baf58080a..8d07e14c7 100644 Binary files a/assets/minecraft/sounds/instrument/tom.ogg and b/assets/minecraft/sounds/instrument/tom.ogg differ diff --git a/assets/minecraft/sounds/instrument/vibraphone.ogg b/assets/minecraft/sounds/instrument/vibraphone.ogg index 3ecf4e9e0..2862a750b 100644 Binary files a/assets/minecraft/sounds/instrument/vibraphone.ogg and b/assets/minecraft/sounds/instrument/vibraphone.ogg differ diff --git a/assets/minecraft/sounds/instrument/woodblock.ogg b/assets/minecraft/sounds/instrument/woodblock.ogg index 94d65fe96..2d4d51070 100644 Binary files a/assets/minecraft/sounds/instrument/woodblock.ogg and b/assets/minecraft/sounds/instrument/woodblock.ogg differ diff --git a/assets/minecraft/sounds/other/blank.ogg b/assets/minecraft/sounds/other/blank.ogg index e141619ec..149a387ee 100644 Binary files a/assets/minecraft/sounds/other/blank.ogg and b/assets/minecraft/sounds/other/blank.ogg differ diff --git a/assets/minecraft/sounds/ui/click.ogg b/assets/minecraft/sounds/ui/click.ogg index 3abf622ed..370b6c224 100644 Binary files a/assets/minecraft/sounds/ui/click.ogg and b/assets/minecraft/sounds/ui/click.ogg differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png b/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png new file mode 100644 index 000000000..1a7b3c85a Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid/chainmail.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid/diamond.png b/assets/minecraft/textures/entity/equipment/humanoid/diamond.png new file mode 100644 index 000000000..f1767224e Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid/diamond.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid/gold.png b/assets/minecraft/textures/entity/equipment/humanoid/gold.png new file mode 100644 index 000000000..04b0fbd73 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid/gold.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid/iron.png b/assets/minecraft/textures/entity/equipment/humanoid/iron.png new file mode 100644 index 000000000..f4fc7cdb8 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid/iron.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid/leather.png b/assets/minecraft/textures/entity/equipment/humanoid/leather.png new file mode 100644 index 000000000..b19e530b4 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid/leather.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid_leggings/chainmail.png b/assets/minecraft/textures/entity/equipment/humanoid_leggings/chainmail.png new file mode 100644 index 000000000..a8d855a61 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid_leggings/chainmail.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid_leggings/diamond.png b/assets/minecraft/textures/entity/equipment/humanoid_leggings/diamond.png new file mode 100644 index 000000000..ed71373d7 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid_leggings/diamond.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid_leggings/gold.png b/assets/minecraft/textures/entity/equipment/humanoid_leggings/gold.png new file mode 100644 index 000000000..6a298af27 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid_leggings/gold.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid_leggings/iron.png b/assets/minecraft/textures/entity/equipment/humanoid_leggings/iron.png new file mode 100644 index 000000000..2ac00dfb8 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid_leggings/iron.png differ diff --git a/assets/minecraft/textures/entity/equipment/humanoid_leggings/leather.png b/assets/minecraft/textures/entity/equipment/humanoid_leggings/leather.png new file mode 100644 index 000000000..e79ebcd25 Binary files /dev/null and b/assets/minecraft/textures/entity/equipment/humanoid_leggings/leather.png differ diff --git a/assets/minecraft/textures/entity/projectiles/arrow.png b/assets/minecraft/textures/entity/projectiles/arrow.png index d3969ce2a..c7e0135d8 100644 Binary files a/assets/minecraft/textures/entity/projectiles/arrow.png and b/assets/minecraft/textures/entity/projectiles/arrow.png differ diff --git a/assets/minecraft/textures/entity/projectiles/spectral_arrow.png b/assets/minecraft/textures/entity/projectiles/spectral_arrow.png index 8531672f6..c5d75f02f 100644 Binary files a/assets/minecraft/textures/entity/projectiles/spectral_arrow.png and b/assets/minecraft/textures/entity/projectiles/spectral_arrow.png differ diff --git a/assets/minecraft/textures/entity/projectiles/tipped_arrow.png b/assets/minecraft/textures/entity/projectiles/tipped_arrow.png index d3969ce2a..c7e0135d8 100644 Binary files a/assets/minecraft/textures/entity/projectiles/tipped_arrow.png and b/assets/minecraft/textures/entity/projectiles/tipped_arrow.png differ diff --git a/assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png b/assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png new file mode 100644 index 000000000..69ddb858f Binary files /dev/null and b/assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png differ diff --git a/assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png.mcmeta b/assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png.mcmeta new file mode 100644 index 000000000..20ba6b1d1 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png.mcmeta @@ -0,0 +1 @@ +{"gui":{"scaling":{"type":"nine_slice","width":100,"height":100,"border":9}}} \ No newline at end of file diff --git a/assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png b/assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png new file mode 100644 index 000000000..69ddb858f Binary files /dev/null and b/assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png differ diff --git a/assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png.mcmeta b/assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png.mcmeta new file mode 100644 index 000000000..d79dda996 --- /dev/null +++ b/assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png.mcmeta @@ -0,0 +1 @@ +{"gui":{"scaling":{"type":"nine_slice","width":100,"height":100,"border":10,"stretch_inner":true}}} \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta index c2f62a873..47480b64c 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1 +1 @@ -{"pack":{"pack_format":34,"supported_formats":{"min_inclusive":18,"max_inclusive":34},"description":[{"text":"Wynncraft Resource Pack","color":"#bbd65a"},{"text":" "},{"text":"2.1","color":"gray"},{"text":"\n"},{"text":"1.21.1","color":"gray"},{"text":" "},{"text":"Oct. 10, 2024","color":"dark_gray"}]},"overlays":{"entries":[{"formats":[32,34],"directory":"1_20_5"}]}} \ No newline at end of file +{"pack":{"pack_format":42,"supported_formats":{"min_inclusive":18,"max_inclusive":42},"description":[{"text":"Wynncraft Resource Pack","color":"#bbd65a"},{"text":" "},{"text":"2.1","color":"gray"},{"text":"\n"},{"text":"1.21.2","color":"gray"},{"text":" "},{"text":"Oct. 21, 2024","color":"dark_gray"}]},"overlays":{"entries":[{"formats":{"min_inclusive":32,"max_inclusive":99},"directory":"1_20_5"},{"formats":{"min_inclusive":42,"max_inclusive":99},"directory":"1_21_2"}]}} \ No newline at end of file