From 019bcfd2b54a9140a975aa9f7a4e55bad76f6e3d Mon Sep 17 00:00:00 2001 From: endernon Date: Tue, 22 Oct 2024 11:50:40 +0100 Subject: [PATCH] 2.1: Oct. 22 --- .../minecraft/post_effect/entity_outline.json | 27 +++++ .../shaders/core/position_color.json | 61 ++++++++++ .../minecraft/shaders/core/position_tex.json | 78 +++++++++++++ .../shaders/core/position_tex_color.json | 78 +++++++++++++ .../core/rendertype_armor_entity_glint.json | 108 ++++++++++++++++++ .../shaders/core/rendertype_entity_glint.json | 108 ++++++++++++++++++ .../shaders/core/rendertype_glint.json | 108 ++++++++++++++++++ .../shaders/core/rendertype_gui.json | 59 ++++++++++ ...ndertype_item_entity_translucent_cull.json | 98 ++++++++++++++++ .../shaders/core/rendertype_text.json | 92 +++++++++++++++ .../minecraft/shaders/include/version.glsl | 1 + .../shaders/post/entity_outline.json | 44 +++++++ assets/minecraft/font/default.json | 2 +- assets/minecraft/lang/en_au.json | 2 +- assets/minecraft/lang/en_ca.json | 2 +- assets/minecraft/lang/en_gb.json | 2 +- assets/minecraft/lang/en_nz.json | 2 +- assets/minecraft/lang/en_us.json | 2 +- .../minecraft/models/equipment/chainmail.json | 1 + .../minecraft/models/equipment/diamond.json | 1 + assets/minecraft/models/equipment/gold.json | 1 + assets/minecraft/models/equipment/iron.json | 1 + .../minecraft/models/equipment/leather.json | 1 + .../wynn/gui/tutorial/character_info.json | 2 +- assets/minecraft/shaders/core/render/item.fsh | 6 +- assets/minecraft/shaders/core/render/item.vsh | 2 +- assets/minecraft/shaders/core/render/text.fsh | 4 + assets/minecraft/shaders/core/render/text.vsh | 4 +- .../minecraft/shaders/core/render/texture.fsh | 8 +- .../minecraft/shaders/core/render/texture.vsh | 8 ++ assets/minecraft/shaders/include/item.glsl | 6 +- assets/minecraft/shaders/include/texture.glsl | 3 +- assets/minecraft/sounds/instrument/bass.ogg | Bin 7889 -> 7889 bytes assets/minecraft/sounds/instrument/bell.ogg | Bin 10625 -> 10625 bytes assets/minecraft/sounds/instrument/brass.ogg | Bin 10317 -> 10317 bytes assets/minecraft/sounds/instrument/drum.ogg | Bin 10303 -> 10303 bytes assets/minecraft/sounds/instrument/flute.ogg | Bin 10897 -> 10897 bytes assets/minecraft/sounds/instrument/guitar.ogg | Bin 11297 -> 11297 bytes assets/minecraft/sounds/instrument/harp.ogg | Bin 10801 -> 10801 bytes assets/minecraft/sounds/instrument/hat.ogg | Bin 9891 -> 9891 bytes assets/minecraft/sounds/instrument/kora.ogg | Bin 12922 -> 12922 bytes .../minecraft/sounds/instrument/marimba.ogg | Bin 11638 -> 11638 bytes assets/minecraft/sounds/instrument/piano.ogg | Bin 12271 -> 12271 bytes assets/minecraft/sounds/instrument/pizz.ogg | Bin 13174 -> 13174 bytes assets/minecraft/sounds/instrument/snare.ogg | Bin 12939 -> 12939 bytes .../minecraft/sounds/instrument/tamborine.ogg | Bin 8732 -> 8732 bytes assets/minecraft/sounds/instrument/tom.ogg | Bin 14830 -> 14830 bytes .../sounds/instrument/vibraphone.ogg | Bin 9916 -> 9916 bytes .../minecraft/sounds/instrument/woodblock.ogg | Bin 8592 -> 8592 bytes assets/minecraft/sounds/other/blank.ogg | Bin 153 -> 153 bytes assets/minecraft/sounds/ui/click.ogg | Bin 2948 -> 2948 bytes .../entity/equipment/humanoid/chainmail.png | Bin 0 -> 733 bytes .../entity/equipment/humanoid/diamond.png | Bin 0 -> 514 bytes .../entity/equipment/humanoid/gold.png | Bin 0 -> 527 bytes .../entity/equipment/humanoid/iron.png | Bin 0 -> 572 bytes .../entity/equipment/humanoid/leather.png | Bin 0 -> 398 bytes .../equipment/humanoid_leggings/chainmail.png | Bin 0 -> 322 bytes .../equipment/humanoid_leggings/diamond.png | Bin 0 -> 276 bytes .../equipment/humanoid_leggings/gold.png | Bin 0 -> 256 bytes .../equipment/humanoid_leggings/iron.png | Bin 0 -> 290 bytes .../equipment/humanoid_leggings/leather.png | Bin 0 -> 218 bytes .../textures/entity/projectiles/arrow.png | Bin 267 -> 328 bytes .../entity/projectiles/spectral_arrow.png | Bin 267 -> 328 bytes .../entity/projectiles/tipped_arrow.png | Bin 267 -> 328 bytes .../gui/sprites/tooltip/hidden_background.png | Bin 0 -> 90 bytes .../tooltip/hidden_background.png.mcmeta | 1 + .../gui/sprites/tooltip/hidden_frame.png | Bin 0 -> 90 bytes .../sprites/tooltip/hidden_frame.png.mcmeta | 1 + pack.mcmeta | 2 +- 69 files changed, 909 insertions(+), 17 deletions(-) create mode 100644 1_21_2/assets/minecraft/post_effect/entity_outline.json create mode 100644 1_21_2/assets/minecraft/shaders/core/position_color.json create mode 100644 1_21_2/assets/minecraft/shaders/core/position_tex.json create mode 100644 1_21_2/assets/minecraft/shaders/core/position_tex_color.json create mode 100644 1_21_2/assets/minecraft/shaders/core/rendertype_armor_entity_glint.json create mode 100644 1_21_2/assets/minecraft/shaders/core/rendertype_entity_glint.json create mode 100644 1_21_2/assets/minecraft/shaders/core/rendertype_glint.json create mode 100644 1_21_2/assets/minecraft/shaders/core/rendertype_gui.json create mode 100644 1_21_2/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json create mode 100644 1_21_2/assets/minecraft/shaders/core/rendertype_text.json create mode 100644 1_21_2/assets/minecraft/shaders/include/version.glsl create mode 100644 1_21_2/assets/minecraft/shaders/post/entity_outline.json create mode 100644 assets/minecraft/models/equipment/chainmail.json create mode 100644 assets/minecraft/models/equipment/diamond.json create mode 100644 assets/minecraft/models/equipment/gold.json create mode 100644 assets/minecraft/models/equipment/iron.json create mode 100644 assets/minecraft/models/equipment/leather.json create mode 100644 assets/minecraft/textures/entity/equipment/humanoid/chainmail.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid/diamond.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid/gold.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid/iron.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid/leather.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid_leggings/chainmail.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid_leggings/diamond.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid_leggings/gold.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid_leggings/iron.png create mode 100644 assets/minecraft/textures/entity/equipment/humanoid_leggings/leather.png create mode 100644 assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png create mode 100644 assets/minecraft/textures/gui/sprites/tooltip/hidden_background.png.mcmeta create mode 100644 assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png create mode 100644 assets/minecraft/textures/gui/sprites/tooltip/hidden_frame.png.mcmeta 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","\u0000１\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000０\u0000","\u0000⑴⑵⑶⑷⑸⑹⑺⑻⑼\u0000\u0000\u0000\u0000\u0000２","\u0000⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪","⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\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","\u0000１\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000０\u0000","\u0000⑴⑵⑶⑷⑸⑹⑺⑻⑼\u0000\u0000\u0000\u0000\u0000２","\u0000⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪","⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000","\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\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 4b65c26b07b163a7810294c0b856bd1af88e0179..ee9ac5086f7846a4cbbba8044cf6cb97d5eabd85 100644 GIT binary patch delta 69 zcmca;d(l?PKRrE|fr$YM-p|um17gnP=P;irrN;x}GXnWpyQY+E3|Y$w767T5de>g6lDMa delta 69 zcmca;d(l?PKRrE|fr$YMzJJeq2x2;$8mycsrN;x}GXnXW4f*&shOFfT3xHJj+@G>^ JGcVT>5dhdF7N!6I diff --git a/assets/minecraft/sounds/instrument/bell.ogg b/assets/minecraft/sounds/instrument/bell.ogg index 9583d4cc734dea83bb3aa89e4e7b49eb49a6095c..08728e51319ebd553e86e1210a0db9f1b259ef61 100644 GIT binary patch delta 69 zcmZn+ZVZ<4PfrhKU}AuRQrQjsAZB~-(H9e?^mssgMj*d+k<;UiA(C8R0g&n%{s;1# IE4eu20YsP)H~;_u delta 69 zcmZn+ZVZ<4PfrhKU}AuR)O1cR5YxKbNoAsx9uJ7m2;?8;t<8 diff --git a/assets/minecraft/sounds/instrument/brass.ogg b/assets/minecraft/sounds/instrument/brass.ogg index d02004b2fbc3feb793cdefbbc562fd723a07cb5d..aac670de27e694e9d969c57eb1f559ee6474ef0d 100644 GIT binary patch delta 69 zcmX>ba5g~7KRrE|fr$YMCOpb81u<1c)N&_E>G6R0j6nWD$EQsjL-e`80wC3nDbIX2 J_jB!&1psZ@6IuWO delta 69 zcmX>ba5g~7KRrE|fr$YMw75=w05SRYnL13A(&GW~8G-zQnQpf>hUjyF1wg95`bjU^ J+|RX7765326Hx#F diff --git a/assets/minecraft/sounds/instrument/drum.ogg b/assets/minecraft/sounds/instrument/drum.ogg index 14ddff3409dd08aecd56475693d3a05396b020ed..394518677ece5bd7add1a84e303724ada7baa6f4 100644 GIT binary patch delta 69 zcmdlVus=Y`KRrE|fr$YMF7_;E12O9?GgeKM(&GW~8G-yq22#-*L-uom1wg7>g$e^V J%X2Bn0RVl~5={UA delta 69 zcmdlVus=Y`KRrE|fr$YME*Q=Y12HFV6StWtrN;x}GXnX4)T&-@4B5{K767S!RB0x? JS)NNl4giRg6E6S& diff --git a/assets/minecraft/sounds/instrument/flute.ogg b/assets/minecraft/sounds/instrument/flute.ogg index 292405cc0e0724c6e7fec7997eafcb9c28efd3d7..2d0ce633f8bb1c8d31f12a6ab07e52453793bae1 100644 GIT binary patch delta 69 zcmbOjIx$qrKRrE|fr$YMJiWCuKunF&teF#~^mssgMj-#t-eBjAAv|1Q0g&p~_x|qM JoWrH6000>>5r6;y delta 69 zcmbOjIx$qrKRrE|fr$YMrmG!U2x68m_$WV7N{G6R0j6iM3}NB|3xHHFS812n JoW!+X5de>u6RZFL diff --git a/assets/minecraft/sounds/instrument/harp.ogg b/assets/minecraft/sounds/instrument/harp.ogg index 174507ad2863a9142753ef4004cdff72bd68510f..4f8ef79ceeb1f6f41556de1ca430b10acaf95e5c 100644 GIT binary patch delta 69 zcmdlOvN1%;KRrE|fr$YMJk+P%1~DBgTenY?(&GW~8G-zymFB`5LsYrI0wC4d5i<-o Jw{oqK2LN0s5<>t0 delta 69 zcmdlOvN1%;KRrE|fr$YMKJCj`3}Tx12-Z%N(&GW~8G-z+44Y*eLsYrI0wC3kjIOzC JZsl4d4*;l+6%YUb diff --git a/assets/minecraft/sounds/instrument/hat.ogg b/assets/minecraft/sounds/instrument/hat.ogg index 160055adc7bba9ea6883a04a02ea884ef11312f8..2d6684a510f2aec920e99d1cb5dc99632b56ff2d 100644 GIT binary patch delta 69 zcmZ4NyVzICKRrE|fr$YM=5Tyo1Y+LmD*iE1N{m6lMSb delta 69 zcmZ4NyVzICKRrE|fr$YMzPT1G6R0j6i;oWRU*G5Nl4b07!MV4foW| IvpG3r0aW}EV*mgE diff --git a/assets/minecraft/sounds/instrument/kora.ogg b/assets/minecraft/sounds/instrument/kora.ogg index 79c1eccc167e571321ca365ec2a6ec9e5b7bb8a2..0202d0cb556bc0657af522d6f49a5fae4b3e13d8 100644 GIT binary patch delta 69 zcmeyB@+(EkKRrE|fr$YME|}l-12MOpI(2ZOlpYU=&j{on->JB5V~89VSOBE@ky|N{HrU97%>0< diff --git a/assets/minecraft/sounds/instrument/marimba.ogg b/assets/minecraft/sounds/instrument/marimba.ogg index 6ea000b4e638e873b2161abd5d9ecf4ca9260031..f7e930757da29f6a366c4878698c9293491fa4ec 100644 GIT binary patch delta 69 zcmews^({)uKRrE|fr$YM*lsJbftZaqeYqw|>G6R0j6go?(UhGVL+rW00wC2dLJvLJ JJfG{j5&%Ye5?25K delta 69 zcmews^({)uKRrE|fr$YMytU+_K+IE@Z}3l)(&GW~8G-x`-HDtVL+rW00wC47ML`EP J&*!?X1OP}55l;XB diff --git a/assets/minecraft/sounds/instrument/piano.ogg b/assets/minecraft/sounds/instrument/piano.ogg index c57ada4215c601f79c20e5384f236605edc200d1..e4797a87d59c36fee0877b53bef0920033843b57 100644 GIT binary patch delta 69 zcmaDK|2|&IKRrE|fr$YMn%FG9f|yw?DdrQU^mssgMj+q%EXU%FA(dQU0g&p$f4^#M JzR4w~3IKe{6RrRN delta 69 zcmaDK|2|&IKRrE|fr$YMDrBu&K}_cS1@#l9^mssgMvy@5mh~G$D!IS{Ak`e}W_NDB I$t9)=093;fzyJUM diff --git a/assets/minecraft/sounds/instrument/pizz.ogg b/assets/minecraft/sounds/instrument/pizz.ogg index 9359365fbcd6a3783b2b92350b931ad37110de53..51737077c5b5357a050c7062d63bac75b7fd31c8 100644 GIT binary patch delta 69 zcmeyC_AO1yKRrE|fr$YM);LY@12LcYXaAijrN;x}GXnYMkM0U@3}NR23xHJLIOK6< Jb2=BlCIGic6lnke delta 69 zcmeyC_AO1yKRrE|fr$YMG}om41Tk}uhcBKerN;x}GXnX4KKZq83}NR23xHJXwg&Co JoX*9s2>{bJ6!icA diff --git a/assets/minecraft/sounds/instrument/snare.ogg b/assets/minecraft/sounds/instrument/snare.ogg index 04e71c66afb8de9252100973fc14539d65d98c65..efaa68a170f25803efff37887667aa4cc4ecfa12 100644 GIT binary patch delta 69 zcmeB9?M{{QPfrhKU}AuRrdd4vAm++1t(g<0^mssgMj$`qw(07PA);Jh0g&pL=1RuR IrCeef06$C+p#T5? delta 69 zcmeB9?M{{QPfrhKU}AuRUmrhT0Ws}={Fa$0rN;x}GXnV&4qVu|F+`LLEC5oyOe|Mt Jb19dY1^_dX7>57= diff --git a/assets/minecraft/sounds/instrument/tamborine.ogg b/assets/minecraft/sounds/instrument/tamborine.ogg index f75b8f43e1a83638e28dc963c6fb0e99ee856a66..d8365bbbbeba81f64123e417a29e0e7502eebace 100644 GIT binary patch delta 69 zcmbQ^GRH;AKRrE|fr$YMn1g#*LCgv95{|d7Lfn| diff --git a/assets/minecraft/sounds/instrument/tom.ogg b/assets/minecraft/sounds/instrument/tom.ogg index baf58080a71ec961a5040e65b387875c32d36ca3..8d07e14c7e0f0b702619bcdb24c7121782a1ae48 100644 GIT binary patch delta 69 zcmaD?{H|EaKRrE|fr$YMctct>K}@z8PE#gI>G6R0j6nV}g_$chhFs@p@w>G6R0j6lA3-^`$mAxvCg0g!521A!@< IlenT}00Zz2$p8QV delta 69 zcmdnvyT@0`KRrE|fr$YMmaaGB05SW%uP>P>rN;x}GXnYCmV(nZhA?q~1wg9R8Yk;+ JPU4D^0RU6(5a|E_ diff --git a/assets/minecraft/sounds/instrument/woodblock.ogg b/assets/minecraft/sounds/instrument/woodblock.ogg index 94d65fe965eb6ecc6a78fc007b8629e83da6c16c..2d4d51070138cb66526ca69b1844557165b23144 100644 GIT binary patch delta 69 zcmbQ>Ji%GYKRrE|fr$YME>!941TpzFSj;9$>G6R0j6nV@!Sc3^AxAjD0wC32YPeo+ JR^iGK2LL{U5@-Mb delta 69 zcmbQ>Ji%GYKRrE|fr$YMGH3ez12Mz7(!(c8>G6R0j6nXnC&^tKLymBQ1wg7JIgicR JtiqKe4ghio6R7|I diff --git a/assets/minecraft/sounds/other/blank.ogg b/assets/minecraft/sounds/other/blank.ogg index e141619ec6100735bf3a53388f9b63a418587769..149a387ee33269f76f8aedd2e68d58ed62911856 100644 GIT binary patch delta 50 vcmbQqIFnJzKRrE|fr$YMn#z{MgP0RFI5;Ls>G6R0j6nY0YkN2+hPVO%2IC9p delta 50 ucmbQqIFnJzKRrE|fr$YMEIgRaKurGTkKZOr>G6R0j6nYDwwlEgLtFv#F$+up diff --git a/assets/minecraft/sounds/ui/click.ogg b/assets/minecraft/sounds/ui/click.ogg index 3abf622ed4a45b2451e0decb0ae4853bbd472072..370b6c2247dd0f1b6a94c1e7c745e0c06e3f1242 100644 GIT binary patch delta 69 zcmZn>ZxNUBPfrhKU}AuRzpJ0E1TiBwuUs)vN{ delta 69 zcmZn>ZxNUBPfrhKU}AuRB~3p!ftcp8Qd1^M>G6R0j6l99bH&DuAu~9@0wC45^Yx!> J{=w111ORcw6z~85 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 0000000000000000000000000000000000000000..1a7b3c85a130e6c47839a0cc0b328e27aa80135d GIT binary patch literal 733 zcmV<30wVp1P)FLVa@5#{G#Ld{h!^*k6#Im)!r>nK1r>>fwsFa$bl9!;6l$(Nxkb;JdczlC*dxB(V zZCqhyPE%M%OHV^bOFTeCIXpi#I6E{qIx#diE-^GLFET4GF)J-EDJv}{Cn+Q*C>|gp z7#SK65E7NLWvu`J00DGTPE!Ct=GbNc00J3FL_t(|+ND&1j;b&a>^rg0E~UVUfW00b z#sB}sH?5^fG>vz0i0rP(4AUKy?bzJr)@{9Q@nR3?I}LO_%fW5y?5tZOb7K$a1OcMU z3V?6t)ozjb8faq4wzvYggRM~gka|$W{O!fIIjSoRUQ)vDB(8ZeacX5|#j#ZN=j|WnqLI5S4 zg|x!A=+tBWTbg49M~ITNIErJBnhD^&9TC(e|lFkcEke8IC?XH(kcHn zr5Wc~`yO6PQ3}Qmh(Mr)^FHjrFCpb09c*cil|X$0&ZMXVom9#{=H}8IE6ag|UuMcb zEiuipvfp9`*b6A_-V-3by({3}J;E>Wf_;=F{Jrp27kW|<}v1^xzW&0@w8H?XhQKMVW^3}j99No+iB P00000NkvXXu0mjf7yM3m literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f1767224e6fccaef387d410ec82798e0a852dad4 GIT binary patch literal 514 zcmV+d0{#7oP)#i&iiS{^;)~~RJ7|-u;xjj(m{;67;ZX}00001bW%=J06^y0W&i*I zj7da6RCwC8)Qf8FAP@xLjWc`s&HKOa8DoVU8e0hTqo{SWLld#KRJcUhTj3NBd&_xo zdy8lS+FNLlhW7ygslnbNn5n_`GVKTM*^utGHR{{ri;T>pWokk3_c z8slqYOk=(UfbkrF5kM_fXRM8RD)$!EA4Eh|M!+tJ$g0vNF15ZN?ZR(gvZ|YXKDh$& z^D*n%C4_witorj&D1Z%S4IBZNUhWEC0jvHT;5j19IA(u*AZI;Qe&Vxn1Z^J37y*%C z8>iSW2+(%U-hT~%{9QoGi&uE&^f?Sp@vFHVGk`dn?NHF#ya}@Igt~dq!z7%C?SugB z`UzQgf&k(6#qnbR0kDBF;1W*W{^?iPe{QdIN}rGS`x@=IeL}+SYF!%X5^TcgQr^VN zcANmJYoHHZa%|Fb23+fXKxH!BHDo23=a3nZbJ^#u?E8Q!dZts05p*><#QQlo#ZTMm zm7cw8s6Ln|fmFZEU#hg+>T-hTHOszfQ#UT`6l$LSaQZSUxmSIWSE%EJ`yhM=>fwE+=>6 zv4#Ku00DGTPE!Ct=GbNc00DE72ltUf zB>LW;KW zhx0%t+SeJ$V*;j}fWFSjZA*Cr%+4*gLf&A-KQQ?G2@7Ba9yC;;d)%#robmPR>vH7a zQinsknX5Uapxe2@?Rvc(Ik?v}qhXFHD`pO+4j>S+6Oadk}@P)ls#~?UQCfb4r z?Gt>L0L7I6#f1PdIbRZ!&kHVd0guA*sa(*6^HaG1VFc06*z@ z`94?(Sh3w;o86-dZkrXznyoHtiSk%^DF6Kq5aD-($EJe2M*z(5A|z1mD_8s5E#wrK z9^R-|VN;NE9ykQ%D|h=-Kt{N;La)`Ndjy%8EK&ki9xFfkpL7yM_G6eR$lg=z(}Zqi zqL}SBK`mwWVjr#H7-N>S0jLeRk|Z36^2)|2OYB%9qEHnQsa_zFqM7 zN4OLLn>qtXx~q4GJFxCR&BdbtxX=B_WSAEgh@00002bW%=J004HA z%{Tx60Y^zhK~#9!)zLAI+%OCUP~E?0#{+z%4t~p$9bs(6LWc<{tc^)wdonJ9eUL<9 z0DjY+vEyc2EsjrFTBdFGAiy*INx`)|7MXK~aWbL~i#apHxLzsW2ypj^FpzE}EF#?9klZ%ruloS=ZU@G2jsbLpn_+`{ z9per_0^iq{U+^35b&SuUjGshBblhMWXQcekfakApK;v;MEOnZ(H%iyb08Z8=h~~=? zpn%>6z$f93rnacNdG8MBdObnJjQD$kZtN|p(si8Cax^ttly2zV&0Q}87zJhGEk@fAz sMF35#7LS0^P2)YHSflr2+W1F*0KQVoj?1<4ssI2007*qoM6N<$g2|b(^#A|> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a8d855a619b8aa3feb7ba91467e09ea26d0264e1 GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@Qd$8%A+A7r()0yQ9TUo{n^Mwq z!y@Co{X!gE+)XX4b@Yu?)HLK2lq4jj1O$XmHEmS@s%9(+@(X5gcy=QV$T{Ze;uunK z>+J-`Rfi1(oR@EWU8VB(cl`J835@wndDkk_PTlrc(b*0JqP3l@3193O=HAhGAt-xc z{{6L0Viy_a@|tt;iNE>FIx*_}{zcplyX85KiJs{Es`n|e$ z$<>#ge^MC_9{H2i6!h~OlmCi6+o$~Bz)-?2Fr1y^SA)PbG^_Y%&jsu`OHpL}X69t=?&a`DUGRX QfIedIboFyt=akR{0JBnkD*ylh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ed71373d765b20ff8073993431431389d9f380f8 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@Qi=gSA+A9B$*wn9= z|HbEiXCD6=wfj@Zme&CrpF8&KnlAa`Gf)v@NswPKgTu2MX+X|GPZ!6Kid%0lHD)m= z@-PRaUtaR|fBlCNCUZ9FaybJA`2?mdKI;Vst0Q`(|U;qFB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6a298af27badf602ab32ba2e267b8a333c62be99 GIT binary patch literal 256 zcmV+b0ssDqP)h ztfC4Mxe|b6>sphZ50LWX^jK*j(4`P{PUZs^+zQQ*mjcan1IM(a9n+$`<_&dLVfiiq zTe1Om82I~xVwnpfs|;DPtTt=z>7!bd*BI9wFNB0iPmZW0000>r4Ou00DGTPE!Ct z=GbNc005>*L_t(|+U=5oh66AVMDLoNnb~dn|G#^CQLf-LEed(qA$TUt*WqwDJVJ?Y z3DmqT_}mx724JI?nkYhy;BOl6z5pR-S^=5d7o_C;jme2)krM8*@w}`7BFH}IyFv}IGizHSSN^dfu#FfI our1vs-kG+9)qnM{Wd9@h0iX>AvUVXYp#T5?07*qoM6N<$g5NZLp#T5? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e79ebcd25f35b3e506a2034b863d7d277d028457 GIT binary patch literal 218 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH0VEjOzbQrlDW;MjzhDN2vdL#HfV|0`E{-7; zx86?Nn0wSf;OM6M_3zjou;j$A)H6OhVPA8+?*^h zdi^Sfcb)V1HP|lTxhV2#N*seuj&ozN=t76;@M~r#9TIPC(h>M0exUgQf9tzL@+Pl$ QPXIaE)78&qol`;+07=JDqW}N^ literal 0 HcmV?d00001 diff --git a/assets/minecraft/textures/entity/projectiles/arrow.png b/assets/minecraft/textures/entity/projectiles/arrow.png index d3969ce2a4963de40fa24ae8e0e0ca45968c5e65..c7e0135d8bb7aa4b199fc242e321d9bbf087f245 100644 GIT binary patch delta 249 zcmV}c87zqdi0001;w}I@DAwz%9NklBB`@2ZH$&v@KO4ZkdGfo_0%2ETmMo&mW5Z54yr%III8 zutpcL#`mw|6#l=6$Im!7QV;||5ClOG1n2w#W*`Pl3*6z800000NkvXXu0mjfvW0WT delta 188 zcmV;t07L)C0*eBW7zqRe00013M{MnpAwz$XNklymmzy|~kg#}^kWNZqU zRFs?)AWSx6C2T5;lg*4FEM;ROMNIjw744;=<)NYBr4<{M1O0(5VH!%YW(-H;(K!}h6VL}R&@k=ubb>MfUlJRb1CGse& qKsb_OZ!$3qZ7>Q(!6+C7qW}P4l^Xy@h|c~10000}c87zqdi0001;w}I@DAwz%9NklBB`@2ZHW&v@QQ4ZkdGfo_0%2I-gUo&mW5Z54yr%III8 zutpcL#`mxD6i$oy|Iau#QV;||5ClOG1n2w#o%{w-XP>y+00000NkvXXu0mjfQgw8Q delta 188 zcmV;t07L)C0*eBW7zqRe00013M{MnpAwz$XNklymmzy|~kg#}^kVr&YS zRFs?)AWU{+C2T5;i_MK8EM;ROMNIk58EvVdX`!KEsTmuU1OMfUlJRb1CGse& qKsb_OZ!$3qZ7>Q(!6+C7qW}O%W*Z<%@m3`O0000}c87zqdi0001;w}I@DAwz%9NklBB`@2ZH$&v@KO4ZkdGfo_0%2ETmMo&mW5Z54yr%III8 zutpcL#`mw|6#l=6$Im!7QV;||5ClOG1n2w#W*`Pl3*6z800000NkvXXu0mjfvW0WT delta 188 zcmV;t07L)C0*eBW7zqRe00013M{MnpAwz$XNklymmzy|~kg#}^kWNZqU zRFs?)AWSx6C2T5;lg*4FEM;ROMNIjw744;=<)NYBr4<{M1O0(5VH!%YW(-H;(K!}h6VL}R&@k=ubb>MfUlJRb1CGse& qKsb_OZ!$3qZ7>Q(!6+C7qW}P4l^Xy@h|c~10000 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..69ddb858f1a3136284c22f4d2cd898333a95e419 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^DIm-UBp4!QuJ{S0m`Z~Df*BafCZDwc@`OEI978H@ lB`?sHU|pOb($f^kz`$C;z<4u$ViZuC!PC{xWt~$(698NV6^j4> literal 0 HcmV?d00001 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